Merge branch 'development' into 2962/fix-app-sharing-revoke

epam · Jan 29, 2025 · 02b947b · 02b947b
2 parents 6729e5e + ca0f6ea
commit 02b947b
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 18 deletions.
diff --git a/apps/chat/src/components/Chat/Publish/PublicVersionSelector.tsx b/apps/chat/src/components/Chat/Publish/PublicVersionSelector.tsx
@@ -23,13 +23,13 @@ interface Props {
   readonly?: boolean;
   groupVersions?: boolean;
   textBeforeSelector?: string | null;
+  selectedEntityId?: string;
+  excludeEntityId?: string;
   onChangeSelectedVersion?: (
     versionGroupId: string,
     newVersion: NonNullable<PublicVersionGroups[string]>['selectedVersion'],
     oldVersion: NonNullable<PublicVersionGroups[string]>['selectedVersion'],
   ) => void;
-  selectedEntityId?: string;
-  excludeEntityId?: string;
 }
 
 export function PublicVersionSelector({
@@ -38,9 +38,9 @@ export function PublicVersionSelector({
   readonly,
   groupVersions,
   textBeforeSelector,
-  onChangeSelectedVersion,
   selectedEntityId,
   excludeEntityId,
+  onChangeSelectedVersion,
 }: Props) {
   const { t } = useTranslation(Translation.Chat);
 

diff --git a/apps/chat/src/store/publication/publication.epics.ts b/apps/chat/src/store/publication/publication.epics.ts
@@ -598,10 +598,10 @@ const uploadPublishedWithMeItemsEpic: AppEpic = (action$, state$) =>
           const selectedIds =
             ConversationsSelectors.selectSelectedConversationsIds(state$.value);
 
-          const selectedConversationsToUpload = selectedIds
+          const selectedConversationsToUpload = selectedIds.filter(
             // do not upload root entities, as they uploaded with listing
-            .filter((id) => id.split('/').length > 3)
-            .filter((id) => isEntityIdPublic({ id }));
+            (id) => id.split('/').length > 3 && isEntityIdPublic({ id }),
+          );
           const publicationItems = items.map((item) => ({
             ...item,
             id: item.url,
@@ -664,8 +664,6 @@ const uploadPublishedWithMeItemsEpic: AppEpic = (action$, state$) =>
                     publicVersionGroups,
                   }),
                 ),
-              );
-              actions.push(
                 of(
                   ConversationsActions.addConversations({
                     conversations,
@@ -703,8 +701,6 @@ const uploadPublishedWithMeItemsEpic: AppEpic = (action$, state$) =>
                     publicVersionGroups,
                   }),
                 ),
-              );
-              actions.push(
                 of(
                   PromptsActions.addPrompts({
                     prompts,
@@ -838,7 +834,7 @@ const approvePublicationEpic: AppEpic = (action$, state$) =>
             });
 
             const versionGroups = uniq(
-              itemsToRemoveIds.map((id) =>
+              idsToExclude.map((id) =>
                 getIdWithoutVersionFromApiKey(id, parseConversationApiKey),
               ),
             );
@@ -860,6 +856,7 @@ const approvePublicationEpic: AppEpic = (action$, state$) =>
                       name: conv.name,
                       folderId: conv.folderId,
                       publicationInfo: {
+                        ...conv.publicationInfo,
                         isNotExist: true,
                       },
                       publishedWithMe: false,
@@ -990,7 +987,7 @@ const approvePublicationEpic: AppEpic = (action$, state$) =>
               return !hasPrompts && hasHiddenPrompts;
             });
             const versionGroups = uniq(
-              itemsToRemoveIds.map((id) => {
+              idsToExclude.map((id) => {
                 return getIdWithoutVersionFromApiKey(id, parsePromptApiKey);
               }),
             );
@@ -1011,6 +1008,7 @@ const approvePublicationEpic: AppEpic = (action$, state$) =>
                       name: prompt.name,
                       folderId: prompt.folderId,
                       publicationInfo: {
+                        ...prompt.publicationInfo,
                         isNotExist: true,
                       },
                       publishedWithMe: false,
@@ -1102,6 +1100,12 @@ const approvePublicationEpic: AppEpic = (action$, state$) =>
             of(
               PublicationActions.approvePublicationSuccess({
                 url: payload.url,
+                triggerModelsListing: selectedPublication.resources.some(
+                  (resource) => isApplicationId(resource.reviewUrl),
+                ),
+                triggerPublicFilesListing: selectedPublication.resources.some(
+                  (resource) => isFileId(resource.reviewUrl),
+                ),
               }),
             ),
           );
@@ -1150,6 +1154,30 @@ const rejectPublicationFailEpic: AppEpic = (action$) =>
     ),
   );
 
+const approvePublicationSuccessEpic: AppEpic = (action$) =>
+  action$.pipe(
+    filter(PublicationActions.approvePublicationSuccess.match),
+    switchMap(({ payload }) => {
+      const actions: Observable<AnyAction>[] = [];
+
+      if (payload.triggerModelsListing) {
+        actions.push(of(ModelsActions.getModels()));
+      }
+
+      if (payload.triggerPublicFilesListing) {
+        actions.push(
+          of(
+            PublicationActions.uploadPublishedWithMeItems({
+              featureType: FeatureType.File,
+            }),
+          ),
+        );
+      }
+
+      return concat(...actions);
+    }),
+  );
+
 const resolvePublicationSuccessEpic: AppEpic = (action$, state$) =>
   action$.pipe(
     filter(
@@ -1284,8 +1312,6 @@ const uploadAllPublishedWithMeItemsEpic: AppEpic = (action$, state$) =>
                   publicVersionGroups,
                 }),
               ),
-            );
-            actions.push(
               of(
                 ConversationsActions.uploadChildConversationsWithFoldersSuccess(
                   {
@@ -1309,8 +1335,6 @@ const uploadAllPublishedWithMeItemsEpic: AppEpic = (action$, state$) =>
                   publicVersionGroups,
                 }),
               ),
-            );
-            actions.push(
               of(
                 PromptsActions.uploadChildPromptsWithFoldersSuccess({
                   parentIds: paths,
@@ -1368,11 +1392,12 @@ export const PublicationEpics = combineEpics(
   uploadAllPublishedWithMeItemsEpic,
   uploadAllPublishedWithMeItemsFailEpic,
 
-  // handle publications
+  // resolve publications
   approvePublicationEpic,
   approvePublicationFailEpic,
   rejectPublicationEpic,
   rejectPublicationFailEpic,
+  approvePublicationSuccessEpic,
   resolvePublicationSuccessEpic,
 
   // upload rules

diff --git a/apps/chat/src/store/publication/publication.reducers.ts b/apps/chat/src/store/publication/publication.reducers.ts
@@ -109,7 +109,13 @@ export const publicationSlice = createSlice({
       state,
     approvePublicationSuccess: (
       state,
-      { payload }: PayloadAction<{ url: string }>,
+      {
+        payload,
+      }: PayloadAction<{
+        url: string;
+        triggerModelsListing: boolean;
+        triggerPublicFilesListing: boolean;
+      }>,
     ) => {
       state.publications = state.publications.filter(
         (p) => p.url !== payload.url,