changed names and paths for files

Feature #13897

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

diff --git a/src/store/collection-copy-dialog/collection-copy-dialog.ts b/src/store/collections/copy/collection-copy-actions.ts
similarity index 97%
rename from src/store/collection-copy-dialog/collection-copy-dialog.ts
rename to src/store/collections/copy/collection-copy-actions.ts
index 458ae5e1b3b02bb9571747aa521b879205661394..d0d3f39d2ebbf3e551ac17e4cd71c8e2481de5c0 100644 (file)
--- a/src/store/collection-copy-dialog/collection-copy-dialog.ts
+++ b/src/store/collections/copy/collection-copy-actions.ts
@@ -9,7 +9,7 @@ import { resetPickerProjectTree } from '~/store/project-tree-picker/project-tree
 import { RootState } from '~/store/store';
 import { ServiceRepository } from '~/services/services';
 import { getCommonResourceServiceError, CommonResourceServiceError } from '~/common/api/common-resource-service';
-import { snackbarActions } from '../snackbar/snackbar-actions';
+import { snackbarActions } from '~/store/snackbar/snackbar-actions';
 import { projectPanelActions } from '~/store/project-panel/project-panel-action';
 
 export const COLLECTION_COPY_DIALOG = 'projectCopy';

diff --git a/src/views-components/context-menu/action-sets/collection-action-set.ts b/src/views-components/context-menu/action-sets/collection-action-set.ts
index 78bab0421d0bc757edc3fc33d9cb9a4de8ad9af7..1e5045f279ce786805f0a582de028e7f6666bb78 100644 (file)
--- a/src/views-components/context-menu/action-sets/collection-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-action-set.ts
@@ -9,7 +9,7 @@ import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, ProvenanceGra
 import { openUpdater } from "~/store/collections/updater/collection-updater-action";
 import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
 import { openMoveCollectionDialog } from '~/store/move-collection-dialog/move-collection-dialog';
