fix search-results ordering

Feature #14277

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

diff --git a/src/routes/routes.ts b/src/routes/routes.ts
index d5041976a75e347a33e39bbb862343c20cf793a5..e5f3493539e3cbaae317e95fc1b38d3f89cb032f 100644 (file)
--- a/src/routes/routes.ts
+++ b/src/routes/routes.ts
@@ -19,7 +19,7 @@ export const Routes = {
     SHARED_WITH_ME: '/shared-with-me',
     RUN_PROCESS: '/run-process',
     WORKFLOWS: '/workflows',
-    SEARCH_RESULTS: '/search'
+    SEARCH_RESULTS: '/search-results'
 };
 
 export const getResourceUrl = (uuid: string) => {

diff --git a/src/store/search-results-panel/search-results-middleware-service.ts b/src/store/search-results-panel/search-results-middleware-service.ts
index 924a0f09756c718d5dbdcd49e58383910bed8cdc..5ccb61bf6961c11ec95c3a8f11a706a9c6258490 100644 (file)
--- a/src/store/search-results-panel/search-results-middleware-service.ts
+++ b/src/store/search-results-panel/search-results-middleware-service.ts
@@ -9,7 +9,6 @@ import { RootState } from '~/store/store';
 import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
 import { DataExplorer, getDataExplorer } from '~/store/data-explorer/data-explorer-reducer';
 import { updateResources } from '~/store/resources/resources-actions';
-import { FilterBuilder } from '~/services/api/filter-builder';
 import { SortDirection } from '~/components/data-table/data-column';
 import { SearchResultsPanelColumnNames } from '~/views/search-results-panel/search-results-panel-view';
 import { OrderDirection, OrderBuilder } from '~/services/api/order-builder';
@@ -40,27 +39,27 @@ export class SearchResultsMiddlewareService extends DataExplorerMiddlewareServic
 
 export const getParams = (dataExplorer: DataExplorer, searchValue: string) => ({
     ...dataExplorerToListParams(dataExplorer),
-    filters: getFilters('name', searchValue)
+    filters: getFilters('name', searchValue),
+    order: getOrder(dataExplorer)
 });
 
-
-export const getOrder = (dataExplorer: DataExplorer) => {
+const getOrder = (dataExplorer: DataExplorer) => {
     const sortColumn = dataExplorer.columns.find(c => c.sortDirection !== SortDirection.NONE);
     const order = new OrderBuilder<GroupContentsResource>();
     if (sortColumn) {
         const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
             ? OrderDirection.ASC
             : OrderDirection.DESC;
+
         const columnName = sortColumn && sortColumn.name === SearchResultsPanelColumnNames.NAME ? "name" : "modifiedAt";
         return order
-            .addOrder(sortDirection, columnName)
-            .addOrder(sortDirection, "name", GroupContentsResourcePrefix.COLLECTION)
-            .addOrder(sortDirection, "name", GroupContentsResourcePrefix.PROCESS)
-            .addOrder(sortDirection, "name", GroupContentsResourcePrefix.PROJECT)
+            .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.COLLECTION)
+            .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.PROCESS)
+            .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.PROJECT)
             .getOrder();
     } else {
-    return order.getOrder();
-}
+        return order.getOrder();
+    }
 };
 
 export const setItems = (listResults: ListResults<GroupContentsResource>) =>

diff --git a/src/views/search-results-panel/search-results-panel-view.tsx b/src/views/search-results-panel/search-results-panel-view.tsx
index a31263abad0b98a7530d43cfa673e5e7e2390823..009b2abef409b23d432220eeb30cdb9680250768 100644 (file)
--- a/src/views/search-results-panel/search-results-panel-view.tsx
+++ b/src/views/search-results-panel/search-results-panel-view.tsx
@@ -9,7 +9,7 @@ import { DataTableFilterItem } from '~/components/data-table-filters/data-table-
 import { ResourceKind } from '~/models/resource';
 import { ContainerRequestState } from '~/models/container-request';
 import { resourceLabel } from '~/common/labels';
-import { SearchBarAdvanceFormData } from '~/store/search-bar/search-bar-actions';
+import { SearchBarAdvanceFormData } from '~/models/search-bar';
 import { SEARCH_RESULTS_PANEL_ID } from '~/store/search-results-panel/search-results-panel-actions';
 import { DataExplorer } from '~/views-components/data-explorer/data-explorer';
 import {