From: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Date: Tue, 16 Oct 2018 08:49:47 +0000 (+0200)
Subject: merge master
X-Git-Tag: 1.3.0~62^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/54e859c204c3952a8eaf96d2145dfa96c199b934

merge master

Feature #14277

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

54e859c204c3952a8eaf96d2145dfa96c199b934
diff --cc src/store/search-bar/search-bar-actions.ts
index f32c1287,4ecf0ff4..9ddfc9c5
--- a/src/store/search-bar/search-bar-actions.ts
+++ b/src/store/search-bar/search-bar-actions.ts
@@@ -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 { 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>(),