EPMRPP-96603 || Search component does not work on all pages (#4096)

reportportal · Nov 15, 2024 · 43d75c5 · 43d75c5
1 parent b5127d6
commit 43d75c5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/app/src/controllers/instance/organizations/selectors.js b/app/src/controllers/instance/organizations/selectors.js
@@ -29,7 +29,7 @@ export const organizationsListPaginationSelector = (state) =>
 
 export const querySelector = createAlternativeQueryParametersSelector({
   defaultPagination: DEFAULT_PAGINATION,
-  defaultDirection: SORTING_ASC,
+  defaultSorting: SORTING_ASC,
   sortingKey: SORTING_KEY,
-  namespace: NAMESPACE,
+  alternativeNamespace: NAMESPACE,
 });
diff --git a/app/src/controllers/organization/projects/selectors.js b/app/src/controllers/organization/projects/selectors.js
@@ -27,7 +27,7 @@ export const loadingSelector = (state) => domainSelector(state).loading || false
 
 export const querySelector = createAlternativeQueryParametersSelector({
   defaultPagination: DEFAULT_PAGINATION,
-  defaultDirection: SORTING_ASC,
+  defaultSorting: SORTING_ASC,
   sortingKey: SORTING_KEY,
-  namespace: NAMESPACE,
+  alternativeNamespace: NAMESPACE,
 });
diff --git a/app/src/controllers/organization/users/selectors.js b/app/src/controllers/organization/users/selectors.js
@@ -28,7 +28,7 @@ export const loadingSelector = (state) => domainSelector(state).loading || false
 
 export const querySelector = createAlternativeQueryParametersSelector({
   defaultPagination: DEFAULT_PAGINATION,
-  defaultDirection: SORTING_ASC,
+  defaultSorting: SORTING_ASC,
   sortingKey: SORTING_KEY,
-  namespace: NAMESPACE,
+  alternativeNamespace: NAMESPACE,
 });
diff --git a/app/src/controllers/pages/selectors.js b/app/src/controllers/pages/selectors.js
@@ -107,13 +107,16 @@ export const prevPagePropertiesSelector = (
 
 export const createQueryParametersSelector = ({
   namespace: staticNamespace,
+  alternativeNamespace,
   defaultPagination,
   defaultSorting,
   sortingKey = SORTING_KEY,
 } = {}) => (state, namespace) => {
-  const calculatedNamespace = staticNamespace || namespace;
+  const calculatedNamespace = staticNamespace || namespace || alternativeNamespace;
   const calculatedPagination = defaultPagination || DEFAULT_PAGINATION;
-  const query = pagePropertiesSelector(state, calculatedNamespace);
+  const query = alternativeNamespace
+    ? querySelector(state)
+    : pagePropertiesSelector(state, calculatedNamespace);
   const queryParameters = {
     ...calculatedPagination,
     [sortingKey]: defaultSorting || '',
@@ -138,14 +141,14 @@ export const createAlternativeQueryParametersSelector = ({
   defaultPagination,
   defaultSorting,
   sortingKey,
-  namespace,
+  alternativeNamespace,
 } = {}) =>
   createSelector(
     createQueryParametersSelector({
       defaultPagination,
       defaultSorting,
       sortingKey,
-      namespace,
+      alternativeNamespace,
     }),
     ({ [SIZE_KEY]: limit, [SORTING_KEY]: sort, [PAGE_KEY]: pageNumber, ...rest }) => {
       return { ...getAlternativePaginationAndSortParams(sort, limit, pageNumber), ...rest };