[ARVADOS-WORKBENCH2] updated: 1.1.4-687-g838af71

Git user git at public.curoverse.com
Mon Aug 20 09:30:09 EDT 2018


Summary of changes:
 src/components/make-a-copy/make-a-copy.tsx                            | 2 +-
 src/components/tree/tree.tsx                                          | 4 +++-
 .../context-menu/action-sets/collection-action-set.ts                 | 4 +---
 .../context-menu/action-sets/collection-resource-action-set.ts        | 4 +---
 src/views-components/context-menu/action-sets/project-action-set.ts   | 3 +--
 5 files changed, 7 insertions(+), 10 deletions(-)

       via  838af71bfe460c7f5a03121acf8a4d239893cdac (commit)
      from  d6a65f155ca546aea3a777e73076c2c80f2c88cc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 838af71bfe460c7f5a03121acf8a4d239893cdac
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date:   Mon Aug 20 15:29:58 2018 +0200

    small refactor
    
    Feature #13988
    
    Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>

diff --git a/src/components/make-a-copy/make-a-copy.tsx b/src/components/make-a-copy/make-a-copy.tsx
index 98be8ef..f1098ff 100644
--- a/src/components/make-a-copy/make-a-copy.tsx
+++ b/src/components/make-a-copy/make-a-copy.tsx
@@ -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;
diff --git a/src/components/tree/tree.tsx b/src/components/tree/tree.tsx
index 6b12753..8a56739 100644
--- a/src/components/tree/tree.tsx
+++ b/src/components/tree/tree.tsx
@@ -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) => {
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 2405906..0f0125c 100644
--- a/src/views-components/context-menu/action-sets/collection-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-action-set.ts
@@ -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}));
         }
     },
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 ea61d26..cf05aee 100644
--- 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
@@ -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}));
         },
     },
diff --git a/src/views-components/context-menu/action-sets/project-action-set.ts b/src/views-components/context-menu/action-sets/project-action-set.ts
index d4a3fa1..f7fc4f5 100644
--- a/src/views-components/context-menu/action-sets/project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-action-set.ts
@@ -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}));
         }
     }

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list