-import { openCollectionCopyDialog } from "~/store/collection-copy-dialog/collection-copy-dialog";
+import { openCollectionCopyDialog } from "~/store/collections/copy/collection-copy-actions";
 
 export const collectionActionSet: ContextMenuActionSet = [[
     {

diff --git a/src/views-components/context-menu/action-sets/collection-resource-action-set.ts b/src/views-components/context-menu/action-sets/collection-resource-action-set.ts
index 5c9206af886d7f6372982f900ef6930cbb051ce1..2a38edb8162fc0a33638b0822f31fc8a60e98171 100644 (file)
--- a/src/views-components/context-menu/action-sets/collection-resource-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-resource-action-set.ts
@@ -9,7 +9,7 @@ import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, RemoveIcon }
 import { openUpdater } from "~/store/collections/updater/collection-updater-action";
 import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
 import { openMoveCollectionDialog } from '~/store/move-collection-dialog/move-collection-dialog';
-import { openCollectionCopyDialog } from '~/store/collection-copy-dialog/collection-copy-dialog';
+import { openCollectionCopyDialog } from '~/store/collections/copy/collection-copy-actions';
 
 export const collectionResourceActionSet: ContextMenuActionSet = [[
     {

diff --git a/src/views-components/copy-dialog/copy-dialog.tsx b/src/views-components/dialog-copy/dialog-copy.tsx
similarity index 87%
rename from src/views-components/copy-dialog/copy-dialog.tsx
rename to src/views-components/dialog-copy/dialog-copy.tsx
index 3b1b4cf406026fd3e57b9cbcfe1e08af6d9b9153..0333e127c4639f8daa881c7e55f142c65da66ea6 100644 (file)
--- a/src/views-components/copy-dialog/copy-dialog.tsx
+++ b/src/views-components/dialog-copy/dialog-copy.tsx
@@ -9,19 +9,19 @@ import { FormDialog } from '~/components/form-dialog/form-dialog';
 import { ProjectTreePickerField } from '~/views-components/project-tree-picker/project-tree-picker';
 import { COPY_NAME_VALIDATION, COPY_PROJECT_VALIDATION } from '~/validators/validators';
 import { TextField } from "~/components/text-field/text-field";
-import { CollectionCopyFormDialogData } from "~/store/collection-copy-dialog/collection-copy-dialog";
+import { CollectionCopyFormDialogData } from "~/store/collections/copy/collection-copy-actions";
 
 type CopyFormDialogProps = WithDialogProps<string> & InjectedFormProps<CollectionCopyFormDialogData>;
 
-export const CopyFormDialog = (props: CopyFormDialogProps) =>
+export const DialogCopy = (props: CopyFormDialogProps) =>
     <FormDialog
         dialogTitle='Make a copy'
-        formFields={CopyFields}
+        formFields={DialogCopyFields}
         submitLabel='Copy'
         {...props}
     />;
 
-const CopyFields = () => <span>
+const DialogCopyFields = () => <span>
     <Field
         name='name'
         component={TextField}

diff --git a/src/views-components/copy-dialog/copy-collection-dialog.tsx b/src/views-components/dialog-forms/copy-collection-dialog.ts
similarity index 56%
rename from src/views-components/copy-dialog/copy-collection-dialog.tsx
rename to src/views-components/dialog-forms/copy-collection-dialog.ts
index d9886221b2bb642a7d81183821f17ca984b01e23..a09827bffe69c597417d9622eabce9941acadb39 100644 (file)
--- a/src/views-components/copy-dialog/copy-collection-dialog.tsx
+++ b/src/views-components/dialog-forms/copy-collection-dialog.ts
@@ -5,11 +5,10 @@
 import { compose } from "redux";
 import { withDialog } from "~/store/dialog/with-dialog";
 import { reduxForm } from 'redux-form';
-import { COLLECTION_COPY_DIALOG, CollectionCopyFormDialogData } from '~/store/collection-copy-dialog/collection-copy-dialog';
-import { CopyFormDialog } from "~/views-components/copy-dialog/copy-dialog";
-import { copyCollection } from '~/store/collection-copy-dialog/collection-copy-dialog';
+import { COLLECTION_COPY_DIALOG, CollectionCopyFormDialogData, copyCollection } from '~/store/collections/copy/collection-copy-actions';
+import { DialogCopy } from "~/views-components/dialog-copy/dialog-copy";
 
-export const CollectionCopyDialog = compose(
+export const CopyCollectionDialog = compose(
     withDialog(COLLECTION_COPY_DIALOG),
     reduxForm<CollectionCopyFormDialogData>({
         form: COLLECTION_COPY_DIALOG,
@@ -17,4 +16,4 @@ export const CollectionCopyDialog = compose(
             dispatch(copyCollection(data));
         }
     })
-)(CopyFormDialog);
\ No newline at end of file
+)(DialogCopy);
\ No newline at end of file

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index d372b538e840a59e3d70b9870dcf66bd98c86a7c..c96de02e5270c6cb0091ddf86d7a2b21982f376e 100644 (file)
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -53,7 +53,7 @@ import { UploadCollectionFilesDialog } from '~/views-components/upload-collectio
 import { CollectionPartialCopyDialog } from '../../views-components/collection-partial-copy-dialog/collection-partial-copy-dialog';
 import { MoveProjectDialog } from '~/views-components/move-project-dialog/move-project-dialog';
 import { MoveCollectionDialog } from '~/views-components/move-collection-dialog/move-collection-dialog';
-import { CollectionCopyDialog } from '~/views-components/copy-dialog/copy-collection-dialog';
+import { CopyCollectionDialog } from '~/views-components/dialog-forms/copy-collection-dialog';
 
 const DRAWER_WITDH = 240;
 const APP_BAR_HEIGHT = 100;
@@ -250,7 +250,7 @@ export const Workbench = withStyles(styles)(
                         <CollectionPartialCopyDialog />
                         <DialogCollectionCreateWithSelectedFile />
                         <FileRemoveDialog />
-                        <CollectionCopyDialog />
+                        <CopyCollectionDialog />
                         <MultipleFilesRemoveDialog />
                         <UpdateCollectionDialog />
                         <UploadCollectionFilesDialog />