fix(chat): refactor init requests (Issue #2598) (#2627)

Co-authored-by: Magomed-Elbi Dzhukalaev <[email protected]> Co-authored-by: Ilya Bondar <[email protected]> Co-authored-by: Irina_Kartun <[email protected]>
epam · Nov 19, 2024 · 7f02d2b · 7f02d2b
1 parent 2f4a2a0
commit 7f02d2b
Show file tree

Hide file tree

Showing 27 changed files with 157 additions and 28 deletions.
diff --git a/apps/chat-e2e/src/testData/expectedConstants.ts b/apps/chat-e2e/src/testData/expectedConstants.ts
@@ -270,6 +270,7 @@ export const API = {
   shareListing: '/api/share/listing',
   discardShareWithMeItem: '/api/share/discard',
   installedDeploymentsHost: 'clientdata/installed_deployments.json',
+  marketplaceHost: 'marketplace.json',
   publicationRequestHost: '/api/publication/create',
   publicationRequestCreate: '/api/publication/create',
   publicationRequestRejection: '/api/publication/reject',

diff --git a/apps/chat-e2e/src/ui/webElements/entitySelector.ts b/apps/chat-e2e/src/ui/webElements/entitySelector.ts
@@ -27,7 +27,7 @@ export class EntitySelector extends BaseElement {
 
   public async searchOnMyAppButton() {
     const responsePromise = this.page.waitForResponse((resp) =>
-      resp.url().includes(API.installedDeploymentsHost),
+      resp.url().includes(API.marketplaceHost),
     );
     await this.searchOnMyApplicationsButton.click();
     await responsePromise;

diff --git a/apps/chat/src/components/Marketplace/Marketplace.tsx b/apps/chat/src/components/Marketplace/Marketplace.tsx
@@ -11,10 +11,7 @@ import {
   MarketplaceActions,
   MarketplaceSelectors,
 } from '@/src/store/marketplace/marketplace.reducers';
-import {
-  ModelsActions,
-  ModelsSelectors,
-} from '@/src/store/models/models.reducers';
+import { ModelsSelectors } from '@/src/store/models/models.reducers';
 import { UISelectors } from '@/src/store/ui/ui.reducers';
 
 import {
@@ -55,10 +52,6 @@ export const Marketplace = () => {
     return () => resizeObserver.disconnect();
   }, []);
 
-  useEffect(() => {
-    dispatch(ModelsActions.getModels());
-  }, [dispatch]);
-
   useEffect(() => {
     dispatch(
       MarketplaceActions.setSelectedTab(

diff --git a/apps/chat/src/store/addons/addons.epics.ts b/apps/chat/src/store/addons/addons.epics.ts
@@ -25,7 +25,11 @@ import { AddonsActions, AddonsSelectors } from './addons.reducers';
 
 const initEpic: AppEpic = (action$, state$) =>
   action$.pipe(
-    filter(AddonsActions.init.match),
+    filter(
+      (action) =>
+        AddonsActions.init.match(action) &&
+        !AddonsSelectors.selectInitialized(state$.value),
+    ),
     switchMap(() => DataService.getRecentAddonsIds()),
     switchMap((recentAddonsIds) =>
       concat(
@@ -37,6 +41,7 @@ const initEpic: AppEpic = (action$, state$) =>
           }),
         ),
         of(AddonsActions.getAddons()),
+        of(AddonsActions.initFinish()),
       ),
     ),
   );

diff --git a/apps/chat/src/store/addons/addons.reducers.ts b/apps/chat/src/store/addons/addons.reducers.ts
@@ -10,6 +10,7 @@ import { errorsMessages } from '@/src/constants/errors';
 import { RootState } from '../index';
 
 export interface AddonsState {
+  initialized: boolean;
   isLoading: boolean;
   error: ErrorMessage | undefined;
   addons: DialAIEntityAddon[];
@@ -18,6 +19,7 @@ export interface AddonsState {
 }
 
 const initialState: AddonsState = {
+  initialized: false,
   isLoading: false,
   error: undefined,
   addons: [],
@@ -30,6 +32,9 @@ export const addonsSlice = createSlice({
   initialState,
   reducers: {
     init: (state) => state,
+    initFinish: (state) => {
+      state.initialized = true;
+    },
     getAddons: (state) => {
       state.isLoading = true;
     },
@@ -112,13 +117,18 @@ const selectAddonsMap = createSelector([rootSelector], (state) => {
 const selectRecentAddonsIds = createSelector([rootSelector], (state) => {
   return state.recentAddonsIds;
 });
+const selectInitialized = createSelector(
+  [rootSelector],
+  (state) => state.initialized,
+);
 
 export const AddonsSelectors = {
   selectAddonsIsLoading,
   selectAddonsError,
   selectAddons,
   selectAddonsMap,
   selectRecentAddonsIds,
+  selectInitialized,
 };
 
 export const AddonsActions = addonsSlice.actions;
diff --git a/apps/chat/src/store/conversations/conversations.epics.ts b/apps/chat/src/store/conversations/conversations.epics.ts
@@ -126,9 +126,13 @@ import {
 import omit from 'lodash-es/omit';
 import uniq from 'lodash-es/uniq';
 
-const initEpic: AppEpic = (action$) =>
+const initEpic: AppEpic = (action$, state$) =>
   action$.pipe(
-    filter((action) => ConversationsActions.init.match(action)),
+    filter(
+      (action) =>
+        ConversationsActions.init.match(action) &&
+        !ConversationsSelectors.selectInitialized(state$.value),
+    ),
     switchMap(() => {
       const searchParams = new URLSearchParams(window.location.search);
 
@@ -143,6 +147,7 @@ const initEpic: AppEpic = (action$) =>
           of(ConversationsActions.initSelectedConversations()),
         ),
         of(ConversationsActions.initFoldersAndConversations()),
+        of(ConversationsActions.initFinish()),
       );
     }),
   );

diff --git a/apps/chat/src/store/conversations/conversations.reducers.ts b/apps/chat/src/store/conversations/conversations.reducers.ts
@@ -35,6 +35,7 @@ import xor from 'lodash-es/xor';
 export { ConversationsSelectors };
 
 const initialState: ConversationsState = {
+  initialized: false,
   conversations: [],
   selectedConversationsIds: [],
   folders: [],
@@ -67,6 +68,9 @@ export const conversationsSlice = createSlice({
   initialState,
   reducers: {
     init: (state) => state,
+    initFinish: (state) => {
+      state.initialized = true;
+    },
     initSelectedConversations: (state) => state,
     initFoldersAndConversations: (state) => state,
     initFoldersAndConversationsSuccess: (state) => {

diff --git a/apps/chat/src/store/conversations/conversations.selectors.ts b/apps/chat/src/store/conversations/conversations.selectors.ts
@@ -842,3 +842,8 @@ export const selectIsNewConversationUpdating = createSelector(
     return state.isNewConversationUpdating;
   },
 );
+
+export const selectInitialized = createSelector(
+  [rootSelector],
+  (state) => state.initialized,
+);
diff --git a/apps/chat/src/store/conversations/conversations.types.ts b/apps/chat/src/store/conversations/conversations.types.ts
@@ -10,6 +10,7 @@ import {
 } from '@epam/ai-dial-shared';
 
 export interface ConversationsState {
+  initialized: boolean;
   conversations: ConversationInfo[];
   selectedConversationsIds: string[];
   folders: FolderInterface[];

diff --git a/apps/chat/src/store/files/files.epics.ts b/apps/chat/src/store/files/files.epics.ts
@@ -29,14 +29,21 @@ import { FilesActions, FilesSelectors } from './files.reducers';
 
 import { UploadStatus } from '@epam/ai-dial-shared';
 
-const initEpic: AppEpic = (action$) =>
+const initEpic: AppEpic = (action$, state$) =>
   action$.pipe(
-    filter(FilesActions.init.match),
+    filter(
+      (action) =>
+        FilesActions.init.match(action) &&
+        !FilesSelectors.selectInitialized(state$.value),
+    ),
     switchMap(() =>
-      of(
-        PublicationActions.uploadPublishedWithMeItems({
-          featureType: FeatureType.File,
-        }),
+      concat(
+        of(
+          PublicationActions.uploadPublishedWithMeItems({
+            featureType: FeatureType.File,
+          }),
+        ),
+        of(FilesActions.initFinish()),
       ),
     ),
   );

diff --git a/apps/chat/src/store/files/files.reducers.ts b/apps/chat/src/store/files/files.reducers.ts
@@ -24,6 +24,7 @@ import { UploadStatus } from '@epam/ai-dial-shared';
 import uniq from 'lodash-es/uniq';
 
 export interface FilesState {
+  initialized: boolean;
   files: DialFile[];
   selectedFilesIds: string[];
   filesStatus: UploadStatus;
@@ -36,6 +37,7 @@ export interface FilesState {
 }
 
 const initialState: FilesState = {
+  initialized: false,
   files: [],
   filesStatus: UploadStatus.UNINITIALIZED,
   selectedFilesIds: [],
@@ -50,6 +52,9 @@ export const filesSlice = createSlice({
   initialState,
   reducers: {
     init: (state) => state,
+    initFinish: (state) => {
+      state.initialized = true;
+    },
     uploadFile: (
       state,
       {
@@ -527,6 +532,10 @@ const selectPublicationFolders = createSelector(
     return state.folders.filter((f) => f.isPublicationFolder);
   },
 );
+const selectInitialized = createSelector(
+  [rootSelector],
+  (state) => state.initialized,
+);
 
 export const FilesSelectors = {
   selectFiles,
@@ -544,6 +553,7 @@ export const FilesSelectors = {
   selectFileById,
   selectFoldersWithSearchTerm,
   selectPublicationFolders,
+  selectInitialized,
 };
 
 export const FilesActions = filesSlice.actions;
diff --git a/apps/chat/src/store/migration/migration.epics.ts b/apps/chat/src/store/migration/migration.epics.ts
@@ -31,19 +31,24 @@ import { AppEpic } from '@/src/types/store';
 
 import { SettingsSelectors } from '../settings/settings.reducers';
 import { UIActions } from '../ui/ui.reducers';
-import { MigrationActions } from './migration.reducers';
+import { MigrationActions, MigrationSelectors } from './migration.reducers';
 
 import orderBy from 'lodash-es/orderBy';
 
 const browserStorage = new BrowserStorage();
 
-const initEpic: AppEpic = (action$) =>
+const initEpic: AppEpic = (action$, state$) =>
   action$.pipe(
-    filter(MigrationActions.init.match),
+    filter(
+      (action) =>
+        MigrationActions.init.match(action) &&
+        !MigrationSelectors.selectInitialized(state$.value),
+    ),
     switchMap(() =>
       concat(
         of(MigrationActions.migrateConversationsIfRequired()),
         of(MigrationActions.migratePromptsIfRequired()),
+        of(MigrationActions.initFinish()),
       ),
     ),
   );

diff --git a/apps/chat/src/store/migration/migration.reducers.ts b/apps/chat/src/store/migration/migration.reducers.ts
@@ -9,6 +9,7 @@ import { MigrationState } from './migration.types';
 export { MigrationSelectors };
 
 const initialState: MigrationState = {
+  initialized: false,
   conversationsToMigrateCount: 0,
   migratedConversationsCount: 0,
   failedMigratedConversations: [],
@@ -24,6 +25,9 @@ export const migrationSlice = createSlice({
   initialState,
   reducers: {
     init: (state) => state,
+    initFinish: (state) => {
+      state.initialized = true;
+    },
     migrateConversationsIfRequired: (state) => state,
     initConversationsMigration: (
       state,

diff --git a/apps/chat/src/store/migration/migration.selectors.ts b/apps/chat/src/store/migration/migration.selectors.ts
@@ -40,3 +40,8 @@ export const selectIsPromptsBackedUp = createSelector(
   [rootSelector],
   (state) => state.isPromptsBackedUp,
 );
+
+export const selectInitialized = createSelector(
+  [rootSelector],
+  (state) => state.initialized,
+);
diff --git a/apps/chat/src/store/migration/migration.types.ts b/apps/chat/src/store/migration/migration.types.ts
@@ -2,6 +2,7 @@ import { Conversation } from '@/src/types/chat';
 import { Prompt } from '@/src/types/prompt';
 
 export interface MigrationState {
+  initialized: boolean;
   conversationsToMigrateCount: number;
   migratedConversationsCount: number;
   failedMigratedConversations: Conversation[];

diff --git a/apps/chat/src/store/models/models.epics.ts b/apps/chat/src/store/models/models.epics.ts
@@ -49,10 +49,16 @@ import { ModelsActions, ModelsSelectors } from './models.reducers';
 import { Feature } from '@epam/ai-dial-shared';
 import uniqBy from 'lodash-es/uniqBy';
 
-const initEpic: AppEpic = (action$) =>
+const initEpic: AppEpic = (action$, state$) =>
   action$.pipe(
-    filter(ModelsActions.init.match),
-    switchMap(() => of(ModelsActions.getModels())),
+    filter(
+      (action) =>
+        ModelsActions.init.match(action) &&
+        !ModelsSelectors.selectInitialized(state$.value),
+    ),
+    switchMap(() =>
+      concat(of(ModelsActions.getModels()), of(ModelsActions.initFinish())),
+    ),
   );
 
 const initRecentModelsEpic: AppEpic = (action$, state$) =>

diff --git a/apps/chat/src/store/models/models.reducers.ts b/apps/chat/src/store/models/models.reducers.ts
@@ -26,6 +26,7 @@ import omit from 'lodash-es/omit';
 import uniq from 'lodash-es/uniq';
 
 export interface ModelsState {
+  initialized: boolean;
   status: UploadStatus;
   error: ErrorMessage | undefined;
   models: DialAIEntityModel[];
@@ -39,6 +40,7 @@ export interface ModelsState {
 }
 
 const initialState: ModelsState = {
+  initialized: false,
   status: UploadStatus.UNINITIALIZED,
   error: undefined,
   models: [],
@@ -56,6 +58,9 @@ export const modelsSlice = createSlice({
   initialState,
   reducers: {
     init: (state) => state,
+    initFinish: (state) => {
+      state.initialized = true;
+    },
     getModels: (state) => {
       state.status = UploadStatus.LOADING;
     },
@@ -360,6 +365,11 @@ const selectRecentWithInstalledModelsIds = createSelector(
   },
 );
 
+const selectInitialized = createSelector(
+  [rootSelector],
+  (state) => state.initialized,
+);
+
 export const ModelsSelectors = {
   selectIsInstalledModelsInitialized,
   selectIsModelsLoaded,
@@ -378,6 +388,7 @@ export const ModelsSelectors = {
   selectPublishedApplicationIds,
   selectModelTopics,
   selectRecentWithInstalledModelsIds,
+  selectInitialized,
 };
 
 export const ModelsActions = modelsSlice.actions;
diff --git a/apps/chat/src/store/prompts/prompts.epics.ts b/apps/chat/src/store/prompts/prompts.epics.ts
@@ -63,9 +63,13 @@ import { UploadStatus } from '@epam/ai-dial-shared';
 import omit from 'lodash-es/omit';
 import uniq from 'lodash-es/uniq';
 
-const initEpic: AppEpic = (action$) =>
+const initEpic: AppEpic = (action$, state$) =>
   action$.pipe(
-    filter((action) => PromptsActions.init.match(action)),
+    filter(
+      (action) =>
+        PromptsActions.init.match(action) &&
+        !PromptsSelectors.selectInitialized(state$.value),
+    ),
     switchMap(() =>
       PromptService.getPrompts(undefined, true).pipe(
         mergeMap((prompts) => {
@@ -88,6 +92,7 @@ const initEpic: AppEpic = (action$) =>
               }),
             ),
             of(PromptsActions.initFoldersAndPromptsSuccess()),
+            of(PromptsActions.initFinish()),
           );
         }),
       ),