Update naming

Feature #14119

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

diff --git a/src/views-components/dialog-copy/collection-partial-copy-dialog.tsx b/src/views-components/dialog-copy/dialog-collection-partial-copy.tsx
similarity index 66%
rename from src/views-components/dialog-copy/collection-partial-copy-dialog.tsx
rename to src/views-components/dialog-copy/dialog-collection-partial-copy.tsx
index ce2a991bf2bcc374f9d628082fb7d2a975ecfe82..7fc301fa6c1d44a92e4b38385ddde7683a2920a1 100644 (file)
--- a/src/views-components/dialog-copy/collection-partial-copy-dialog.tsx
+++ b/src/views-components/dialog-copy/dialog-collection-partial-copy.tsx
@@ -4,14 +4,14 @@
 
 import * as React from "react";
 import { FormDialog } from '~/components/form-dialog/form-dialog';
-import { CollectionNameField, CollectionDescriptionField, CollectionProjectPickerField } from '../form-fields/collection-form-fields';
+import { CollectionNameField, CollectionDescriptionField, CollectionProjectPickerField } from '~/views-components/form-fields/collection-form-fields';
 import { WithDialogProps } from '~/store/dialog/with-dialog';
 import { InjectedFormProps } from 'redux-form';
-import { CollectionPartialCopyFormData } from '../../store/collections/collection-partial-copy-actions';
+import { CollectionPartialCopyFormData } from '~/store/collections/collection-partial-copy-actions';
 
-type PartialCopyFormDialogProps = WithDialogProps<string> & InjectedFormProps<CollectionPartialCopyFormData>;
+type DialogCollectionPartialCopyProps = WithDialogProps<string> & InjectedFormProps<CollectionPartialCopyFormData>;
 
-export const CollectionPartialCopyDialog = (props: PartialCopyFormDialogProps) =>
+export const DialogCollectionPartialCopy = (props: DialogCollectionPartialCopyProps) =>
     <FormDialog
         dialogTitle='Create a collection'
         formFields={CollectionPartialCopyFields}

diff --git a/src/views-components/dialog-forms/collection-partial-copy-dialog.ts b/src/views-components/dialog-forms/partial-copy-collection-dialog.ts
similarity index 76%
rename from src/views-components/dialog-forms/collection-partial-copy-dialog.ts
rename to src/views-components/dialog-forms/partial-copy-collection-dialog.ts
index 801f62c8ee68731d8ee0b4c4e55d2405ef87eb70..9a350f6307ce908f9b503b5b9b21c3ebc45ccc7b 100644 (file)
--- a/src/views-components/dialog-forms/collection-partial-copy-dialog.ts
+++ b/src/views-components/dialog-forms/partial-copy-collection-dialog.ts
@@ -6,14 +6,14 @@ import { compose } from "redux";
 import { reduxForm } from 'redux-form';
 import { withDialog, } from '~/store/dialog/with-dialog';
 import { CollectionPartialCopyFormData, doCollectionPartialCopy, COLLECTION_PARTIAL_COPY_FORM_NAME } from '~/store/collections/collection-partial-copy-actions';
-import { CollectionPartialCopyDialog as Dialog } from "~/views-components/dialog-copy/collection-partial-copy-dialog";
+import { DialogCollectionPartialCopy } from "~/views-components/dialog-copy/dialog-collection-partial-copy";
 
 
-export const CollectionPartialCopyDialog = compose(
+export const PartialCopyCollectionDialog = compose(
     withDialog(COLLECTION_PARTIAL_COPY_FORM_NAME),
     reduxForm({
         form: COLLECTION_PARTIAL_COPY_FORM_NAME,
         onSubmit: (data: CollectionPartialCopyFormData, dispatch) => {
             dispatch(doCollectionPartialCopy(data));
         }
-    }))(Dialog);
\ No newline at end of file
+    }))(DialogCollectionPartialCopy);
\ No newline at end of file

diff --git a/src/views-components/dialog-forms/collection-files-upload-dialog.ts b/src/views-components/dialog-forms/upload-collection-files-dialog.ts
similarity index 79%
rename from src/views-components/dialog-forms/collection-files-upload-dialog.ts
rename to src/views-components/dialog-forms/upload-collection-files-dialog.ts
index b8b1af6da0195249e600fcfc7273d16e3322d4c3..38f0333e4d146d071e13ac639324cb03f73d796b 100644 (file)
--- a/src/views-components/dialog-forms/collection-files-upload-dialog.ts
+++ b/src/views-components/dialog-forms/upload-collection-files-dialog.ts
@@ -7,9 +7,9 @@ import { reduxForm } from 'redux-form';
 import { withDialog } from "~/store/dialog/with-dialog";
 import { CollectionCreateFormDialogData } from '~/store/collections/collection-create-actions';
 import { COLLECTION_UPLOAD_FILES_DIALOG, submitCollectionFiles } from '~/store/collections/collection-upload-actions';
