fix: fix prompts search (Issue epam#330) (epam#551)

WEAIDiscovery · Jan 17, 2024 · 36ff596 · 36ff596
1 parent 9ad4d4f
commit 36ff596
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/src/store/conversations/conversations.selectors.ts b/src/store/conversations/conversations.selectors.ts
@@ -85,10 +85,10 @@ export const selectFilteredFolders = createSelector(
     includeEmptyFolders?,
   ) =>
     getFilteredFolders(
-      state,
       folders,
       emptyFolderIds,
       filters,
+      selectFilteredConversations(state, filters, searchTerm),
       searchTerm,
       includeEmptyFolders,
     ),

diff --git a/src/store/prompts/prompts.selectors.ts b/src/store/prompts/prompts.selectors.ts
@@ -85,10 +85,10 @@ export const selectFilteredFolders = createSelector(
     includeEmptyFolders?,
   ) =>
     getFilteredFolders(
-      state,
       folders,
       emptyFolderIds,
       filters,
+      selectFilteredPrompts(state, filters, searchTerm),
       searchTerm,
       includeEmptyFolders,
     ),

diff --git a/src/utils/app/folders.ts b/src/utils/app/folders.ts
@@ -10,10 +10,6 @@ import { FolderInterface } from '@/src/types/folder';
 import { Prompt } from '@/src/types/prompt';
 import { EntityFilters } from '@/src/types/search';
 
-import { selectFilteredConversations } from '@/src/store/conversations/conversations.selectors';
-
-import { RootState } from '@/src/store';
-
 export const getFoldersDepth = (
   childFolder: FolderInterface,
   allFolders: FolderInterface[],
@@ -204,21 +200,14 @@ export const getPathToFolderById = (
 };
 
 export const getFilteredFolders = (
-  state: RootState,
   folders: FolderInterface[],
   emptyFolderIds: string[],
   filters: EntityFilters,
+  entities: Conversation[] | Prompt[],
   searchTerm?: string,
   includeEmptyFolders?: boolean,
 ) => {
-  const filteredConversations = selectFilteredConversations(
-    state,
-    filters,
-    searchTerm,
-  );
-  const folderIds = filteredConversations
-    .map((c) => c.folderId)
-    .filter((fid) => fid);
+  const folderIds = entities.map((c) => c.folderId).filter((fid) => fid);
 
   if (!searchTerm?.trim().length) {
     const markedFolderIds = folders