From: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Date: Tue, 16 Oct 2018 08:49:47 +0000 (+0200)
Subject: merge master
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/54e859c204c3952a8eaf96d2145dfa96c199b934?hp=-c

merge master

Feature #14277

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

54e859c204c3952a8eaf96d2145dfa96c199b934
diff --combined src/store/search-bar/search-bar-actions.ts
index f32c1287f7,4ecf0ff438..9ddfc9c517
--- a/src/store/search-bar/search-bar-actions.ts
+++ b/src/store/search-bar/search-bar-actions.ts
@@@ -5,16 -5,14 +5,18 @@@
  import { unionize, ofType, UnionOf } from "~/common/unionize";
  import { GroupContentsResource, GroupContentsResourcePrefix } from '~/services/groups-service/groups-service';
  import { Dispatch } from 'redux';
+ import { change, arrayPush } from 'redux-form';
  import { RootState } from '~/store/store';
+ import { initUserProject } from '~/store/tree-picker/tree-picker-actions';
  import { ServiceRepository } from '~/services/services';
  import { FilterBuilder } from "~/services/api/filter-builder";
  import { ResourceKind } from '~/models/resource';
  import { GroupClass } from '~/models/group';
 +import { SearchView } from '~/store/search-bar/search-bar-reducer';
 +import { navigateToSearchResults, navigateTo } from '~/store/navigation/navigation-action';
 +import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
- import { SearchBarAdvanceFormData } from '~/models/search-bar';
 +import { initialize } from 'redux-form';
+ import { SearchBarAdvanceFormData, PropertyValues } from '~/models/search-bar';
  
  export const searchBarActions = unionize({
      SET_CURRENT_VIEW: ofType<string>(),
@@@ -22,13 -20,15 +24,15 @@@
      CLOSE_SEARCH_VIEW: ofType<{}>(),
      SET_SEARCH_RESULTS: ofType<GroupContentsResource[]>(),
      SET_SEARCH_VALUE: ofType<string>(),
 -    SET_SAVED_QUERIES: ofType<string[]>()
 +    SET_SAVED_QUERIES: ofType<SearchBarAdvanceFormData[]>()
  });
  
  export type SearchBarActions = UnionOf<typeof searchBarActions>;
  
  export const SEARCH_BAR_ADVANCE_FORM_NAME = 'searchBarAdvanceFormName';
  
+ export const SEARCH_BAR_ADVANCE_FORM_PICKER_ID = 'searchBarAdvanceFormPickerId';
+ 
  export const goToView = (currentView: string) => searchBarActions.SET_CURRENT_VIEW(currentView);
  
  export const saveRecentQuery = (query: string) =>
@@@ -45,9 -45,8 +49,9 @@@ export const loadRecentQueries = () =
  export const saveQuery = (data: SearchBarAdvanceFormData) =>
      (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
          if (data.saveQuery && data.searchQuery) {
 -            services.searchService.saveQuery(data.searchQuery);
 +            services.searchService.saveQuery(data);
              dispatch(searchBarActions.SET_SAVED_QUERIES(services.searchService.getSavedQueries()));
 +            dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Query has been sucessfully saved', kind: SnackbarKind.SUCCESS }));
          }
      };
  
@@@ -59,12 -58,6 +63,12 @@@ export const deleteSavedQuery = (id: nu
          return savedSearchQueries || [];
      };
  
 +export const editSavedQuery = (data: SearchBarAdvanceFormData, id: number) =>
 +    (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
 +        dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.ADVANCED));
 +        dispatch<any>(initialize(SEARCH_BAR_ADVANCE_FORM_NAME, data));
 +    };
 +
  export const openSearchView = () =>
      (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
          dispatch(searchBarActions.OPEN_SEARCH_VIEW());
@@@ -72,27 -65,16 +76,27 @@@
          dispatch(searchBarActions.SET_SAVED_QUERIES(savedSearchQueries));
      };
  
 -export const closeSearchView = () => 
 +export const closeSearchView = () =>
      (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
          const isOpen = getState().searchBar.open;
 -        if(isOpen) {
 +        if (isOpen) {
              dispatch(searchBarActions.CLOSE_SEARCH_VIEW());
 +            dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.BASIC));
          }
      };
  
 +export const navigateToItem = (uuid: string) =>
 +    (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
 +        dispatch(searchBarActions.CLOSE_SEARCH_VIEW());
 +        dispatch(navigateTo(uuid));
 +    };
 +
  export const searchData = (searchValue: string) =>
      async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
 +        const currentView = getState().searchBar.currentView;
 +        if (currentView !== SearchView.AUTOCOMPLETE) {
 +            dispatch(searchBarActions.CLOSE_SEARCH_VIEW());
 +        }
          dispatch(searchBarActions.SET_SEARCH_VALUE(searchValue));
          dispatch(searchBarActions.SET_SEARCH_RESULTS([]));
          if (searchValue) {
@@@ -104,10 -86,9 +108,10 @@@
              });
              dispatch(searchBarActions.SET_SEARCH_RESULTS(items));
          }
 +        dispatch(navigateToSearchResults);
      };
  
 -const getFilters = (filterName: string, searchValue: string): string => {
 +export const getFilters = (filterName: string, searchValue: string): string => {
      return new FilterBuilder()
          .addIsA("uuid", [ResourceKind.PROJECT, ResourceKind.COLLECTION, ResourceKind.PROCESS])
          .addILike(filterName, searchValue, GroupContentsResourcePrefix.COLLECTION)
@@@ -116,3 -97,18 +120,18 @@@
          .addEqual('groupClass', GroupClass.PROJECT, GroupContentsResourcePrefix.PROJECT)
          .getFilters();
  };
+ 
+ export const initAdvanceFormProjectsTree = () => 
+     (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+         dispatch<any>(initUserProject(SEARCH_BAR_ADVANCE_FORM_PICKER_ID));
+     };
+ 
+ export const changeAdvanceFormProperty = (property: string, value: PropertyValues[] | string = '') => 
+     (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+         dispatch(change(SEARCH_BAR_ADVANCE_FORM_NAME, property, value));
+     };
+ 
+ export const updateAdvanceFormProperties = (propertyValues: PropertyValues) => 
+     (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+         dispatch(arrayPush(SEARCH_BAR_ADVANCE_FORM_NAME, 'properties', propertyValues));
+     };