small refactor
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 20 Aug 2018 13:29:58 +0000 (15:29 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 20 Aug 2018 13:29:58 +0000 (15:29 +0200)
Feature #13988

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

src/components/make-a-copy/make-a-copy.tsx
src/components/tree/tree.tsx
src/views-components/context-menu/action-sets/collection-action-set.ts
src/views-components/context-menu/action-sets/collection-resource-action-set.ts
src/views-components/context-menu/action-sets/project-action-set.ts

index 98be8ef9efed061549dc959a338e06fbe11cded7..f1098ff43a8fa4353add3cfb5ea4d8a9f3935f1e 100644 (file)
@@ -9,7 +9,7 @@ import { ProjectTreePicker } from "~/views-components/project-tree-picker/projec
 import { MAKE_A_COPY_VALIDATION, COPY_NAME_VALIDATION } from "~/validators/validators";
 import { TextField } from '~/components/text-field/text-field';
 
-export  interface CopyFormData {
+export interface CopyFormData {
     name: string;
     projectUuid: string;
     uuid: string;
index 6b127530a095a0c8e1ab692462d8f6bf0bff98d9..8a56739758c8ec13810c5454f03463221ade35ec 100644 (file)
@@ -141,7 +141,9 @@ export const Tree = withStyles(styles)(
         }
 
         getProperArrowAnimation = (status: string, items: Array<TreeItem<T>>) => {
-            return status === TreeItemStatus.PENDING || (status === TreeItemStatus.LOADED && !items) || (status === TreeItemStatus.LOADED && items && items.length === 0) ? <span /> : <SidePanelRightArrowIcon />;
+            return status === TreeItemStatus.PENDING ||
+            (status === TreeItemStatus.LOADED && !items) || 
+            (status === TreeItemStatus.LOADED && items && items.length === 0) ? <span /> : <SidePanelRightArrowIcon />;
         }
 
         getToggableIconClassNames = (isOpen?: boolean, isActive?: boolean) => {
index 240590684dc62798c1907dc19ffac2a9f4085644..0f0125c54cdd45408b6ed427f58397d52b4ca83b 100644 (file)
@@ -8,9 +8,8 @@ import { toggleFavorite } from "~/store/favorites/favorites-actions";
 import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, ProvenanceGraphIcon, AdvancedIcon, RemoveIcon } from "~/components/icon/icon";
 import { openUpdater } from "~/store/collections/updater/collection-updater-action";
 import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
-import { openMakeACopyDialog, MAKE_A_COPY_DIALOG } from "~/views-components/make-a-copy-dialog/make-a-copy-dialog";
+import { openMakeACopyDialog } from "~/views-components/make-a-copy-dialog/make-a-copy-dialog";
 import { openMoveToDialog } from "../../move-to-dialog/move-to-dialog";
-import { reset } from 'redux-form';
 
 export const collectionActionSet: ContextMenuActionSet = [[
     {
@@ -44,7 +43,6 @@ export const collectionActionSet: ContextMenuActionSet = [[
         icon: CopyIcon,
         name: "Copy to project",
         execute: (dispatch, resource) => {
-            dispatch(reset(MAKE_A_COPY_DIALOG));
             dispatch<any>(openMakeACopyDialog({name: resource.name, projectUuid: resource.uuid}));
         }
     },
index ea61d269c686d99ce398d18ee434fc140f08eaa7..cf05aeea98c275f1bc62cc67fc1269567aa65df2 100644 (file)
@@ -8,9 +8,8 @@ import { toggleFavorite } from "~/store/favorites/favorites-actions";
 import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, RemoveIcon } from "~/components/icon/icon";
 import { openUpdater } from "~/store/collections/updater/collection-updater-action";
 import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
-import { openMakeACopyDialog, MAKE_A_COPY_DIALOG } from "~/views-components/make-a-copy-dialog/make-a-copy-dialog";
+import { openMakeACopyDialog } from "~/views-components/make-a-copy-dialog/make-a-copy-dialog";
 import { openMoveToDialog } from '../../move-to-dialog/move-to-dialog';
-import { reset } from 'redux-form';
 
 export const collectionResourceActionSet: ContextMenuActionSet = [[
     {
@@ -44,7 +43,6 @@ export const collectionResourceActionSet: ContextMenuActionSet = [[
         icon: CopyIcon,
         name: "Copy to project",
         execute: (dispatch, resource) => {
-            dispatch(reset(MAKE_A_COPY_DIALOG));
             dispatch<any>(openMakeACopyDialog({name: resource.name, projectUuid: resource.uuid}));
         },
     },
index d4a3fa16e3b3cb636676a223744a97bbcce03ac8..f7fc4f5b8b800502434628375e72d0890144098a 100644 (file)
@@ -12,7 +12,7 @@ import { toggleFavorite } from "~/store/favorites/favorites-actions";
 import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
 import { openMoveToDialog } from "../../move-to-dialog/move-to-dialog";
 import { PROJECT_CREATE_DIALOG } from "../../dialog-create/dialog-project-create";
-import { openMakeACopyDialog, MAKE_A_COPY_DIALOG } from "~/views-components/make-a-copy-dialog/make-a-copy-dialog";
+import { openMakeACopyDialog } from "~/views-components/make-a-copy-dialog/make-a-copy-dialog";
 
 export const projectActionSet: ContextMenuActionSet = [[
     {
@@ -48,7 +48,6 @@ export const projectActionSet: ContextMenuActionSet = [[
         icon: CopyIcon,
         name: "Copy to project",
         execute: (dispatch, resource) => {
-            dispatch(reset(MAKE_A_COPY_DIALOG));
             dispatch<any>(openMakeACopyDialog({name: resource.name, projectUuid: resource.uuid}));
         }
     }