[ARVADOS-WORKBENCH2] updated: 1.2.0-485-g00a61a4
Git user
git at public.curoverse.com
Fri Sep 28 03:37:50 EDT 2018
Summary of changes:
package.json | 36 +-
.../confirmation-dialog/confirmation-dialog.tsx | 2 +-
src/components/data-explorer/data-explorer.tsx | 7 +-
src/index.tsx | 2 +
src/models/resource.ts | 3 +
src/routes/route-change-handlers.ts | 7 +-
src/routes/routes.ts | 8 +-
src/services/services.ts | 3 +
.../workflow-service.ts} | 6 +-
src/store/dialog/with-dialog.ts | 6 +-
src/store/navigation/navigation-action.ts | 4 +
.../shared-with-me-middleware-service.ts | 1 -
.../side-panel-tree/side-panel-tree-actions.ts | 1 -
src/store/side-panel/side-panel-action.ts | 4 +-
src/store/store.ts | 6 +
src/store/workbench/workbench-actions.ts | 9 +
.../workflow-middleware-service.ts} | 51 +-
src/store/workflow-panel/workflow-panel-actions.ts | 26 +
.../current-token-dialog/current-token-dialog.tsx | 78 +-
.../data-explorer/data-explorer.tsx | 2 +-
src/views-components/data-explorer/renderers.tsx | 71 +-
.../file-remove-dialog/file-remove-dialog.ts | 3 +-
.../main-content-bar/main-content-bar.tsx | 43 +-
src/views-components/side-panel/side-panel.tsx | 10 +-
src/views/login-panel/login-panel.tsx | 11 +-
.../process-panel/process-information-card.tsx | 2 +-
.../process-panel/process-subprocesses-card.tsx | 4 +-
src/views/workbench/workbench.tsx | 2 +
.../workflow-panel/workflow-description-card.tsx | 58 +
src/views/workflow-panel/workflow-panel-view.tsx | 120 +
src/views/workflow-panel/workflow-panel.tsx | 24 +
yarn.lock | 2380 +++++++++++++++-----
32 files changed, 2349 insertions(+), 641 deletions(-)
copy src/services/{log-service/log-service.ts => workflow-service/workflow-service.ts} (66%)
copy src/store/{shared-with-me-panel/shared-with-me-middleware-service.ts => workflow-panel/workflow-middleware-service.ts} (53%)
create mode 100644 src/store/workflow-panel/workflow-panel-actions.ts
create mode 100644 src/views/workflow-panel/workflow-description-card.tsx
create mode 100644 src/views/workflow-panel/workflow-panel-view.tsx
create mode 100644 src/views/workflow-panel/workflow-panel.tsx
via 00a61a4484185dc98daa92af5f189779cc10ad3c (commit)
via c8528155683c9cf4f11ee6d78da8d9b86a3203bf (commit)
via 3641a3638123f272b97cf313a1a1a4d890741383 (commit)
via e9ddaee3dd51a6efbbfc509191ff00d552e1a169 (commit)
via 96f66c48c34febdf6478026ef1f575f441c7d614 (commit)
via 46ee3699d427ea41fb375be552715a18b72fcb03 (commit)
via b547851c52f8f735d0f9aaad3eea8f79033135fc (commit)
via 3367b1ff2a1d1050bb435f7bc8230c03435b2529 (commit)
via 4cddd6be7314d0ab3c387b5dcc909780a468410c (commit)
via a37c2265b5f60351bc1f50c22e74650a79110319 (commit)
via fe815aabd15db10f2f9437db82104c4272bcb38e (commit)
via 20bb2125fddc247d8ff2df960b3d4d316e4a0d13 (commit)
via c04071992d624a6aec1185898e58ce848086684f (commit)
via 9ea087b587f8139416cea16fbe4caad0d6df90c4 (commit)
via 6acebd8c63b066f86aa81fce3b8937609778031f (commit)
via eda5e30d786d5d1224a552e962b6b711efab7369 (commit)
from a458c32b63bfa83256ce7de1ce79b935e4838eb7 (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 00a61a4484185dc98daa92af5f189779cc10ad3c
Merge: a458c32 c852815
Author: Janicki Artur <artur.janicki at contractors.roche.com>
Date: Fri Sep 28 09:37:34 2018 +0200
Merge branch 'master' into 14225-prepare-structure-and-init-stepper
refs #14225
Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki at contractors.roche.com>
diff --cc src/routes/route-change-handlers.ts
index 9b56a7f,9761314..af3bdab
--- a/src/routes/route-change-handlers.ts
+++ b/src/routes/route-change-handlers.ts
@@@ -4,10 -4,10 +4,10 @@@
import { History, Location } from 'history';
import { RootStore } from '~/store/store';
- import { matchProcessRoute, matchProcessLogRoute, matchProjectRoute, matchCollectionRoute, matchFavoritesRoute, matchTrashRoute, matchRootRoute, matchSharedWithMeRoute, matchRunProcessRoute } from './routes';
-import { matchProcessRoute, matchProcessLogRoute, matchProjectRoute, matchCollectionRoute, matchFavoritesRoute, matchTrashRoute, matchRootRoute, matchSharedWithMeRoute, matchWorkflowRoute } from './routes';
++import { matchProcessRoute, matchProcessLogRoute, matchProjectRoute, matchCollectionRoute, matchFavoritesRoute, matchTrashRoute, matchRootRoute, matchSharedWithMeRoute, matchRunProcessRoute, matchWorkflowRoute } from './routes';
import { loadProject, loadCollection, loadFavorites, loadTrash, loadProcess, loadProcessLog } from '~/store/workbench/workbench-actions';
import { navigateToRootProject } from '~/store/navigation/navigation-action';
- import { loadSharedWithMe, loadRunProcess } from '../store/workbench/workbench-actions';
-import { loadSharedWithMe, loadWorkflow } from '~/store/workbench/workbench-actions';
++import { loadSharedWithMe, loadRunProcess, loadWorkflow } from '../store/workbench/workbench-actions';
export const addRouteChangeHandlers = (history: History, store: RootStore) => {
const handler = handleLocationChange(store);
@@@ -24,7 -24,7 +24,8 @@@ const handleLocationChange = (store: Ro
const processMatch = matchProcessRoute(pathname);
const processLogMatch = matchProcessLogRoute(pathname);
const sharedWithMeMatch = matchSharedWithMeRoute(pathname);
+ const runProcessMatch = matchRunProcessRoute(pathname);
+ const workflowMatch = matchWorkflowRoute(pathname);
if (projectMatch) {
store.dispatch(loadProject(projectMatch.params.id));
@@@ -42,7 -42,7 +43,9 @@@
store.dispatch(navigateToRootProject);
} else if (sharedWithMeMatch) {
store.dispatch(loadSharedWithMe);
+ } else if (runProcessMatch) {
+ store.dispatch(loadRunProcess);
+ } else if (workflowMatch) {
+ store.dispatch(loadWorkflow);
}
};
diff --cc src/routes/routes.ts
index 4e8cf36,34b15e1..432cf75
--- a/src/routes/routes.ts
+++ b/src/routes/routes.ts
@@@ -17,7 -17,7 +17,8 @@@ export const Routes =
TRASH: '/trash',
PROCESS_LOGS: `/process-logs/:id(${RESOURCE_UUID_PATTERN})`,
SHARED_WITH_ME: '/shared-with-me',
- RUN_PROCESS: '/run-process'
++ RUN_PROCESS: '/run-process',
+ WORKFLOWS: '/workflows'
};
export const getResourceUrl = (uuid: string) => {
@@@ -66,5 -66,5 +67,8 @@@ export const matchProcessLogRoute = (ro
export const matchSharedWithMeRoute = (route: string) =>
matchPath(route, { path: Routes.SHARED_WITH_ME });
+export const matchRunProcessRoute = (route: string) =>
- matchPath(route, { path: Routes.RUN_PROCESS });
++ matchPath(route, { path: Routes.RUN_PROCESS });
++
+ export const matchWorkflowRoute = (route: string) =>
+ matchPath<ResourceRouteParams>(route, { path: Routes.WORKFLOWS });
diff --cc src/store/store.ts
index 6fb0305,16d0d05..21e5029
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@@ -35,7 -35,8 +35,9 @@@ import { processPanelReducer } from '~/
import { SHARED_WITH_ME_PANEL_ID } from '~/store/shared-with-me-panel/shared-with-me-panel-actions';
import { SharedWithMeMiddlewareService } from './shared-with-me-panel/shared-with-me-middleware-service';
import { progressIndicatorReducer } from './progress-indicator/progress-indicator-reducer';
+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';
const composeEnhancers =
(process.env.NODE_ENV === 'development' &&
diff --cc src/store/workbench/workbench-actions.ts
index a7614c4,8f034ec..2586fdc
--- a/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@@ -348,12 -350,11 +351,18 @@@ export const loadSharedWithMe = handleF
await dispatch<any>(setSidePanelBreadcrumbs(SidePanelTreeCategory.SHARED_WITH_ME));
});
+export const loadRunProcess = handleFirstTimeLoad(
+ async (dispatch: Dispatch) => {
+ dispatch<any>(loadRunProcessPanel());
+ }
+);
+
+ export const loadWorkflow = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
+ dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.WORKFLOWS));
+ await dispatch(loadWorkflowPanel());
+ dispatch(setSidePanelBreadcrumbs(SidePanelTreeCategory.WORKFLOWS));
+ });
++
const finishLoadingProject = (project: GroupContentsResource | string) =>
async (dispatch: Dispatch<any>) => {
const uuid = typeof project === 'string' ? project : project.uuid;
diff --cc src/views/workbench/workbench.tsx
index 3a68a71,776850c..47e2254
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -33,13 -33,13 +33,14 @@@ import { MoveProjectDialog } from '~/vi
import { MoveCollectionDialog } from '~/views-components/dialog-forms/move-collection-dialog';
import { FilesUploadCollectionDialog } from '~/views-components/dialog-forms/files-upload-collection-dialog';
import { PartialCopyCollectionDialog } from '~/views-components/dialog-forms/partial-copy-collection-dialog';
-import { TrashPanel } from "~/views/trash-panel/trash-panel";
+import { ProcessCommandDialog } from '~/views-components/process-command-dialog/process-command-dialog';
import { MainContentBar } from '~/views-components/main-content-bar/main-content-bar';
import { Grid } from '@material-ui/core';
-import { SharedWithMePanel } from '../shared-with-me-panel/shared-with-me-panel';
+import { TrashPanel } from "~/views/trash-panel/trash-panel";
+import { SharedWithMePanel } from '~/views/shared-with-me-panel/shared-with-me-panel';
+import { RunProcessPanel } from '~/views/run-process-panel/run-process-panel';
import SplitterLayout from 'react-splitter-layout';
-import { ProcessCommandDialog } from '~/views-components/process-command-dialog/process-command-dialog';
+ import { WorkflowPanel } from '~/views/workflow-panel/workflow-panel';
type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content';
@@@ -95,7 -95,7 +96,8 @@@ export const WorkbenchPanel
<Route path={Routes.TRASH} component={TrashPanel} />
<Route path={Routes.PROCESS_LOGS} component={ProcessLogPanel} />
<Route path={Routes.SHARED_WITH_ME} component={SharedWithMePanel} />
+ <Route path={Routes.RUN_PROCESS} component={RunProcessPanel} />
+ <Route path={Routes.WORKFLOWS} component={WorkflowPanel} />
</Switch>
</Grid>
</Grid>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list