[ARVADOS-WORKBENCH2] updated: 1.2.0-881-gc1b42ed
Git user
git at public.curoverse.com
Thu Nov 15 04:52:04 EST 2018
Summary of changes:
src/store/collections/collection-move-actions.ts | 2 ++
src/store/processes/process-move-actions.ts | 2 ++
src/store/tree-picker/picker-id.tsx | 12 ++++++++++++
src/views-components/dialog-forms/move-collection-dialog.ts | 4 +++-
src/views-components/dialog-forms/move-process-dialog.ts | 4 +++-
.../{move-project-dialog.tsx => move-project-dialog.ts} | 8 +++-----
6 files changed, 25 insertions(+), 7 deletions(-)
create mode 100644 src/store/tree-picker/picker-id.tsx
rename src/views-components/dialog-forms/{move-project-dialog.tsx => move-project-dialog.ts} (82%)
via c1b42ed027b39f04d4bf61b27d0603818cdd2bee (commit)
via db6ff2ea8246badb7bdcfb0ec0ad169134c5c7ba (commit)
via dd00886a1098e82a70b814d7d4c2f30d3e6e69c7 (commit)
via fa8e4468481efa1d43065b73ae1fa08fb0e851a7 (commit)
via c4fb72d1ddf4080cae66e296b873e5605e83e326 (commit)
via 0101b0b9c7416f7aadb94ca71258b4d4e60af58a (commit)
from a2783c48c8210410de72bd17a32ab72d0f364cde (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 c1b42ed027b39f04d4bf61b27d0603818cdd2bee
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Nov 15 10:51:49 2018 +0100
Set pickerId in MoveProcessDialog
Feature #14470
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/views-components/dialog-forms/move-process-dialog.ts b/src/views-components/dialog-forms/move-process-dialog.ts
index baea34b..ce854ef 100644
--- a/src/views-components/dialog-forms/move-process-dialog.ts
+++ b/src/views-components/dialog-forms/move-process-dialog.ts
@@ -9,6 +9,7 @@ import { PROCESS_MOVE_FORM_NAME } from '~/store/processes/process-move-actions';
import { MoveToFormDialogData } from '~/store/move-to-dialog/move-to-dialog';
import { DialogMoveTo } from '~/views-components/dialog-move/dialog-move-to';
import { moveProcess } from '~/store/workbench/workbench-actions';
+import { pickerId } from '~/store/tree-picker/picker-id';
export const MoveProcessDialog = compose(
withDialog(PROCESS_MOVE_FORM_NAME),
@@ -17,5 +18,6 @@ export const MoveProcessDialog = compose(
onSubmit: (data, dispatch) => {
dispatch(moveProcess(data));
}
- })
+ }),
+ pickerId(PROCESS_MOVE_FORM_NAME),
)(DialogMoveTo);
\ No newline at end of file
commit db6ff2ea8246badb7bdcfb0ec0ad169134c5c7ba
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Nov 15 10:51:33 2018 +0100
Add ProjectsTreePicker initialization in process-move-actions
Feature #14470
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/store/processes/process-move-actions.ts b/src/store/processes/process-move-actions.ts
index 6df8269..edba5a8 100644
--- a/src/store/processes/process-move-actions.ts
+++ b/src/store/processes/process-move-actions.ts
@@ -13,6 +13,7 @@ import { MoveToFormDialogData } from '~/store/move-to-dialog/move-to-dialog';
import { resetPickerProjectTree } from '~/store/project-tree-picker/project-tree-picker-actions';
import { projectPanelActions } from '~/store/project-panel/project-panel-action';
import { getProcess, getProcessStatus, ProcessStatus } from '~/store/processes/process';
+import { initProjectsTreePicker } from '~/store/tree-picker/tree-picker-actions';
export const PROCESS_MOVE_FORM_NAME = 'processMoveFormName';
@@ -23,6 +24,7 @@ export const openMoveProcessDialog = (resource: { name: string, uuid: string })
const processStatus = getProcessStatus(process);
if (processStatus === ProcessStatus.DRAFT) {
dispatch<any>(resetPickerProjectTree());
+ dispatch<any>(initProjectsTreePicker(PROCESS_MOVE_FORM_NAME));
dispatch(initialize(PROCESS_MOVE_FORM_NAME, resource));
dispatch(dialogActions.OPEN_DIALOG({ id: PROCESS_MOVE_FORM_NAME, data: {} }));
} else {
commit dd00886a1098e82a70b814d7d4c2f30d3e6e69c7
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Nov 15 10:47:40 2018 +0100
Apply pickerId to MoveProjectDialog
Feature #14470
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/views-components/dialog-forms/move-project-dialog.tsx b/src/views-components/dialog-forms/move-project-dialog.ts
similarity index 82%
rename from src/views-components/dialog-forms/move-project-dialog.tsx
rename to src/views-components/dialog-forms/move-project-dialog.ts
index 4132ffa..03e474b 100644
--- a/src/views-components/dialog-forms/move-project-dialog.tsx
+++ b/src/views-components/dialog-forms/move-project-dialog.ts
@@ -2,7 +2,6 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import * as React from 'react';
import { compose } from "redux";
import { withDialog } from "~/store/dialog/with-dialog";
import { reduxForm } from 'redux-form';
@@ -10,6 +9,7 @@ import { PROJECT_MOVE_FORM_NAME } from '~/store/projects/project-move-actions';
import { MoveToFormDialogData } from '~/store/move-to-dialog/move-to-dialog';
import { DialogMoveTo } from '~/views-components/dialog-move/dialog-move-to';
import { moveProject } from '~/store/workbench/workbench-actions';
+import { pickerId } from '~/store/tree-picker/picker-id';
export const MoveProjectDialog = compose(
withDialog(PROJECT_MOVE_FORM_NAME),
@@ -19,8 +19,6 @@ export const MoveProjectDialog = compose(
dispatch(moveProject(data));
}
}),
-)(
- (...params: Parameters<typeof DialogMoveTo>) =>
- <DialogMoveTo {...params[0]} pickerId={PROJECT_MOVE_FORM_NAME} />
-);
+ pickerId(PROJECT_MOVE_FORM_NAME),
+)(DialogMoveTo);
commit fa8e4468481efa1d43065b73ae1fa08fb0e851a7
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Nov 15 10:44:55 2018 +0100
Add pickerId to MoveCollectionDialog
Feature #14470
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/views-components/dialog-forms/move-collection-dialog.ts b/src/views-components/dialog-forms/move-collection-dialog.ts
index fcdd999..b817b6a 100644
--- a/src/views-components/dialog-forms/move-collection-dialog.ts
+++ b/src/views-components/dialog-forms/move-collection-dialog.ts
@@ -9,6 +9,7 @@ import { DialogMoveTo } from '~/views-components/dialog-move/dialog-move-to';
import { COLLECTION_MOVE_FORM_NAME } from '~/store/collections/collection-move-actions';
import { MoveToFormDialogData } from '~/store/move-to-dialog/move-to-dialog';
import { moveCollection } from '~/store/workbench/workbench-actions';
+import { pickerId } from '~/store/tree-picker/picker-id';
export const MoveCollectionDialog = compose(
withDialog(COLLECTION_MOVE_FORM_NAME),
@@ -17,5 +18,6 @@ export const MoveCollectionDialog = compose(
onSubmit: (data, dispatch) => {
dispatch(moveCollection(data));
}
- })
+ }),
+ pickerId(COLLECTION_MOVE_FORM_NAME),
)(DialogMoveTo);
commit c4fb72d1ddf4080cae66e296b873e5605e83e326
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Nov 15 10:41:40 2018 +0100
Add collection move dialog tree picker initialization
Feature #14470
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/store/collections/collection-move-actions.ts b/src/store/collections/collection-move-actions.ts
index 54508e1..8be6250 100644
--- a/src/store/collections/collection-move-actions.ts
+++ b/src/store/collections/collection-move-actions.ts
@@ -13,12 +13,14 @@ import { projectPanelActions } from '~/store/project-panel/project-panel-action'
import { MoveToFormDialogData } from '~/store/move-to-dialog/move-to-dialog';
import { resetPickerProjectTree } from '~/store/project-tree-picker/project-tree-picker-actions';
import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions";
+import { initProjectsTreePicker } from '../tree-picker/tree-picker-actions';
export const COLLECTION_MOVE_FORM_NAME = 'collectionMoveFormName';
export const openMoveCollectionDialog = (resource: { name: string, uuid: string }) =>
(dispatch: Dispatch) => {
dispatch<any>(resetPickerProjectTree());
+ dispatch<any>(initProjectsTreePicker(COLLECTION_MOVE_FORM_NAME));
dispatch(initialize(COLLECTION_MOVE_FORM_NAME, resource));
dispatch(dialogActions.OPEN_DIALOG({ id: COLLECTION_MOVE_FORM_NAME, data: {} }));
};
commit 0101b0b9c7416f7aadb94ca71258b4d4e60af58a
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Nov 15 10:40:58 2018 +0100
Create composable helper for setting constant pickerId
Feature #14470
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/store/tree-picker/picker-id.tsx b/src/store/tree-picker/picker-id.tsx
new file mode 100644
index 0000000..5621954
--- /dev/null
+++ b/src/store/tree-picker/picker-id.tsx
@@ -0,0 +1,12 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import * as React from 'react';
+
+export const pickerId =
+ (id: string) =>
+ <P extends { pickerId: string }>(Component: React.ComponentType<P>) =>
+ (props: P) =>
+ <Component {...props} pickerId={id} />;
+
\ No newline at end of file
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list