-import { CollectionFilesUploadDialog as Dialog } from '../dialog-upload/collection-files-upload-dialog';
+import { DialogCollectionFilesUpload } from '../dialog-upload/dialog-collection-files-upload';
 
-export const CollectionFilesUploadDialog = compose(
+export const UploadCollectionFilesDialog = compose(
     withDialog(COLLECTION_UPLOAD_FILES_DIALOG),
     reduxForm<CollectionCreateFormDialogData>({
         form: COLLECTION_UPLOAD_FILES_DIALOG,
@@ -17,4 +17,4 @@ export const CollectionFilesUploadDialog = compose(
             dispatch(submitCollectionFiles());
         }
     })
-)(Dialog);
+)(DialogCollectionFilesUpload);

diff --git a/src/views-components/dialog-upload/collection-files-upload-dialog.tsx b/src/views-components/dialog-upload/dialog-collection-files-upload.tsx
similarity index 78%
rename from src/views-components/dialog-upload/collection-files-upload-dialog.tsx
rename to src/views-components/dialog-upload/dialog-collection-files-upload.tsx
index 8b6e59e09560b967ad9b4275ae6d9bdd52322ab8..35c1ed6d73b950d7992e5700f071df12a2e75c59 100644 (file)
--- a/src/views-components/dialog-upload/collection-files-upload-dialog.tsx
+++ b/src/views-components/dialog-upload/dialog-collection-files-upload.tsx
@@ -8,12 +8,12 @@ import { WithDialogProps } from '~/store/dialog/with-dialog';
 import { CollectionCreateFormDialogData } from '~/store/collections/collection-create-actions';
 import { FormDialog } from '~/components/form-dialog/form-dialog';
 import { require } from '~/validators/require';
-import { FileUploaderField } from '../file-uploader/file-uploader';
+import { FileUploaderField } from '~/views-components/file-uploader/file-uploader';
 
 
-type CollectionFilesUploadDialogProps = WithDialogProps<{}> & InjectedFormProps<CollectionCreateFormDialogData>;
+type DialogCollectionFilesUploadProps = WithDialogProps<{}> & InjectedFormProps<CollectionCreateFormDialogData>;
 
-export const CollectionFilesUploadDialog = (props: CollectionFilesUploadDialogProps) =>
+export const DialogCollectionFilesUpload = (props: DialogCollectionFilesUploadProps) =>
     <FormDialog
         dialogTitle='Upload data'
         formFields={UploadCollectionFilesFields}

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 6a9987790ee1f296797123d24800ca834df010d5..82a868e6dece3fb472d53d11b1fa99fa8c20461d 100644 (file)
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -34,8 +34,8 @@ import { UpdateCollectionDialog } from '~/views-components/dialog-forms/update-c
 import { UpdateProjectDialog } from '~/views-components/dialog-forms/update-project-dialog';
 import { MoveProjectDialog } from '~/views-components/dialog-forms/move-project-dialog';
 import { MoveCollectionDialog } from '~/views-components/dialog-forms/move-collection-dialog';
-import { CollectionFilesUploadDialog } from '~/views-components/dialog-forms/collection-files-upload-dialog';
-import { CollectionPartialCopyDialog } from '~/views-components/dialog-forms/collection-partial-copy-dialog';
+import { UploadCollectionFilesDialog } from '~/views-components/dialog-forms/upload-collection-files-dialog';
+import { PartialCopyCollectionDialog } from '~/views-components/dialog-forms/partial-copy-collection-dialog';
 
 
 const APP_BAR_HEIGHT = 100;
@@ -174,12 +174,12 @@ export const Workbench = withStyles(styles)(
                         <CreateProjectDialog />
                         <CreateCollectionDialog />
                         <RenameFileDialog />
-                        <CollectionPartialCopyDialog />
+                        <PartialCopyCollectionDialog />
                         <FileRemoveDialog />
                         <CopyCollectionDialog />
                         <MultipleFilesRemoveDialog />
                         <UpdateCollectionDialog />
-                        <CollectionFilesUploadDialog />
+                        <UploadCollectionFilesDialog />
                         <UpdateProjectDialog />
                         <MoveCollectionDialog />
                         <MoveProjectDialog />