16811: Filter "Public favorites" from "Shared with me" & add test

[arvados-workbench2.git] / 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 1ad1a4ddf5d7c6f357f48e4fed5fd4cee406a62b..e5dd6d9f31b41aca67a63a99609905acd9d3725d 100644 (file)
--- 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,17 +9,18 @@ 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 { getSortColumn } from "~/store/data-explorer/data-explorer-reducer";
+import { updatePublicFavorites } from '~/store/public-favorites/public-favorites-actions';
 import { FilterBuilder } from '~/services/api/filter-builder';
-import { getSortColumns } from "~/store/data-explorer/data-explorer-reducer";
 
 export class SharedWithMeMiddlewareService extends DataExplorerMiddlewareService {
     constructor(private services: ServiceRepository, id: string) {
@@ -34,8 +35,10 @@ export class SharedWithMeMiddlewareService extends DataExplorerMiddlewareService
                 .contents('', {
                     ...getParams(dataExplorer),
                     excludeHomeProject: true,
+                    filters: new FilterBuilder().addDistinct('uuid', `${state.auth.config.uuidPrefix}-j7d0g-publicfavorites`).getFilters()
                 });
             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));
@@ -51,16 +54,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 = getSortColumns(dataExplorer);
+    const sortColumn = getSortColumn(dataExplorer);
     const order = new OrderBuilder<ProjectResource>();
     if (sortColumn) {
         const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
@@ -91,5 +86,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
     });