merge master
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 16 Oct 2018 08:49:47 +0000 (10:49 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 16 Oct 2018 08:49:47 +0000 (10:49 +0200)
Feature #14277

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

1  2 
src/store/search-bar/search-bar-actions.ts

index f32c1287f7d7197eff3d601692bf3db26f94de77,4ecf0ff438b3821e4b5d69086b8bb26552de1f9a..9ddfc9c5175b0d6331ae471ae32f76f423e908af
@@@ -10,11 -12,7 +12,11 @@@ import { ServiceRepository } from '~/se
  import { FilterBuilder } from "~/services/api/filter-builder";
  import { ResourceKind } from '~/models/resource';
  import { GroupClass } from '~/models/group';
- import { SearchBarAdvanceFormData } from '~/models/search-bar';
 +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 { initialize } from 'redux-form';
+ import { SearchBarAdvanceFormData, PropertyValues } from '~/models/search-bar';
  
  export const searchBarActions = unionize({
      SET_CURRENT_VIEW: ofType<string>(),