[ARVADOS-WORKBENCH2] updated: 1.2.0-665-g2cfb56e
Git user
git at public.curoverse.com
Mon Oct 15 09:32:47 EDT 2018
Summary of changes:
package.json | 4 +
src/components/chips-input/chips-input.tsx | 139 ++++++++++
src/components/chips/chips.tsx | 124 +++++++++
src/components/select-field/select-field.tsx | 58 ++++
src/components/text-field/text-field.tsx | 20 +-
src/index.tsx | 37 ++-
src/models/search-bar.ts | 22 ++
src/models/tree.ts | 25 +-
src/models/workflow.ts | 6 +
src/store/search-bar/search-bar-actions.ts | 22 +-
src/store/tree-picker/tree-picker-actions.ts | 30 ++-
src/store/tree-picker/tree-picker-reducer.ts | 6 +-
.../form-fields/search-bar-form-fields.tsx | 38 +--
.../search-bar/search-bar-advanced-view.tsx | 31 ++-
.../search-bar/search-bar-view.tsx | 2 +-
src/views-components/search-bar/search-bar.tsx | 7 +-
.../inputs/directory-array-input.tsx | 298 +++++++++++++++++++++
.../run-process-panel/inputs/file-array-input.tsx | 281 +++++++++++++++++++
src/views/run-process-panel/inputs/file-input.tsx | 1 -
.../inputs/string-array-input.tsx | 64 +++++
.../run-process-panel/run-process-inputs-form.tsx | 41 ++-
.../run-process-panel/run-process-second-step.tsx | 14 +-
src/views/workbench/workbench.tsx | 6 +
yarn.lock | 66 ++++-
24 files changed, 1265 insertions(+), 77 deletions(-)
create mode 100644 src/components/chips-input/chips-input.tsx
create mode 100644 src/components/chips/chips.tsx
create mode 100644 src/components/select-field/select-field.tsx
create mode 100644 src/models/search-bar.ts
create mode 100644 src/views/run-process-panel/inputs/directory-array-input.tsx
create mode 100644 src/views/run-process-panel/inputs/file-array-input.tsx
create mode 100644 src/views/run-process-panel/inputs/string-array-input.tsx
via 2cfb56ef5060cbad461062690fad650f15c49731 (commit)
via 4f5fdd49c0c9866fbb613c6c82641d686b0b8ad5 (commit)
via ec9331a8435c9844efe3ba018f6c0d0c3f96d573 (commit)
via be58082b621a95f96bcb0c61495e8186f10e5528 (commit)
via 36f8f69a5bf5c19ad3c8de57466944e2b7d0c390 (commit)
via 2093197a0f8145a983c99453f22607dff5a13364 (commit)
via edd6fa370a9ae3bda73363b76f4ff5933241b553 (commit)
via f3ce859fafc0a4ac1496c0848ceb4f648a2f7dc2 (commit)
via f423de49b7f87a9f8ec402a46ef9d3f06deb4fad (commit)
via d1090c6a45ab8755220051cc018bda7597af613a (commit)
via 41b123f0d6a414f2c15ff6c02d0c804bb525ac93 (commit)
via 51d2defb6f233bb00ef482f98ca975ae693f0e04 (commit)
via f2f7301dab111f2561332c8cc9e7c06df958ea66 (commit)
via e2a464e9087120c7569976eb9a172a91d2ec0f09 (commit)
via c72c1ba8048825f15d864753dd247080e29f227b (commit)
via 21485ff667209666337db75d88b2a8d375c627b2 (commit)
via a764ad3d8c7c859ac9c2dd3e6fbd2350e3d51358 (commit)
via fc5181400a6e3c31e2fb975b28878372e420f47d (commit)
via 5abc704e5a7415a6f5d2940cd9a195d983bf70dc (commit)
via 3acc51716153bb950a2f2363363549eb0fdb9787 (commit)
via ba9c257dfc9100b600dba8ead2832ff1830ffdae (commit)
via 7c60f5e6b3a7dc1b9061876f96b7cb12f7120a2f (commit)
via 8762c56e9600fdc415d74f3d5db0e1c0ac700d9a (commit)
via 3b355dbe5fd93b8df4e7803560c8f2038f5f6ae4 (commit)
via a1589292a5adde7b41c2fc445c78a52e232fa73a (commit)
via f5127724c5ca39a59a08ba20f843e530b0650be9 (commit)
via 4a789cf1c48960362fb179680fa55a353c94e53e (commit)
via a99ab65681e3707f95cd76829ca014e2f7300d47 (commit)
from 956da0a3141be31119f6310734a59f4b79c254e3 (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 2cfb56ef5060cbad461062690fad650f15c49731
Merge: 956da0a 4f5fdd4
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Mon Oct 15 15:32:37 2018 +0200
merge master
Feature #14277
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --cc src/store/search-bar/search-bar-actions.ts
index 394920a,f752785..771cbc8
--- a/src/store/search-bar/search-bar-actions.ts
+++ b/src/store/search-bar/search-bar-actions.ts
@@@ -10,9 -10,7 +10,10 @@@ 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';
export const searchBarActions = unionize({
SET_CURRENT_VIEW: ofType<string>(),
@@@ -75,24 -61,17 +65,28 @@@ export const openSearchView = () =
dispatch(searchBarActions.SET_SAVED_QUERIES(savedSearchQueries));
};
- export const closeSearchView = () =>
+ export const closeSearchView = () =>
(dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
- dispatch(searchBarActions.CLOSE_SEARCH_VIEW());
- dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.BASIC));
+ const isOpen = getState().searchBar.open;
+ 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) {
diff --cc src/views-components/search-bar/search-bar.tsx
index 5c42af2,d6561c5..5208a7d
--- a/src/views-components/search-bar/search-bar.tsx
+++ b/src/views-components/search-bar/search-bar.tsx
@@@ -12,11 -12,11 +12,12 @@@ import
saveRecentQuery,
loadRecentQueries,
saveQuery,
- openSearchView
+ openSearchView,
- closeSearchView
++ closeSearchView,
++ navigateToItem
} from '~/store/search-bar/search-bar-actions';
import { SearchBarView } from '~/views-components/search-bar/search-bar-view';
- import { SearchBarAdvanceFormData } from '~/store/search-bar/search-bar-actions';
- import { closeSearchView, navigateToItem } from '~/store/search-bar/search-bar-actions';
+ import { SearchBarAdvanceFormData } from '~/models/search-bar';
const mapStateToProps = ({ searchBar }: RootState) => {
return {
diff --cc src/views/workbench/workbench.tsx
index ade9a4e,09435d0..788c96a
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -41,7 -41,12 +41,13 @@@ import { SharedWithMePanel } from '~/vi
import { RunProcessPanel } from '~/views/run-process-panel/run-process-panel';
import SplitterLayout from 'react-splitter-layout';
import { WorkflowPanel } from '~/views/workflow-panel/workflow-panel';
+import { SearchResultsPanel } from '~/views/search-results-panel/search-results-panel';
+ import { HomeTreePicker } from '~/views-components/projects-tree-picker/home-tree-picker';
+ import { SharedTreePicker } from '~/views-components/projects-tree-picker/shared-tree-picker';
+ import { FavoritesTreePicker } from '../../views-components/projects-tree-picker/favorites-tree-picker';
+ import { ProjectsTreePicker } from '~/views-components/projects-tree-picker/projects-tree-picker';
+ import { Chips } from '~/components/chips/chips';
+ import { ChipsInput } from '../../components/chips-input/chips-input';
type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content';
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list