[ARVADOS-WORKBENCH2] updated: 1.1.4-203-g3e1104d

[Git user]

Summary of changes:
 src/common/api/filter-builder.ts                 | 11 ++++-------
 src/components/data-explorer/data-explorer.tsx   |  4 ++--
 src/store/data-explorer/data-explorer-reducer.ts |  3 +++
 3 files changed, 9 insertions(+), 9 deletions(-)

       via  3e1104db668dcbfffe2e1b0165691b1d9ea306f3 (commit)
       via  e7c978d1f6fa309e8462fc952f2735c39a4040bb (commit)
       via  c75bda19a301c0a197dda696208ea10b6459c54a (commit)
      from  9df4e3529aee3343eba37ef5bfc004315ef28a59 (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 3e1104db668dcbfffe2e1b0165691b1d9ea306f3
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Thu Jul 5 12:12:26 2018 +0200

    Handle set_search_value action in data explorer reducer
    
    Feature #13703
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/store/data-explorer/data-explorer-reducer.ts b/src/store/data-explorer/data-explorer-reducer.ts
index 0622f0f..0112617 100644
--- a/src/store/data-explorer/data-explorer-reducer.ts
+++ b/src/store/data-explorer/data-explorer-reducer.ts
@@ -49,6 +49,9 @@ const dataExplorerReducer = (state: DataExplorerState = {}, action: DataExplorer
         SET_ROWS_PER_PAGE: ({ id, rowsPerPage }) =>
             update(state, id, explorer => ({ ...explorer, rowsPerPage })),
 
+        SET_SEARCH_VALUE: ({ id, searchValue }) =>
+            update(state, id, explorer => ({ ...explorer, searchValue })),
+
         TOGGLE_SORT: ({ id, columnName }) =>
             update(state, id, mapColumns(toggleSort(columnName))),
 

commit e7c978d1f6fa309e8462fc952f2735c39a4040bb
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Thu Jul 5 12:12:01 2018 +0200

    Make data explorer's search input always visible
    
    Feature #13703
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/components/data-explorer/data-explorer.tsx b/src/components/data-explorer/data-explorer.tsx
index a0ddc28..09a3272 100644
--- a/src/components/data-explorer/data-explorer.tsx
+++ b/src/components/data-explorer/data-explorer.tsx
@@ -54,9 +54,9 @@ class DataExplorer<T extends DataItem> extends React.Component<DataExplorerProps
             <Toolbar className={this.props.classes.toolbar}>
                 <Grid container justify="space-between" wrap="nowrap" alignItems="center">
                     <div className={this.props.classes.searchBox}>
-                        {this.props.items.length > 0 && <SearchInput
+                        <SearchInput
                             value={this.props.searchValue}
-                            onSearch={this.props.onSearch} />}
+                            onSearch={this.props.onSearch} />
                     </div>
                     <ColumnSelector
                         columns={this.props.columns}

commit c75bda19a301c0a197dda696208ea10b6459c54a
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Thu Jul 5 12:11:21 2018 +0200

    Fix FilterBuilder concatenation add "like" rules
    
    Feature #13703
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/common/api/filter-builder.ts b/src/common/api/filter-builder.ts
index 1f2107f..47772e2 100644
--- a/src/common/api/filter-builder.ts
+++ b/src/common/api/filter-builder.ts
@@ -20,11 +20,11 @@ export default class FilterBuilder<T extends Resource = Resource> {
     }
 
     public addLike(field: keyof T, value?: string) {
-        return this.addCondition(field, "like", value, "", "%");
+        return this.addCondition(field, "like", value, "%", "%");
     }
 
     public addILike(field: keyof T, value?: string) {
-        return this.addCondition(field, "ilike", value, "", "%");
+        return this.addCondition(field, "ilike", value, "%", "%");
     }
 
     public addIsA(field: keyof T, value?: string | string[]) {
@@ -36,7 +36,7 @@ export default class FilterBuilder<T extends Resource = Resource> {
     }
 
     public concat<O extends Resource>(filterBuilder: FilterBuilder<O>) {
-        return new FilterBuilder(this.resourcePrefix, this.filters + this.getSeparator() + filterBuilder.getFilters());
+        return new FilterBuilder(this.resourcePrefix, this.filters + (this.filters && filterBuilder.filters ? "," : "") + filterBuilder.getFilters());
     }
 
     public getFilters() {
@@ -57,12 +57,9 @@ export default class FilterBuilder<T extends Resource = Resource> {
                 ? _.snakeCase(this.resourcePrefix) + "."
                 : "";
 
-            this.filters += `${this.getSeparator()}["${resourcePrefix}${_.snakeCase(field.toString())}","${cond}",${value}]`;
+            this.filters += `${this.filters ? "," : ""}["${resourcePrefix}${_.snakeCase(field.toString())}","${cond}",${value}]`;
         }
         return this;
     }
 
-    private getSeparator () {
-        return this.filters ? "," : "";
-    }
 }

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


hooks/post-receive
--