Merge branch 'development' of https://github.com/epam/ai-dial-chat in…

…to fix/2021-delete-app-tost
epam · Sep 10, 2024 · 0d6b874 · 0d6b874
2 parents c8025e6 + a5befa4
commit 0d6b874
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 37 deletions.
diff --git a/apps/chat/src/components/Chat/ModelList.tsx b/apps/chat/src/components/Chat/ModelList.tsx
@@ -361,7 +361,7 @@ export const ModelList = ({
 
     const modelsMapKeys = Object.keys(modelsMap);
 
-    onSelect(recentModelsIds[1] ?? modelsMap[modelsMapKeys[0]]);
+    onSelect(recentModelsIds[1] ?? modelsMap[modelsMapKeys[0]]?.reference);
   }, [currentEntity, modelsMap, onSelect, recentModelsIds, dispatch]);
 
   const handleConfirmDialogClose = useCallback(

diff --git a/apps/chat/src/components/Chatbar/ChatFolders.tsx b/apps/chat/src/components/Chatbar/ChatFolders.tsx
@@ -209,7 +209,7 @@ const ChatFolderTemplate = ({
       if (folder.sharedWithMe) {
         dispatch(
           ShareActions.discardSharedWithMe({
-            resourceId: folder.id,
+            resourceIds: [folder.id],
             isFolder: true,
             featureType: FeatureType.Chat,
           }),

diff --git a/apps/chat/src/components/Chatbar/Conversation.tsx b/apps/chat/src/components/Chatbar/Conversation.tsx
@@ -419,7 +419,7 @@ export const ConversationComponent = ({
     if (conversation.sharedWithMe) {
       dispatch(
         ShareActions.discardSharedWithMe({
-          resourceId: conversation.id,
+          resourceIds: [conversation.id],
           featureType: FeatureType.Chat,
         }),
       );

diff --git a/apps/chat/src/components/Files/FileManagerModal.tsx b/apps/chat/src/components/Files/FileManagerModal.tsx
@@ -544,11 +544,11 @@ export const FileManagerModal = ({
     [canAttachFiles, dispatch, forceShowSelectCheckBox],
   );
 
-  const handleDeleteFolder = useCallback(
+  const handleDiscardSharedWithMeFolder = useCallback(
     (folderId: string) => {
       dispatch(
         ShareActions.discardSharedWithMe({
-          resourceId: folderId,
+          resourceIds: [folderId],
           featureType: FeatureType.File,
           isFolder: true,
         }),
@@ -562,6 +562,16 @@ export const FileManagerModal = ({
       return;
     }
     if (deletingFileIds.length) {
+      const sharedWithMeFilesIds = sharedWithMeRootFiles
+        .filter(({ id }) => deletingFileIds.includes(id))
+        .map(({ id }) => id);
+
+      dispatch(
+        ShareActions.discardSharedWithMe({
+          resourceIds: sharedWithMeFilesIds,
+          featureType: FeatureType.File,
+        }),
+      );
       dispatch(FilesActions.deleteFilesList({ fileIds: deletingFileIds }));
       if (selectedFilesIds === deletingFileIds) {
         setSelectedFilesIds([]);
@@ -570,6 +580,15 @@ export const FileManagerModal = ({
     if (deletingFolderIds.length) {
       // TODO: implement
       // dispatch(FilesActions.deleteFolderList({ folderIds: deletingFolderIds }));
+      const sharedWithMeFoldersIds = sharedWithMeRootFolders
+        .filter(({ id }) => deletingFolderIds.includes(id))
+        .map(({ id }) => id);
+      dispatch(
+        ShareActions.discardSharedWithMe({
+          resourceIds: sharedWithMeFoldersIds,
+          featureType: FeatureType.File,
+        }),
+      );
       if (selectedFolderIds === deletingFolderIds) {
         setSelectedFolderIds([]);
       }
@@ -580,6 +599,8 @@ export const FileManagerModal = ({
     dispatch,
     selectedFilesIds,
     selectedFolderIds,
+    sharedWithMeRootFiles,
+    sharedWithMeRootFolders,
   ]);
 
   const handleDownloadMultipleFiles = useCallback(() => {
@@ -759,7 +780,7 @@ export const FileManagerModal = ({
                         canSelectFolders={canAttachFolders}
                         showTooltip={showTooltip}
                         onSelectFolder={handleFolderToggle}
-                        onDeleteFolder={handleDeleteFolder}
+                        onDeleteFolder={handleDiscardSharedWithMeFolder}
                       />
                     );
                   })}

diff --git a/apps/chat/src/components/Promptbar/components/Prompt.tsx b/apps/chat/src/components/Promptbar/components/Prompt.tsx
@@ -188,7 +188,7 @@ export const PromptComponent = ({
       if (prompt.sharedWithMe) {
         dispatch(
           ShareActions.discardSharedWithMe({
-            resourceId: prompt.id,
+            resourceIds: [prompt.id],
             featureType: FeatureType.Prompt,
           }),
         );

diff --git a/apps/chat/src/components/Promptbar/components/PromptFolders.tsx b/apps/chat/src/components/Promptbar/components/PromptFolders.tsx
@@ -251,7 +251,7 @@ const PromptFolderTemplate = ({
           if (folder.sharedWithMe) {
             dispatch(
               ShareActions.discardSharedWithMe({
-                resourceId: folder.id,
+                resourceIds: [folder.id],
                 isFolder: true,
                 featureType: FeatureType.Prompt,
               }),

diff --git a/apps/chat/src/store/conversations/conversations.epics.ts b/apps/chat/src/store/conversations/conversations.epics.ts
@@ -443,7 +443,7 @@ const createNewConversationsEpic: AppEpic = (action$, state$) =>
                       ),
                 messages: [],
                 model: {
-                  id: model.id,
+                  id: model.reference,
                 },
                 prompt: DEFAULT_SYSTEM_PROMPT,
                 temperature:

diff --git a/apps/chat/src/store/files/files.epics.ts b/apps/chat/src/store/files/files.epics.ts
@@ -24,7 +24,6 @@ import { FeatureType, UploadStatus } from '@/src/types/common';
 import { AppEpic } from '@/src/types/store';
 
 import { PublicationActions } from '../publication/publication.reducers';
-import { ShareActions } from '../share/share.reducers';
 import { UIActions, UISelectors } from '../ui/ui.reducers';
 import { FilesActions, FilesSelectors } from './files.reducers';
 
@@ -169,15 +168,6 @@ const deleteFileEpic: AppEpic = (action$, state$) =>
         (file) => file.id === payload.fileId,
       );
 
-      if (file && file.sharedWithMe) {
-        return of(
-          ShareActions.discardSharedWithMe({
-            resourceId: file.id,
-            featureType: FeatureType.File,
-          }),
-        );
-      }
-
       if (!file?.serverSynced) {
         return concat(
           of(

diff --git a/apps/chat/src/store/overlay/overlay.epics.ts b/apps/chat/src/store/overlay/overlay.epics.ts
@@ -286,16 +286,19 @@ const setOverlayOptionsEpic: AppEpic = (action$, state$) =>
           if (currentConversation) {
             const models = ModelsSelectors.selectModels(state$.value);
 
-            const newAiEntity = models.find(({ id }) => id === finalModelId) as
-              | DialAIEntityModel
-              | undefined;
+            const newAiEntity = models.find(
+              ({ reference, id }) =>
+                id === finalModelId || reference === finalModelId,
+            ) as DialAIEntityModel | undefined;
 
             actions.push(
               of(
                 ConversationsActions.updateConversation({
                   id: currentConversation.id,
                   values: {
-                    model: { id: finalModelId },
+                    model: {
+                      id: newAiEntity?.reference ?? finalModelId,
+                    },
                   },
                 }),
               ),

diff --git a/apps/chat/src/store/share/share.epics.ts b/apps/chat/src/store/share/share.epics.ts
@@ -853,12 +853,31 @@ const discardSharedWithMeEpic: AppEpic = (action$) =>
   action$.pipe(
     filter(ShareActions.discardSharedWithMe.match),
     switchMap(({ payload }) => {
-      const resourceUrl = payload.isFolder
-        ? ApiUtils.encodeApiUrl(payload.resourceId) + '/'
-        : ApiUtils.encodeApiUrl(payload.resourceId);
+      const resourceUrls = payload.isFolder
+        ? payload.resourceIds.map(
+            (resourceId) => ApiUtils.encodeApiUrl(resourceId) + '/',
+          )
+        : payload.resourceIds.map((resourceId) =>
+            ApiUtils.encodeApiUrl(resourceId),
+          );
 
-      return ShareService.shareDiscard([resourceUrl]).pipe(
-        map(() => ShareActions.discardSharedWithMeSuccess(payload)),
+      return ShareService.shareDiscard(resourceUrls).pipe(
+        switchMap(() => {
+          if (!payload.isFolder && payload.featureType === FeatureType.File) {
+            return EMPTY;
+          }
+          const actions: Observable<AnyAction>[] = payload.resourceIds.map(
+            (resourceId) =>
+              of(
+                ShareActions.discardSharedWithMeSuccess({
+                  resourceId,
+                  featureType: payload.featureType,
+                  isFolder: payload.isFolder,
+                }),
+              ),
+          );
+          return concat(...actions);
+        }),
         catchError(() => of(ShareActions.discardSharedWithMeFail())),
       );
     }),
@@ -970,14 +989,6 @@ const discardSharedWithMeSuccessEpic: AppEpic = (action$, state$) =>
       }
 
       if (payload.featureType === FeatureType.File) {
-        if (!payload.isFolder) {
-          return of(
-            FilesActions.deleteFileSuccess({
-              fileId: payload.resourceId,
-            }),
-          );
-        }
-
         const folders = FilesSelectors.selectFolders(state$.value);
         return concat(
           of(

diff --git a/apps/chat/src/store/share/share.reducers.ts b/apps/chat/src/store/share/share.reducers.ts
@@ -129,7 +129,7 @@ export const shareSlice = createSlice({
     discardSharedWithMe: (
       state,
       _action: PayloadAction<{
-        resourceId: string;
+        resourceIds: string[];
         featureType: FeatureType;
         isFolder?: boolean;
       }>,