[ARVADOS-WORKBENCH2] updated: 1.2.0-754-gdc5cd08

[Git user]

Summary of changes:
 src/services/api/filter-builder.ts                      | 16 ++++++++++++++++
 src/store/search-bar/search-bar-actions.ts              | 17 ++++++++++++-----
 .../search-results-middleware-service.ts                |  2 +-
 3 files changed, 29 insertions(+), 6 deletions(-)

       via  dc5cd08bad19c302d34b75b34795d5745da2eae2 (commit)
       via  0f564e91355cf93acc952a5abe9db1a7dc6642ef (commit)
       via  5d49ca1534a50cf3c73c7130d7aff40ab43a248a (commit)
       via  29630212caf4ef8d800076a9f75786b476ad62f2 (commit)
       via  d76d0dbba0c7fdcb29303bbc2d4eca27d1a0984b (commit)
      from  0ffeba19321b0a7f033785651778f67aef057d4c (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 dc5cd08bad19c302d34b75b34795d5745da2eae2
Merge: 0ffeba1 0f564e9
Author: Daniel Kos <daniel.kos at contractors.roche.com>
Date:   Tue Oct 30 13:45:23 2018 +0100

    refs #master Merge branch 'origin/master' into 14364-searchbar-arrow-navigation
    
    # Conflicts:
    #       src/store/search-bar/search-bar-actions.ts
    
    Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos at contractors.roche.com>

diff --cc src/store/search-bar/search-bar-actions.ts
index 088c925,aea7530..eb4239d
--- a/src/store/search-bar/search-bar-actions.ts
+++ b/src/store/search-bar/search-bar-actions.ts
@@@ -26,13 -26,8 +26,13 @@@ export const searchBarActions = unioniz
      SET_SEARCH_RESULTS: ofType<GroupContentsResource[]>(),
      SET_SEARCH_VALUE: ofType<string>(),
      SET_SAVED_QUERIES: ofType<SearchBarAdvanceFormData[]>(),
 -    UPDATE_SAVED_QUERY: ofType<SearchBarAdvanceFormData[]>()
 -});
 +    SET_RECENT_QUERIES: ofType<string[]>(),
 +    UPDATE_SAVED_QUERY: ofType<SearchBarAdvanceFormData[]>(),
 +    SET_SELECTED_ITEM: ofType<string>(),
 +    MOVE_UP: ofType<{}>(),
 +    MOVE_DOWN: ofType<{}>(),
 +    SELECT_FIRST_ITEM: ofType<{}>()
- });
++}); 
  
  export type SearchBarActions = UnionOf<typeof searchBarActions>;
  
@@@ -57,16 -51,16 +57,16 @@@ export const loadRecentQueries = () =
      };
  
  export const searchData = (searchValue: string) =>
 -    async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
 +    async (dispatch: Dispatch, getState: () => RootState) => {
          const currentView = getState().searchBar.currentView;
          dispatch(searchBarActions.SET_SEARCH_VALUE(searchValue));
 -        dispatch(searchBarActions.SET_SEARCH_RESULTS([]));
 -        dispatch<any>(searchGroups(searchValue, 5, {}));
 -        if (currentView === SearchView.BASIC) {
 -            dispatch(searchBarActions.CLOSE_SEARCH_VIEW());
 -            dispatch(navigateToSearchResults);
 +        if (searchValue.length > 0) {
-             dispatch<any>(searchGroups(searchValue));
++            dispatch<any>(searchGroups(searchValue, 5, {}));
 +            if (currentView === SearchView.BASIC) {
 +                dispatch(searchBarActions.CLOSE_SEARCH_VIEW());
 +                dispatch(navigateToSearchResults);
 +            }
          }
 -
      };
  
  export const searchAdvanceData = (data: SearchBarAdvanceFormData) =>
@@@ -205,8 -210,12 +208,12 @@@ const buildUuidFilter = (type?: Resourc
      return type ? [type] : [ResourceKind.PROJECT, ResourceKind.COLLECTION, ResourceKind.PROCESS];
  };
  
+ const buildDateFilter = (date?: string): string => {
+     return date ? date : '';
+ };
+ 
  export const initAdvanceFormProjectsTree = () =>
 -    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
 +    (dispatch: Dispatch) => {
          dispatch<any>(initUserProject(SEARCH_BAR_ADVANCE_FORM_PICKER_ID));
      };
  

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


hooks/post-receive
--