[ARVADOS-WORKBENCH2] updated: 1.2.0-591-ga0e9ecd
Git user
git at public.curoverse.com
Wed Oct 10 05:36:17 EDT 2018
Summary of changes:
Makefile | 2 +-
package.json | 5 +-
src/common/app-info.ts | 9 +
src/index.tsx | 19 +-
src/services/groups-service/groups-service.ts | 16 +-
src/services/search-service/search-service.ts | 21 +
src/services/services.ts | 3 +
src/store/app-info/app-info-actions.ts | 22 +
src/store/app-info/app-info-reducer.ts | 19 +
src/store/search-bar/search-bar-actions.ts | 49 +-
src/store/search-bar/search-bar-reducer.ts | 9 +-
src/store/store.ts | 2 +
src/views-components/main-app-bar/main-app-bar.tsx | 14 +-
.../search-bar/search-bar-advanced-view.tsx | 11 +-
.../search-bar/search-bar-autocomplete-view.tsx | 35 +-
.../search-bar/search-bar-basic-view.tsx | 11 +-
.../search-bar/search-bar-view.test.tsx | 36 +-
.../search-bar/search-bar-view.tsx | 44 +-
src/views-components/search-bar/search-bar.tsx | 12 +-
src/views/main-panel/main-panel-root.tsx | 47 +
src/views/main-panel/main-panel.tsx | 88 +-
src/views/workbench/workbench.test.tsx | 1 +
yarn.lock | 1312 +-------------------
23 files changed, 336 insertions(+), 1451 deletions(-)
create mode 100644 src/common/app-info.ts
create mode 100644 src/services/search-service/search-service.ts
create mode 100644 src/store/app-info/app-info-actions.ts
create mode 100644 src/store/app-info/app-info-reducer.ts
create mode 100644 src/views/main-panel/main-panel-root.tsx
via a0e9ecd6a913a6465b500f642412daf1e1a6420b (commit)
via d92b067614b451c27a8bd702253e87278defa7a3 (commit)
via 2209cb79b4d5e48187590433246b9026216cfb6a (commit)
via 1f0f9d2dad2f31b8429676f92ac99e8d0a48da30 (commit)
via f8c0896ef3dc92a2ec77aecfee87a930fb30c661 (commit)
via 2b4aaa4743137b6c2ce3cf9b5b3b0c1e5accb8c8 (commit)
via 1514f6a2ae8103f75f08034299115ad751d8a785 (commit)
via 3b0e0736a359c3c44566ac454d9cddd21ec6a490 (commit)
via 84e4588aed7bea1bcf5727ef2eea1a692b4e3bab (commit)
via 1e2635886e1342a7b29914d3a437313807676466 (commit)
via 21ad1a1cff07ec6e59db3b278fbc580cb5866c7a (commit)
via df9ea1569dd0d4ae1c05bacc8a5e5f7695f4453b (commit)
via e7a722835aeda5ebe0eeab2328a7e628927e6416 (commit)
via da3ae51b7b3b63561a9e1c47c965f45a08225d34 (commit)
via d38fcf4f5b9d8a1889b9bdf79ee77a2022ed4b52 (commit)
via b48e2f248f4330aa8fe8977f867854f502bd304f (commit)
via 47440ead99a61a13bc635630e0f4b07d9322edbf (commit)
via ea17d70fbcc3401f4ffd01ec02f3206616261dcf (commit)
via 20cde4f6023a374d00ba401b86b60a257932683c (commit)
via 244bfe2909565499833b7e2ce387adfd81e1cba6 (commit)
via 769a1c77a8a6ff082bdbb40979e1db56039752cb (commit)
via 34f68df51c55f8144bc96d78695070851e6b34f5 (commit)
from 4af7aea9d89d1775a79288cb9433e0ec9e1176e4 (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 a0e9ecd6a913a6465b500f642412daf1e1a6420b
Merge: 4af7aea d92b067
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Wed Oct 10 11:27:31 2018 +0200
Merge branch 'master'
Feature #13862
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --cc package.json
index 0093bbc,f84170a..30ea7b9
--- a/package.json
+++ b/package.json
@@@ -29,6 -31,6 +31,7 @@@
"react-transition-group": "2.5.0",
"redux": "4.0.0",
"redux-thunk": "2.3.0",
++ "reselect": "4.0.0",
"shell-quote": "1.6.1",
"unionize": "2.1.2",
"uuid": "3.3.2"
diff --cc src/index.tsx
index c1238a5,b3f351e..4998e26
--- a/src/index.tsx
+++ b/src/index.tsx
@@@ -41,18 -41,11 +41,12 @@@ import { progressIndicatorActions } fro
import { setUuidPrefix } from '~/store/workflow-panel/workflow-panel-actions';
import { trashedCollectionActionSet } from '~/views-components/context-menu/action-sets/trashed-collection-action-set';
import { ContainerRequestState } from '~/models/container-request';
-import { MountKind } from './models/mount-types';
+import { MountKind } from '~/models/mount-types';
- import { receiveTreePickerData, loadUserProject } from '~/store/tree-picker/tree-picker-actions';
- import { loadProject, loadCollection, initUserProject, initSharedProject, initFavoritesProject, initProjectsTreePicker } from './store/tree-picker/tree-picker-actions';
- import { ResourceKind } from '~/models/resource';
++import { initProjectsTreePicker } from './store/tree-picker/tree-picker-actions';
+ import { setBuildInfo } from '~/store/app-info/app-info-actions';
+ import { getBuildInfo } from '~/common/app-info';
- const getBuildNumber = () => "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev");
- const getGitCommit = () => "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7);
- const getBuildInfo = () => getBuildNumber() + " / " + getGitCommit();
-
- const buildInfo = getBuildInfo();
-
- console.log(`Starting arvados [${buildInfo}]`);
+ console.log(`Starting arvados [${getBuildInfo()}]`);
addMenuActionSet(ContextMenuKind.ROOT_PROJECT, rootProjectActionSet);
addMenuActionSet(ContextMenuKind.PROJECT, projectActionSet);
@@@ -117,14 -111,6 +112,14 @@@ const initListener = (history: History
await store.dispatch(loadWorkbench());
addRouteChangeHandlers(history, store);
// createEnumCollectorWorkflow(services);
+ store.dispatch(initProjectsTreePicker('testPicker1'));
+ store.dispatch(initProjectsTreePicker('testPicker2'));
+ store.dispatch(initProjectsTreePicker('testPicker3'));
-
++
+ // await store.dispatch(loadCollection(
+ // 'c97qk-4zz18-9sn8ygaf62chkkd',
+ // 'testPicker',
+ // ));
}
};
};
diff --cc src/store/store.ts
index d38689c,6026780..064faec
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@@ -38,6 -38,8 +38,7 @@@ import { progressIndicatorReducer } fro
import { runProcessPanelReducer } from '~/store/run-process-panel/run-process-panel-reducer';
import { WorkflowMiddlewareService } from './workflow-panel/workflow-middleware-service';
import { WORKFLOW_PANEL_ID } from './workflow-panel/workflow-panel-actions';
-import { fileTreePickerReducer } from './file-tree-picker/file-tree-picker-reducer';
+ import { appInfoReducer } from '~/store/app-info/app-info-reducer';
import { searchBarReducer } from './search-bar/search-bar-reducer';
const composeEnhancers =
@@@ -100,6 -102,8 +101,7 @@@ const createRootReducer = (services: Se
fileUploader: fileUploaderReducer,
processPanel: processPanelReducer,
progressIndicator: progressIndicatorReducer,
- fileTreePicker: fileTreePickerReducer,
runProcessPanel: runProcessPanelReducer,
+ appInfo: appInfoReducer,
searchBar: searchBarReducer
});
diff --cc yarn.lock
index e9f2b4b,e6f3764..906596c
--- a/yarn.lock
+++ b/yarn.lock
@@@ -7869,8 -6853,7 +6853,11 @@@ require-main-filename@^1.0.1
requires-port@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
- integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+
++reselect at 4.0.0:
++ version "4.0.0"
++ resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
+
resolve-cwd@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list