[ARVADOS-WORKBENCH2] updated: 1.2.0-935-gda64c0d

[Git user]

Summary of changes:
 .../project-panel-middleware-service.ts             | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

       via  da64c0d5be6c1c0b1cf4f0e1f600a281506e9b09 (commit)
      from  0fd32542a6ee7f9db950609a408b18d3b6017a56 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit da64c0d5be6c1c0b1cf4f0e1f600a281506e9b09
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Thu Nov 22 15:48:06 2018 +0100

    Restore nameFilters in project-panel-middleware-service
    
    Feature #14258
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/store/project-panel/project-panel-middleware-service.ts b/src/store/project-panel/project-panel-middleware-service.ts
index 7a1cab6..18f5f0d 100644
--- a/src/store/project-panel/project-panel-middleware-service.ts
+++ b/src/store/project-panel/project-panel-middleware-service.ts
@@ -14,7 +14,7 @@ import { DataColumns } from "~/components/data-table/data-table";
 import { ServiceRepository } from "~/services/services";
 import { SortDirection } from "~/components/data-table/data-column";
 import { OrderBuilder, OrderDirection } from "~/services/api/order-builder";
-import { FilterBuilder } from "~/services/api/filter-builder";
+import { FilterBuilder, joinFilters } from "~/services/api/filter-builder";
 import { GroupContentsResource, GroupContentsResourcePrefix } from "~/services/groups-service/groups-service";
 import { updateFavorites } from "../favorites/favorites-actions";
 import { PROJECT_PANEL_CURRENT_UUID, IS_PROJECT_PANEL_TRASHED, projectPanelActions } from './project-panel-action';
@@ -118,15 +118,18 @@ export const getParams = (dataExplorer: DataExplorer, isProjectTrashed: boolean)
 export const getFilters = (dataExplorer: DataExplorer) => {
     const columns = dataExplorer.columns as DataColumns<string>;
     const typeFilters = serializeResourceTypeFilters(getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE));
-    return typeFilters;
+    const nameFilters = new FilterBuilder()
+        .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.COLLECTION)
+        .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.PROCESS)
+        .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.PROJECT)
+        .getFilters();
+
+    return joinFilters(
+        typeFilters,
+        nameFilters,
+    );
+    // TODO: Restore process status filters
     // const statusFilters = getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.STATUS);
-    // return new FilterBuilder()
-    //     // TODO: update filters
-    //     // .addIsA("uuid", typeFilters.map(f => f.type))
-    //     .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.COLLECTION)
-    //     .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.PROCESS)
-    //     .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.PROJECT)
-    //     .getFilters();
 };
 
 export const getOrder = (dataExplorer: DataExplorer) => {

-----------------------------------------------------------------------


hooks/post-receive
--