Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 14270_warning_mess...

[arvados.git] / src / store / collection-panel / collection-panel-files / collection-panel-files-actions.ts

diff --git a/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts b/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
index 99ab6829fa4ff66f96d715691479f34e0297432d..4764d436e022e532b3d3d1b09039bec23e72940c 100644 (file)
--- a/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
+++ b/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
@@ -11,9 +11,10 @@ import { snackbarActions } from "../../snackbar/snackbar-actions";
 import { dialogActions } from '../../dialog/dialog-actions';
 import { getNodeValue } from "~/models/tree";
 import { filterCollectionFilesBySelection } from './collection-panel-files-state';
-import { startSubmit, stopSubmit, reset } from 'redux-form';
+import { startSubmit, stopSubmit, reset, initialize } from 'redux-form';
 import { getDialog } from "~/store/dialog/dialog-reducer";
 import { getFileFullPath } from "~/services/collection-service/collection-service-files-response";
+import { resourcesDataActions } from "~/store/resources-data/resources-data-actions";
 
 export const collectionPanelFilesAction = unionize({
     SET_COLLECTION_FILES: ofType<CollectionFilesTree>(),
@@ -29,6 +30,7 @@ export const loadCollectionFiles = (uuid: string) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         const files = await services.collectionService.files(uuid);
         dispatch(collectionPanelFilesAction.SET_COLLECTION_FILES(files));
+        dispatch(resourcesDataActions.SET_FILES({ uuid, files }));
     };
 
 export const removeCollectionFiles = (filePaths: string[]) =>
@@ -55,18 +57,23 @@ export const openFileRemoveDialog = (filePath: string) =>
     (dispatch: Dispatch, getState: () => RootState) => {
         const file = getNodeValue(filePath)(getState().collectionPanelFiles);
         if (file) {
-            const title = file.type === CollectionFileType.DIRECTORY
+            const isDirectory = file.type === CollectionFileType.DIRECTORY;
+            const title = isDirectory
                 ? 'Removing directory'
                 : 'Removing file';
-            const text = file.type === CollectionFileType.DIRECTORY
+            const text = isDirectory
                 ? 'Are you sure you want to remove this directory?'
                 : 'Are you sure you want to remove this file?';
+            const info = isDirectory
+                ? 'Removing files will change content adress.'
+                : 'Removing a file will change content adress.';
 
             dispatch(dialogActions.OPEN_DIALOG({
                 id: FILE_REMOVE_DIALOG,
                 data: {
                     title,
                     text,
+                    info,
                     confirmButtonLabel: 'Remove',
                     filePath
                 }
@@ -82,6 +89,7 @@ export const openMultipleFilesRemoveDialog = () =>
         data: {
             title: 'Removing files',
             text: 'Are you sure you want to remove selected files?',
+            info: 'Removing files will change content adress.',
             confirmButtonLabel: 'Remove'
         }
     });
@@ -94,7 +102,7 @@ export interface RenameFileDialogData {
 
 export const openRenameFileDialog = (data: RenameFileDialogData) =>
     (dispatch: Dispatch) => {
-        dispatch(reset(RENAME_FILE_DIALOG));
+        dispatch(initialize(RENAME_FILE_DIALOG, data));
         dispatch(dialogActions.OPEN_DIALOG({ id: RENAME_FILE_DIALOG, data }));
     };