Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(frontend): commas in selected categories messge bb-340 #616

Open
wants to merge 274 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
274 commits
Select commit Hold shift + click to select a range
45477b7
feat(shared): add Message Create DTO bb-203
AndriiLevin Sep 9, 2024
33523d7
feat(shared): add types for BalanceWheelAnalysisResponseDto bb-203
AndriiLevin Sep 9, 2024
dcc242d
chore(backend): add exports from categories Module bb-203
AndriiLevin Sep 9, 2024
64c2863
chore(backend): add exports from onboarding Module bb-203
AndriiLevin Sep 9, 2024
169be6d
feat(backend): add findUserAnswersWithQuestions to OnboardingReposito…
AndriiLevin Sep 9, 2024
9f229b3
feat(backend): add AiAssistantController and add it to base server AP…
AndriiLevin Sep 9, 2024
57a6c7e
feat(backend): add AiAssistant module and imports bb-203
AndriiLevin Sep 9, 2024
0a55098
feat(shared): add Task DTO and task status enum bb-203
AndriiLevin Sep 9, 2024
e423ac7
refactor(shared): add dueDate to Task DTO bb-203
AndriiLevin Sep 10, 2024
1b34e26
refactor(backend): fix imports bb-203
AndriiLevin Sep 10, 2024
4a20f29
feat(backend): add Task Entity bb-203
AndriiLevin Sep 10, 2024
33cb75c
feat(backend): add Task db Model and add relations bb-203
AndriiLevin Sep 10, 2024
9c7ac76
feat(backend): add TaskRepository boilerplate bb-203
AndriiLevin Sep 10, 2024
2bfb504
feat(backend): add TaskService boilerplate bb-203
AndriiLevin Sep 10, 2024
9c4d587
feat(backend): add TaskController boilerplate adn add it to server A…
AndriiLevin Sep 10, 2024
d8cfc26
feat(shared): add Api paths for TaskController bb-203
AndriiLevin Sep 10, 2024
0df4313
feat(backend): add task Module and imports bb-203
AndriiLevin Sep 10, 2024
8b15de0
feat(shared): add TaskSuggestionsResponseDto and exports for AI assis…
AndriiLevin Sep 10, 2024
c3e3247
feat(shared): add TaskGetAllResponseDto and exports bb-203
AndriiLevin Sep 10, 2024
340bc4d
feat(backend): add migration to crate Task table and updated enums bb…
AndriiLevin Sep 10, 2024
9f107fe
refactor(backend): fix imports in AI module bb-203
AndriiLevin Sep 10, 2024
559314b
feat(frontend): add chatApi bb-340
yulyaolshanska Sep 12, 2024
520bb03
feat(frontend): add chat page with mock data bb-340
yulyaolshanska Sep 12, 2024
0f1bfbd
fix(backend): threadId bb-340
yulyaolshanska Sep 12, 2024
f3e16c9
refactor(frontend): chat state bb-340
yulyaolshanska Sep 12, 2024
175c4e0
refactor(frontend): add taskList to data bb-340
yulyaolshanska Sep 12, 2024
a1a56b7
Merge branch 'main' into 340-ai-chat
yulyaolshanska Sep 12, 2024
88e3f00
feat(frontend): add type for message array bb-340
yulyaolshanska Sep 13, 2024
549ef88
feat(frontend): add messageComponent bb-340
yulyaolshanska Sep 13, 2024
218e562
refactor(shared): change Assistant Api Path bb-203
AndriiLevin Sep 13, 2024
68c8dea
feat(shared): add TaskSuggestionsResponseDto bb-203
AndriiLevin Sep 13, 2024
da1ddce
feat(shared): add TaskSuggestionRequestDto bb-203
AndriiLevin Sep 13, 2024
72893a5
feat(shared): add TaskSuggestionRequest validation bb-203
AndriiLevin Sep 13, 2024
45f30b6
feat(shared): add BalanceWheelAnalysisResponseDto bb-203
AndriiLevin Sep 13, 2024
23a2f72
feat(shared): add AiAssistantValidationRule bb-203
AndriiLevin Sep 13, 2024
bd78d96
feat(shared): add AiAssistantValidationMessage bb-203
AndriiLevin Sep 13, 2024
656d5cd
feat(shared): add addMessageToThread validation schema bb-203
AndriiLevin Sep 13, 2024
3209901
refactor(shared): refactor export Ai assistant module bb-203
AndriiLevin Sep 13, 2024
0c59900
feat(shared): add ThreadMessageCreateDto bb-203
AndriiLevin Sep 13, 2024
8f47073
refactor(backend): change AnalyzeBalanceScoresTool function bb-203
AndriiLevin Sep 13, 2024
82bff3d
refactor(backend): change GenerateTaskByCategoryTool function bb-203
AndriiLevin Sep 13, 2024
aee7143
feat(backend): add OpenAiFunctionName bb-203
AndriiLevin Sep 13, 2024
afa1d9c
refactor(backend): change OpenAiPromptTemplates Message bb-203
AndriiLevin Sep 13, 2024
95f290e
feat(backend): add OpenAiRunThreadRequestDto type bb-203
AndriiLevin Sep 13, 2024
dade212
feat(backend): add AiAssistantMessage validation schema bb-203
AndriiLevin Sep 13, 2024
92a06f8
feat(backend): add generate Task method / change API calling bb-203
AndriiLevin Sep 13, 2024
6082c75
refactor(backend): add more settings to OpenAiAssistantConfig bb-203
AndriiLevin Sep 13, 2024
e93fd51
refactor(backend): refactor open-ai module exports and files bb-203
AndriiLevin Sep 13, 2024
8085512
feat(backend): add init chat functionality bb-203
AndriiLevin Sep 13, 2024
7db8329
feat(backend): add suggest task functionality bb-203
AndriiLevin Sep 13, 2024
630272d
feat(backend): add suggestTasksForCategories to AiAssistantService an…
AndriiLevin Sep 13, 2024
69ad7a2
feat(backend): add suggestTasksForCategories to AiAssistantController…
AndriiLevin Sep 13, 2024
2d9199c
refactor(backend): refactor file structure end import in AI Assistant…
AndriiLevin Sep 13, 2024
5688d87
refactor(shared): refactor file structure end import in AI Assistant …
AndriiLevin Sep 13, 2024
166aa57
Merge branch 'main' into 203-feat-AI-Integration bb-203
AndriiLevin Sep 13, 2024
9d9ca62
feat(frontend): merge ai backend bb-340
yulyaolshanska Sep 13, 2024
ed0e480
feat(main): update readme with Task db model bb-203
AndriiLevin Sep 13, 2024
b4e35a0
feat(backend/shared): add question field in balance score response …
AndriiLevin Sep 13, 2024
650c13f
feat(backend): add question field to response bb-340
yulyaolshanska Sep 13, 2024
e6313cc
feat(frontend): change wheel width bb-340
yulyaolshanska Sep 13, 2024
2b7a24d
feat(frontend): change message type bb-340
yulyaolshanska Sep 13, 2024
5f83bcf
feat(frontend): add messages on initConversation bb-340
yulyaolshanska Sep 13, 2024
fd990be
feat(frontend): add buttons bb-340
yulyaolshanska Sep 13, 2024
9d47ae3
Merge branch '203-feat-AI-Integration' into 340-ai-chat
yulyaolshanska Sep 13, 2024
4a9430a
feat(shared): add TaskCreateDto bb-203
AndriiLevin Sep 14, 2024
4ebcab2
feat(shared): add ChangeTaskSuggestionRequestDto bb-203
AndriiLevin Sep 14, 2024
4ca888b
feat(shared): add ChangeTaskSuggestionRequest validation schema/rule/…
AndriiLevin Sep 14, 2024
de0943b
refactor(shared): add TaskCreateDto to TaskSuggestionsResponseDto bb…
AndriiLevin Sep 14, 2024
3322a1a
feat(backend): add changeTask to AiAssistantController bb-203
AndriiLevin Sep 14, 2024
7d07b9e
feat(backend): add changeTask() to AiAssistantService bb-203
AndriiLevin Sep 14, 2024
7656f29
feat(backend): add changeTask Helper bb-203
AndriiLevin Sep 14, 2024
146facb
refactor(backend): change task fields names to be the same as in Dto…
AndriiLevin Sep 14, 2024
0ae35ee
feat(backend): add OpenAi function for change task bb-203
AndriiLevin Sep 14, 2024
e9c7eed
feat(shared): add route for accepting Task bb-203
AndriiLevin Sep 14, 2024
c6ea558
feat(backend): add create() to TaskRepository and add exports bb-203
AndriiLevin Sep 14, 2024
8803c97
feat(backend): add createTask() to AiAssistantController bb-203
AndriiLevin Sep 14, 2024
8b3de74
feat(backend): add createTask() to AiAssistantService bb-203
AndriiLevin Sep 14, 2024
0af1fb6
chore(backend): update import in Ai Module bb-203
AndriiLevin Sep 14, 2024
ec79675
feat(backend): update Ai Module to handle multiple runs bb-203
AndriiLevin Sep 15, 2024
e16a89e
feat(backend): add swagger to AiAssistantController bb-203
AndriiLevin Sep 15, 2024
1c4df15
refactor(shared): rename AiAssistantApiPath path bb-203
AndriiLevin Sep 15, 2024
82d956f
refactor(shared): change AiAssistantValidationRule and schema bb-203
AndriiLevin Sep 15, 2024
cc223c4
feat(shared): add INDEX_ONE constant bb-340
yulyaolshanska Sep 15, 2024
522e328
feat(shared): add type AppDispatch bb-340
yulyaolshanska Sep 15, 2024
daf2d85
feat(frontend): import types bb-340
yulyaolshanska Sep 15, 2024
8d4cdea
refactor(frontend): message type bb-340
yulyaolshanska Sep 15, 2024
0493c0d
feat(frontend): add getTasksForCategories to Api bb-340
yulyaolshanska Sep 15, 2024
4e64531
feat(frontend): add handleButtonAction helper bb-340
yulyaolshanska Sep 15, 2024
c3780c5
feat(frontend): add ConfirmationButtons component bb-340
yulyaolshanska Sep 15, 2024
d0c6819
feat(frontend): handleCategoriesSubmit bb-340
yulyaolshanska Sep 15, 2024
9d651c9
feat(frontend): get tasl list bb-340
yulyaolshanska Sep 15, 2024
6aeadf0
fix(frontend/backend): change type for categoryId, remove score bb-340
yulyaolshanska Sep 15, 2024
1073436
fix(frontend): handleFormSubmit wrapper bb-340
yulyaolshanska Sep 15, 2024
134b26d
refactor(frontend): clean code bb-340
yulyaolshanska Sep 15, 2024
dcfd1ba
Merge branch '203-feat-AI-Integration' into 340-ai-chat
yulyaolshanska Sep 15, 2024
877ce6d
refactor(shared): change AiAssistantValidationRule and schema bb-203
AndriiLevin Sep 15, 2024
a6ce443
refactor(backend): delete redundant score field in lowestCategories …
AndriiLevin Sep 15, 2024
6d02e3a
refactor(backend): delete redundant score field in lowestCategories …
AndriiLevin Sep 15, 2024
f5e6575
refactor(backend): fix names in TaskSuggestionRequestDto bb-203
AndriiLevin Sep 15, 2024
ea41b46
fix(frontend/backend): merge conflict bb-340
yulyaolshanska Sep 15, 2024
941266c
refactor(backend): fix names in TaskSuggestionRequest validation bb…
AndriiLevin Sep 15, 2024
9a8be45
refactor(backend): fix names in TaskSuggestionRequest dto bb-203
AndriiLevin Sep 15, 2024
aad378e
refactor(backend): fix types in lowestCategories bb-203
AndriiLevin Sep 15, 2024
b0db003
Merge branch 'main' into 203-feat-AI-Integration bb-203
AndriiLevin Sep 15, 2024
e8f2649
Merge branch 'main' into 203-feat-AI-Integration
AndriiLevin Sep 16, 2024
5ee1709
refactor(backend): change names for Assistant tools bb-203
AndriiLevin Sep 16, 2024
cc35c28
chore(backend): update and fix dependencies bb-203
AndriiLevin Sep 16, 2024
24ee13f
refactor(backend): update handleRequiresAction for more clear code b…
AndriiLevin Sep 16, 2024
e99f6b0
refactor(backend): refactor methods to create prompts to reduce nestl…
AndriiLevin Sep 16, 2024
668c312
refactor(backend): refactor names in init-chat files bb-203
AndriiLevin Sep 16, 2024
f73f5c1
refactor(backend): refactor generate AI response files to reduce nest…
AndriiLevin Sep 16, 2024
3e49cd2
refactor(main): delete duplicated Task table from readme bb-203
AndriiLevin Sep 16, 2024
798216b
refactor(backend): rename validation schemas in AI Module bb-203
AndriiLevin Sep 16, 2024
b1e7afc
fix(backend): caught errors if OpenAi severs not responding bb-203
AndriiLevin Sep 16, 2024
b6b3c94
Merge branch 'main' into 203-feat-AI-Integration
AndriiLevin Sep 16, 2024
d4b4ec5
feat(backend): add task deadline according to app logic bb-203
AndriiLevin Sep 17, 2024
f074911
refactor(backend): refactor files and names in OpenAI module (Ai => A…
AndriiLevin Sep 17, 2024
0914e93
refactor(shared): change api path names bb-203
AndriiLevin Sep 17, 2024
7e60b19
refactor(shared): change BalanceWheelAnalysisResponseDto for more rea…
AndriiLevin Sep 17, 2024
2638bfc
refactor(shared): change AiAssistantValidationRule and schemas bb-203
AndriiLevin Sep 17, 2024
ca18ae7
refactor(shared): change code to follow B27 bb-203
AndriiLevin Sep 17, 2024
6948c1d
refactor(shared): change code to follow B27 bb-203
AndriiLevin Sep 17, 2024
fd25e70
refactor(shared): change code to follow B27 bb-203
AndriiLevin Sep 17, 2024
340631b
refactor(backend): change name in validation schema bb-203
AndriiLevin Sep 17, 2024
b1983d0
refactor(backend): add run status enum bb-203
AndriiLevin Sep 17, 2024
310f641
refactor(backend): rename Assistant validation schema bb-203
AndriiLevin Sep 17, 2024
10438f2
refactor(backend): refactor helpers not to disable linter rules bb-203
AndriiLevin Sep 17, 2024
3645380
refactor(backend/shared): change validation names bb-203
AndriiLevin Sep 17, 2024
967a7f8
Merge remote-tracking branch 'origin/main' into 203-feat-AI-Integration
AndriiLevin Sep 17, 2024
536dd0c
feat(frontend): add types, enum bb-340
yulyaolshanska Sep 17, 2024
4db4aec
refactor(frontend): use types, enum bb-340
yulyaolshanska Sep 17, 2024
f89b384
feat(frontend): add styles bb-340
yulyaolshanska Sep 17, 2024
bb835eb
Merge branch 'main' into 203-feat-AI-Integration
AndriiLevin Sep 17, 2024
cf76c17
refactor(backend): change files names bb-203
AndriiLevin Sep 18, 2024
c92c9fc
refactor(backend): change const names bb-203
AndriiLevin Sep 18, 2024
9deb0c2
refactor(shared): fix imports in TaskDto bb-203
AndriiLevin Sep 18, 2024
177cd6d
refactor(shared): fix text in AiAssistantValidationMessage bb-203
AndriiLevin Sep 18, 2024
eca3f0d
refactor: rewritten handle next step as a redux action bb-357
ihorLysak Sep 18, 2024
bb349cb
refactor(backend): change error message bb-203
AndriiLevin Sep 18, 2024
ac04c05
fix: changed env variable name in env.example bb-340
ihorLysak Sep 18, 2024
68b0c2d
refactor(backend): add enum for function name bb-203
AndriiLevin Sep 18, 2024
e45ef66
refactor(backend): fix file names spelling bb-203
AndriiLevin Sep 18, 2024
fdd3675
refactor(backend): fix env name bb-203
AndriiLevin Sep 18, 2024
7369886
Merge remote-tracking branch 'origin/main' into 203-feat-AI-Integration
AndriiLevin Sep 18, 2024
462526a
refactor: merged main. resolved conflicts, changed typing for chat on…
ihorLysak Sep 19, 2024
df9c6ba
feat: fixed balance wheel chart display, added message loader to chat…
ihorLysak Sep 19, 2024
84cd4b6
feat(shared): add ChatMessageAuthor enum bb-203
AndriiLevin Sep 19, 2024
8974fce
feat(shared): add ChatMessageType enum bb-203
AndriiLevin Sep 19, 2024
4b38f08
feat(shared): add TextMessage type bb-203
AndriiLevin Sep 19, 2024
1a47ceb
feat(shared): add TaskMessage type bb-203
AndriiLevin Sep 19, 2024
7499939
feat(shared): add QuestionMessage type bb-203
AndriiLevin Sep 19, 2024
1beb661
feat(shared): add SelectedCategory type bb-203
AndriiLevin Sep 19, 2024
50a0923
feat(shared): add BalanceWheelMessage type bb-203
AndriiLevin Sep 19, 2024
29d42a6
feat(shared): add ChatMessageDto type bb-203
AndriiLevin Sep 19, 2024
b653f99
feat(shared): add chat module and export chain bb-203
AndriiLevin Sep 19, 2024
cf1cd9b
feat(shared): add explain task path to AIAssistantApiPath bb-203
AndriiLevin Sep 19, 2024
3c0ab41
feat(shared): add validation message to AIAssistantValidationMessage…
AndriiLevin Sep 19, 2024
f6ab751
feat(shared): add AIAssistantResponseDto type bb-203
AndriiLevin Sep 19, 2024
e869f5f
feat(shared): add AIAssistantRequestDto type bb-203
AndriiLevin Sep 19, 2024
8dfbf2c
refactor(shared): change taskSuggestionRequest validation to have pa…
AndriiLevin Sep 19, 2024
3df3e42
refactor(shared): rename AIAssistantValidationRule and uses in code b…
AndriiLevin Sep 19, 2024
d721dee
refactor(shared): chane export chain in Assistant module bb-203
AndriiLevin Sep 19, 2024
af67e9b
fix(backend): fix to pass score to Assistant bb-203
AndriiLevin Sep 19, 2024
f9951dc
refactor(backend): change scores response to be ChatMessageDto bb-203
AndriiLevin Sep 19, 2024
daed7e6
refactor(backend): change response_structure in analyze balance tool…
AndriiLevin Sep 19, 2024
5ee49ca
refactor(backend): change dto name in generateSuggestTaskPrompt/runTa…
AndriiLevin Sep 19, 2024
64b037c
refactor(backend): change response type to chat Messages in TaskSugg…
AndriiLevin Sep 19, 2024
a413add
refactor(backend/shared): change import export for Assistant module …
AndriiLevin Sep 19, 2024
320afaa
chore(main): update package-lock.json bb-203
AndriiLevin Sep 19, 2024
c84dd50
feat(main): add explain task prompt template bb-203
AndriiLevin Sep 19, 2024
cdb538a
feat(main): add explain task validation bb-203
AndriiLevin Sep 19, 2024
7f12ff2
feat(main): add explain task prompt generation bb-203
AndriiLevin Sep 19, 2024
eafd1ba
feat(main): add explain task helper bb-203
AndriiLevin Sep 19, 2024
4d2b735
feat(shared/backend): add taskActionRequestSchema validation bb-203
AndriiLevin Sep 19, 2024
bbd0567
feat(backend): add generate Explain TaskSuggestions Response bb-203
AndriiLevin Sep 19, 2024
2c7a848
feat(backend): add Explain Task in AiAssistantService bb-203
AndriiLevin Sep 19, 2024
b636a68
feat(backend): add Explain Task in AiAssistantController bb-203
AndriiLevin Sep 19, 2024
0d51ab5
refactor(backend): add TaskSuggestionsResponseDto to generateChangeT…
AndriiLevin Sep 19, 2024
4d72f92
refactor(backend): change types to accept task methods bb-203
AndriiLevin Sep 19, 2024
49c6086
feat(backend): add explain task OpenAI tool bb-203
AndriiLevin Sep 19, 2024
5dfdab0
feat(backend): add motivation message to explain task bb-203
AndriiLevin Sep 19, 2024
cedcffe
Merge branch 'main' into 203-feat-AI-Integration
AndriiLevin Sep 19, 2024
c0cf474
refactor: commit made for myke bb-340
ihorLysak Sep 20, 2024
b6f0e4a
refactor: rewritten initial messages to be stored on frontend bb-340
ihorLysak Sep 20, 2024
fc1f2c1
refactor: three lowest categories are now selected on frontend bb-340
ihorLysak Sep 21, 2024
4d73954
fix: merged main, resolved conflicts bb-340
ihorLysak Sep 21, 2024
34267c1
feat: implemented chat message sending bb-340
ihorLysak Sep 22, 2024
ac1ac6a
Merge branch 'main' into 340-ai-chat
ihorLysak Sep 22, 2024
21a7f72
refactor: changed position of message loader bb-340
ihorLysak Sep 22, 2024
e153d59
refactor: remade buttonMode to be based of enum bb-340
ihorLysak Sep 22, 2024
1c6a1ac
feat: intermediate commit bb-340
ihorLysak Sep 22, 2024
784d377
Merge branch 'main' into 340-ai-chat
ihorLysak Sep 22, 2024
8d13039
refactor: rewritten types for ai assistant outputs bb-340
ihorLysak Sep 22, 2024
e4f8858
refactor: rewritten types for ai assistant outputs bb-340
ihorLysak Sep 22, 2024
1166618
feat: commit for myke to merge bb-340
ihorLysak Sep 23, 2024
e37453b
fix: resolved conflicts, changed category property of taskDto to cate…
ihorLysak Sep 23, 2024
429966e
feat: added createTasksFromSuggestions feature, added scroll to botto…
ihorLysak Sep 23, 2024
5f196b7
feat: task suggestions are now in a single message bb-340
ihorLysak Sep 23, 2024
77ffcf0
Merge branch 'main' of https://github.com/BinaryStudioAcademy/bsa-202…
ihorLysak Sep 23, 2024
339e19a
refactor: merged main bb-340
ihorLysak Sep 23, 2024
15bd655
fix: changed task.category to task.categoryName in mobile task-card c…
ihorLysak Sep 23, 2024
81b2006
refactor: removed comment and redundant type bb-340
ihorLysak Sep 24, 2024
ce483b3
refactor: removed unnecessary state variables extractions from chat c…
ihorLysak Sep 24, 2024
939b935
refactor: removed duplicate type imports bb-340
ihorLysak Sep 24, 2024
6c77a3e
refactor: removed duplicate type imports bb-340
ihorLysak Sep 24, 2024
8111bd3
refactor: changed AI assistant api pth enum bb-340
ihorLysak Sep 24, 2024
c141df2
refactor: changed AI assistant api pth enum bb-340
ihorLysak Sep 24, 2024
3317fef
refactor: changed AI assistant api pth enum bb-340
ihorLysak Sep 24, 2024
d90554f
refactor: renamed createMultipleTasks into create tasks bb-340
ihorLysak Sep 24, 2024
30d6d2d
refactor: renamed ButtonsModeOption enum bb-340
ihorLysak Sep 24, 2024
74adf2d
refactor: changed constant file name, changed enum name in suggestion…
ihorLysak Sep 24, 2024
467e598
refactor: rewritten getThreeLowestScores into an arrow function bb-340
ihorLysak Sep 24, 2024
12a59f9
refactor: renamed handlers in suggestions-creation-options bb-340
ihorLysak Sep 24, 2024
203dfa6
refactor: renamed enums inside of suggestions manipulation options co…
ihorLysak Sep 24, 2024
e4ef312
refactor: renamed enums inside of suggestions manipulation options co…
ihorLysak Sep 24, 2024
0f8c80f
refactor: stringifaction of payload for retake quiz is done on API le…
ihorLysak Sep 24, 2024
3c44c0c
refactor: moved checkIsTask into a separate folder bb-340
ihorLysak Sep 24, 2024
63dafa0
fix: merged main, resolved conflicts bb-340
ihorLysak Sep 24, 2024
f5d4253
refactor: renamed helper to get categories with three lowest scores b…
ihorLysak Sep 24, 2024
d79e424
refactor: renamed isTaskMessage typeguard helper bb-340
ihorLysak Sep 24, 2024
2a13aaf
refactor: renamed icon svg imports bb-340
ihorLysak Sep 24, 2024
bcfb0c8
refactor: changed SuggestionsCreationButtonLabel enum values bb-340
ihorLysak Sep 24, 2024
324e2ae
refactor: added APIConfiguration to api modules on frontend instead o…
ihorLysak Sep 24, 2024
5d6bd95
refactor: fixed styling for categories selector component bb-340
ihorLysak Sep 24, 2024
e4061e7
feat: added logic to create text messages when user selects tasks by …
ihorLysak Sep 24, 2024
564d308
refactor: fixed chat re-initialization bug bb-340
ihorLysak Sep 24, 2024
b83083f
refactor: rewritten get three lowest helper bb-340
ihorLysak Sep 24, 2024
c37f7e9
refactor: changed suggestions creation text bb-340
ihorLysak Sep 24, 2024
40d8f08
refactor(frontend): fix coding style issues bb-340
fshabanov Sep 24, 2024
024e6ee
Merge branch 'main' of github.com:BinaryStudioAcademy/bsa-2024-bebala…
fshabanov Sep 24, 2024
4729c00
Merge branch 'main' of github.com:BinaryStudioAcademy/bsa-2024-bebala…
fshabanov Sep 25, 2024
5032883
Merge branch '340-feat-ai-chat' of https://github.com/BinaryStudioAca…
ihorLysak Sep 25, 2024
a48b139
refactor: pre main merge commit bb-340
ihorLysak Sep 25, 2024
daf0302
fix: merged main, resolved conflicts bb-340
ihorLysak Sep 25, 2024
8a2a488
feat: added regeneration of all task suggestions, fixed tasks grid cs…
ihorLysak Sep 25, 2024
a110302
refactor: renamed a variable in chat slice bb-340
ihorLysak Sep 25, 2024
076ae71
feat: added messages dispatching to regenerate suggestions bb-340
ihorLysak Sep 25, 2024
59e1b57
fix: changed z-index of the category circle on task card bb-340
ihorLysak Sep 25, 2024
545875e
feat: implemented individual suggestions regeneration bb-340
ihorLysak Sep 25, 2024
b2d5df3
refactor: moved reducer logic into a helper function bb-340
ihorLysak Sep 26, 2024
ca29aa4
fix: prevented form submission when no category selected bb-340
ihorLysak Sep 26, 2024
d5ba932
feat: added chat cleanup on sign-out bb-340
ihorLysak Sep 26, 2024
3b9ffb8
fix: reinstalled dependancies bb-340
ihorLysak Sep 26, 2024
a0d186b
fix: relative paths for processMessages helper and other related help…
ihorLysak Sep 26, 2024
3e437b9
refactor: moved return and argument types for suggestion thunks in ty…
ihorLysak Sep 26, 2024
df49cd4
fix: resolved conflicts bb-340
ihorLysak Sep 26, 2024
2c047e4
chore: undo changes to lock file bb-340
fshabanov Sep 26, 2024
a173a3f
fix: added commas to message with user's selected categories, upperca…
ihorLysak Sep 27, 2024
80cec49
fix: resolved conflicts bb-340
ihorLysak Sep 27, 2024
85bdea8
fix: merged remote, fixed conflicts bb-340
ihorLysak Sep 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions apps/frontend/src/modules/chat/slices/chat.slice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,7 @@ const { actions, name, reducer } = createSlice({

state.messages.push(...messages);

state.buttonsMode = ButtonsModeOption.SUGGESTIONS_EXPLANATION;
})
.addCase(getTasksForCategories.rejected, (state) => {
state.dataStatus = DataStatus.REJECTED;
state.buttonsMode = ButtonsModeOption.SUGGESTIONS_MANIPULATION;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was rejected state removed?

})
.addCase(explainTasksSuggestions.pending, (state) => {
state.dataStatus = DataStatus.PENDING;
Expand All @@ -92,12 +89,15 @@ const { actions, name, reducer } = createSlice({
state.messages.push(...messages);
state.buttonsMode = ButtonsModeOption.SUGGESTIONS_MANIPULATION;
})
.addCase(changeTasksSuggestion.rejected, (state) => {
state.dataStatus = DataStatus.REJECTED;
})

.addCase(changeTasksSuggestion.pending, (state) => {
state.dataStatus = DataStatus.PENDING;
})
.addCase(changeTasksSuggestion.fulfilled, (state, action) => {
const { messages, taskSuggestions } = action.payload;

state.dataStatus = DataStatus.FULFILLED;
state.taskSuggestions = taskSuggestions;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,9 @@ const CategoriesSelector: React.FC = () => {
threadId: threadId ?? "",
};

let namesOfSelectedCategories = "";

for (const category of newSelectedCategories) {
namesOfSelectedCategories += `${category.name}\n`;
}
let namesOfSelectedCategories = newSelectedCategories
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let namesOfSelectedCategories = newSelectedCategories
const namesOfSelectedCategories = newSelectedCategories

.map((category) => category.name)
.join(", ");

dispatch(chatActions.setButtonsMode(ButtonsModeOption.NONE));
dispatch(chatActions.addAssistantTextMessage(CATEGORIES_SELECTOR_TEXT));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const InitialMessages: React.FC = () => {
<div className={styles["message-container"]}>
<Icon name="aiAssistantAvatar" />
<div className={styles["content-container"]}>
<p>here&apos;s how your wheel looks like right now:</p>
<p>Here&apos;s how your wheel looks like right now:</p>
<div className={styles["content"]}>
<BalanceWheelChart data={chartData} variant="chat" />
</div>
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading