Update move-project-dialog to work with new projects-tree-picker

Feature #14470

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --git a/src/store/projects/project-move-actions.ts b/src/store/projects/project-move-actions.ts
index c251bdf8f8724d3a6fd7969dce4aae0b011d1ab2..9405597b2f2846f912d2a5fc5c235af11d517779 100644 (file)
--- a/src/store/projects/project-move-actions.ts
+++ b/src/store/projects/project-move-actions.ts
@@ -10,12 +10,14 @@ import { RootState } from '~/store/store';
 import { getCommonResourceServiceError, CommonResourceServiceError } from "~/services/common-service/common-resource-service";
 import { MoveToFormDialogData } from '~/store/move-to-dialog/move-to-dialog';
 import { resetPickerProjectTree } from '~/store/project-tree-picker/project-tree-picker-actions';
+import { initProjectsTreePicker } from '../tree-picker/tree-picker-actions';
 
 export const PROJECT_MOVE_FORM_NAME = 'projectMoveFormName';
 
 export const openMoveProjectDialog = (resource: { name: string, uuid: string }) =>
     (dispatch: Dispatch) => {
         dispatch<any>(resetPickerProjectTree());
+        dispatch<any>(initProjectsTreePicker(PROJECT_MOVE_FORM_NAME));
         dispatch(initialize(PROJECT_MOVE_FORM_NAME, resource));
         dispatch(dialogActions.OPEN_DIALOG({ id: PROJECT_MOVE_FORM_NAME, data: {} }));
     };

diff --git a/src/views-components/dialog-forms/move-project-dialog.ts b/src/views-components/dialog-forms/move-project-dialog.tsx
similarity index 82%
rename from src/views-components/dialog-forms/move-project-dialog.ts
rename to src/views-components/dialog-forms/move-project-dialog.tsx
index c1fbb76ebc5e973d70962ecea56c6f1359aaffa1..4132ffa0e9acd82c5a2a4e56bbb693fb529921dc 100644 (file)
--- a/src/views-components/dialog-forms/move-project-dialog.ts
+++ b/src/views-components/dialog-forms/move-project-dialog.tsx
@@ -2,6 +2,7 @@
 //
 // 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';
@@ -17,6 +18,9 @@ export const MoveProjectDialog = compose(
         onSubmit: (data, dispatch) => {
             dispatch(moveProject(data));
         }
-    })
-)(DialogMoveTo);
+    }),
+)(
+    (...params: Parameters<typeof DialogMoveTo>) =>
+        <DialogMoveTo {...params[0]} pickerId={PROJECT_MOVE_FORM_NAME} />
+);