From: Pawel Kromplewski <pawel.kromplewski@contractors.roche.com>
Date: Tue, 13 Nov 2018 13:22:42 +0000 (+0100)
Subject: Merge branch 'master' into 14421-last-modified-filtering
X-Git-Tag: 1.3.0~26^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/1f9a8ec32f818d8e78d683ad5569b9e4ae0f693a

Merge branch 'master' into 14421-last-modified-filtering

refs #14421

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

1f9a8ec32f818d8e78d683ad5569b9e4ae0f693a
diff --cc src/store/shared-with-me-panel/shared-with-me-middleware-service.ts
index 7e30ff55,b268e315..c139b429
--- 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
@@@ -18,8 -18,6 +18,7 @@@ import { SortDirection } from '~/compon
  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";
  
  export class SharedWithMeMiddlewareService extends DataExplorerMiddlewareService {
      constructor(private services: ServiceRepository, id: string) {
@@@ -51,16 -49,8 +50,8 @@@ export const getParams = (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