[ARVADOS-WORKBENCH2] updated: 1.2.0-476-g3367b1f
Git user
git at public.curoverse.com
Thu Sep 27 10:12:59 EDT 2018
Summary of changes:
package.json | 7 +-
src/components/file-upload/file-upload.css | 67 -----------
src/components/file-upload/file-upload.tsx | 58 ++++++++--
.../rich-text-editor-link.tsx | 43 +++++++
src/components/text-field/text-field.tsx | 28 +++++
src/index.tsx | 6 +-
src/store/breadcrumbs/breadcrumbs-actions.ts | 10 +-
src/store/context-menu/context-menu-actions.ts | 9 +-
src/store/navigation/navigation-action.ts | 2 +
src/store/processes/process-command-actions.ts | 3 +-
.../progress-indicator-reducer.ts | 13 ++-
src/store/projects/project-update-actions.ts | 6 +-
.../rich-text-editor-dialog-actions.tsx | 10 ++
.../side-panel-tree/side-panel-tree-actions.ts | 6 +-
src/store/trash/trash-actions.ts | 6 +
src/store/workbench/workbench-actions.ts | 127 ++++++++++++++++++---
src/validators/validators.tsx | 1 -
.../action-sets/trashed-collection-action-set.ts | 38 ++++++
src/views-components/context-menu/context-menu.tsx | 1 +
.../details-panel/project-details.tsx | 11 +-
.../form-fields/project-form-fields.tsx | 7 +-
.../process-command-dialog.tsx | 21 +++-
src/views-components/progress/content-progress.tsx | 13 ---
.../progress/side-panel-progress.tsx | 13 ---
.../progress/workbench-progress.tsx | 14 ---
.../rich-text-editor-dialog.tsx | 38 ++++++
src/views-components/snackbar/snackbar.tsx | 118 +++++++++----------
src/views/collection-panel/collection-panel.tsx | 120 +++++++++----------
src/views/workbench/workbench.tsx | 2 +
typings/global.d.ts | 3 +-
yarn.lock | 109 ++++++++++++++++--
31 files changed, 623 insertions(+), 287 deletions(-)
delete mode 100644 src/components/file-upload/file-upload.css
create mode 100644 src/components/rich-text-editor-link/rich-text-editor-link.tsx
create mode 100644 src/store/rich-text-editor-dialog/rich-text-editor-dialog-actions.tsx
create mode 100644 src/views-components/context-menu/action-sets/trashed-collection-action-set.ts
delete mode 100644 src/views-components/progress/content-progress.tsx
delete mode 100644 src/views-components/progress/side-panel-progress.tsx
delete mode 100644 src/views-components/progress/workbench-progress.tsx
create mode 100644 src/views-components/rich-text-editor-dialog/rich-text-editor-dialog.tsx
via 3367b1ff2a1d1050bb435f7bc8230c03435b2529 (commit)
via 3db1d07b3ab6cdfea052688088f569a173d6dab2 (commit)
via fd9ad9a425f6aed71c18948cf29c0535292a14c6 (commit)
via c8efd8ea08a0830b334ffc6a3811807bf5a1d94a (commit)
via 1a99655f02501ae941aa070202393813da32779d (commit)
via 4b8b1d2a1cd72a011574f176ba17b12536558d35 (commit)
via b595915f605850d59c39da9b2c75555cd3965a3b (commit)
via b2caf3b43219f3ff88b3f84431536645776b53cc (commit)
via 7177f95ebc5a3da43da1d299f7ae9837381e58d6 (commit)
via 31b41c5968534ce04019dc946c948ee2a6c01211 (commit)
via 31a019a908f28798c7e22f633e410ae95db1bfd7 (commit)
via 6f479854450415418e524808ce07ac8a0bac56da (commit)
via be6da45206cfeb4169220852c96892b3c2fb6960 (commit)
via 0d45466589474731ae6e0bce82000225b44573ac (commit)
via f05ff87a5a04b0a6c45c2cba0b492c561de2e651 (commit)
via e2502e5af4abc6fa7e84d999df107e0df6cac43b (commit)
via e7ba429b7bec690811df51893817968c177853be (commit)
via eb909803c6fe3c99894ac402a88ea7cbc114f66b (commit)
via d4aa5357707c184f7e450465befeb693379ec5a9 (commit)
via 25f990e6caeaeb9515231e9fda8d1f07be3f2b42 (commit)
via b10a9471e7e14917e29a9a6d09690f20e1d27d5d (commit)
via 06454ba23d896ba99d1f8ddca101088b96806966 (commit)
via 8ae34cc6c505d6359bf300d111d0c7b4e4e68a15 (commit)
via 8a570b430be529010e28929c589103ad6ffebedd (commit)
via 9efef4484a8c28b97dae64e785e2dd7c38687cca (commit)
via fb3eb6e4d15395b6080a23c24b46517b466ec842 (commit)
via faf6a194fd097d34d8c539e067afdf59b60ac0a6 (commit)
via 1b6fde4932a1fbb4da7f860b982bc553088a2d91 (commit)
via 92f226041a58e80dc3c4879acffd5e68a338351e (commit)
via 190e10b8b1e5a5fd14744fddcf8c71246bf4e7ee (commit)
via 020ffe99a961cbad5e4d1ff7bf85b050d5132350 (commit)
via afa04ca15bcaa890770a30ddb099b62f5cbe2926 (commit)
via 5e7c7e298eda223e6fcb3876385c59f0552ca642 (commit)
via 0d67b1230fcf696598143468c0096558462da9f2 (commit)
from 4cddd6be7314d0ab3c387b5dcc909780a468410c (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 3367b1ff2a1d1050bb435f7bc8230c03435b2529
Merge: 4cddd6b 3db1d07
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Thu Sep 27 16:12:37 2018 +0200
merge master
Feature #13857
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --cc src/index.tsx
index f81e9da,5285284..d0154b6
--- a/src/index.tsx
+++ b/src/index.tsx
@@@ -36,9 -36,9 +36,10 @@@ import { initWebSocket } from '~/websoc
import { Config } from '~/common/config';
import { addRouteChangeHandlers } from './routes/route-change-handlers';
import { setCurrentTokenDialogApiHost } from '~/store/current-token-dialog/current-token-dialog-actions';
- import { processResourceActionSet } from './views-components/context-menu/action-sets/process-resource-action-set';
+ import { processResourceActionSet } from '~/views-components/context-menu/action-sets/process-resource-action-set';
import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions';
+import { setUuidPrefix } from '~/store/workflow-panel/workflow-panel-actions';
+ import { trashedCollectionActionSet } from '~/views-components/context-menu/action-sets/trashed-collection-action-set';
const getBuildNumber = () => "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev");
const getGitCommit = () => "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7);
diff --cc src/store/navigation/navigation-action.ts
index d332e0f,943f38c..c8a554c
--- a/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@@ -26,8 -26,8 +26,10 @@@ export const navigateTo = (uuid: string
dispatch<any>(navigateToFavorites);
} else if (uuid === SidePanelTreeCategory.SHARED_WITH_ME) {
dispatch(navigateToSharedWithMe);
+ } else if (uuid === SidePanelTreeCategory.WORKFLOWS) {
+ dispatch(navigateToWorkflows);
+ } else if (uuid === SidePanelTreeCategory.TRASH) {
+ dispatch(navigateToTrash);
}
};
diff --cc src/store/side-panel-tree/side-panel-tree-actions.ts
index 073de22,3fd2d68..22a83dd
--- a/src/store/side-panel-tree/side-panel-tree-actions.ts
+++ b/src/store/side-panel-tree/side-panel-tree-actions.ts
@@@ -13,6 -13,8 +13,7 @@@ import { getTreePicker, TreePicker } fr
import { TreeItemStatus } from "~/components/tree/tree";
import { getNodeAncestors, getNodeValue, getNodeAncestorsIds, getNode } from '~/models/tree';
import { ProjectResource } from '~/models/project';
-import { progressIndicatorActions } from '../progress-indicator/progress-indicator-actions';
+ import { OrderBuilder } from '../../services/api/order-builder';
export enum SidePanelTreeCategory {
PROJECTS = 'Projects',
diff --cc src/store/workbench/workbench-actions.ts
index 01b5b92,94b4b4f..8f034ec
--- a/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@@ -39,10 -38,12 +38,14 @@@ import { loadProcessPanel } from '~/sto
import { sharedWithMePanelActions } from '~/store/shared-with-me-panel/shared-with-me-panel-actions';
import { loadSharedWithMePanel } from '../shared-with-me-panel/shared-with-me-panel-actions';
import { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog';
+import { loadWorkflowPanel, workflowPanelActions } from '~/store/workflow-panel/workflow-panel-actions';
+import { workflowPanelColumns } from '~/views/workflow-panel/workflow-panel-view';
import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions';
import { getProgressIndicator } from '../progress-indicator/progress-indicator-reducer';
+ import { ResourceKind, extractUuidKind } from '~/models/resource';
+ import { FilterBuilder } from '~/services/api/filter-builder';
+ import { GroupContentsResource } from '~/services/groups-service/groups-service';
+ import { unionize, ofType, UnionOf, MatchCases } from '~/common/unionize';
export const WORKBENCH_LOADING_SCREEN = 'workbenchLoadingScreen';
@@@ -306,8 -347,58 +350,63 @@@ export const loadSharedWithMe = handleF
await dispatch<any>(setSidePanelBreadcrumbs(SidePanelTreeCategory.SHARED_WITH_ME));
});
+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;
+ dispatch(openProjectPanel(uuid));
+ dispatch(loadDetailsPanel(uuid));
+ if (typeof project !== 'string') {
+ dispatch(updateResources([project]));
+ }
+ };
+
+ const loadGroupContentsResource = async (params: {
+ uuid: string,
+ userUuid: string,
+ services: ServiceRepository
+ }) => {
+ const filters = new FilterBuilder()
+ .addEqual('uuid', params.uuid)
+ .getFilters();
+ const { items } = await params.services.groupsService.contents(params.userUuid, {
+ filters,
+ recursive: true,
+ includeTrash: true,
+ });
+ const resource = items.shift();
+ let handler: GroupContentsHandler;
+ if (resource) {
+ handler = (resource.kind === ResourceKind.COLLECTION || resource.kind === ResourceKind.PROJECT) && resource.isTrashed
+ ? groupContentsHandlers.TRASHED(resource)
+ : groupContentsHandlers.OWNED(resource);
+ } else {
+ const kind = extractUuidKind(params.uuid);
+ let resource: GroupContentsResource;
+ if (kind === ResourceKind.COLLECTION) {
+ resource = await params.services.collectionService.get(params.uuid);
+ } else if (kind === ResourceKind.PROJECT) {
+ resource = await params.services.projectService.get(params.uuid);
+ } else {
+ resource = await params.services.containerRequestService.get(params.uuid);
+ }
+ handler = groupContentsHandlers.SHARED(resource);
+ }
+ return (cases: MatchCases<typeof groupContentsHandlersRecord, GroupContentsHandler, void>) =>
+ groupContentsHandlers.match(handler, cases);
+
+ };
+
+ const groupContentsHandlersRecord = {
+ TRASHED: ofType<GroupContentsResource>(),
+ SHARED: ofType<GroupContentsResource>(),
+ OWNED: ofType<GroupContentsResource>(),
+ };
+
+ const groupContentsHandlers = unionize(groupContentsHandlersRecord);
+
+ type GroupContentsHandler = UnionOf<typeof groupContentsHandlers>;
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list