X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/24465ca7021802400200a36fe1f2fe9064f91643..4b961d16b8f8ef8afbd13697a79fe4684acd0416:/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts

diff --git a/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts b/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts
index 5ec3ae7e..a09a3085 100644
--- a/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts
+++ b/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts
@@ -9,16 +9,17 @@ import { RootState } from '~/store/store';
 import { getDataExplorer, DataExplorer } from '~/store/data-explorer/data-explorer-reducer';
 import { updateFavorites } from '~/store/favorites/favorites-actions';
 import { updateResources } from '~/store/resources/resources-actions';
-import { loadMissingProcessesInformation } from '~/store/project-panel/project-panel-middleware-service';
-import { snackbarActions } from '~/store/snackbar/snackbar-actions';
+import { loadMissingProcessesInformation, getFilters } from '~/store/project-panel/project-panel-middleware-service';
+import {snackbarActions, SnackbarKind} from '~/store/snackbar/snackbar-actions';
 import { sharedWithMePanelActions } from './shared-with-me-panel-actions';
-import { ListResults } from '~/services/common-service/common-resource-service';
+import { ListResults } from '~/services/common-service/common-service';
 import { GroupContentsResource, GroupContentsResourcePrefix } from '~/services/groups-service/groups-service';
 import { SortDirection } from '~/components/data-table/data-column';
 import { OrderBuilder, OrderDirection } from '~/services/api/order-builder';
 import { ProjectResource } from '~/models/project';
 import { ProjectPanelColumnNames } from '~/views/project-panel/project-panel';
-import { FilterBuilder } from '~/services/api/filter-builder';
+import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer";
+import { updatePublicFavorites } from '~/store/public-favorites/public-favorites-actions';
 
 export class SharedWithMeMiddlewareService extends DataExplorerMiddlewareService {
     constructor(private services: ServiceRepository, id: string) {
@@ -35,6 +36,7 @@ export class SharedWithMeMiddlewareService extends DataExplorerMiddlewareService
                     excludeHomeProject: true,
                 });
             api.dispatch<any>(updateFavorites(response.items.map(item => item.uuid)));
+            api.dispatch<any>(updatePublicFavorites(response.items.map(item => item.uuid)));
             api.dispatch(updateResources(response.items));
             await api.dispatch<any>(loadMissingProcessesInformation(response.items));
             api.dispatch(setItems(response));
@@ -50,16 +52,8 @@ export const getParams = (dataExplorer: DataExplorer) => ({
     filters: getFilters(dataExplorer),
 });
 
-export const getFilters = (dataExplorer: DataExplorer) => {
-    return new FilterBuilder()
-        .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.COLLECTION)
-        .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.PROCESS)
-        .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.PROJECT)
-        .getFilters();
-};
-
 export const getOrder = (dataExplorer: DataExplorer) => {
-    const sortColumn = dataExplorer.columns.find(c => c.sortDirection !== SortDirection.NONE);
+    const sortColumn = getSortColumn(dataExplorer);
     const order = new OrderBuilder<ProjectResource>();
     if (sortColumn) {
         const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
@@ -90,5 +84,6 @@ export const setItems = (listResults: ListResults<GroupContentsResource>) =>
 
 const couldNotFetchSharedItems = () =>
     snackbarActions.OPEN_SNACKBAR({
-        message: 'Could not fetch shared items.'
+        message: 'Could not fetch shared items.',
+        kind: SnackbarKind.ERROR
     });