X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/e59bd2157e1ef8f67a48f2956ee4f03d3490b915..87184cd1febea084a96e87d2b94028b6751d4418:/src/store/collection-panel/collection-panel-action.ts

diff --git a/src/store/collection-panel/collection-panel-action.ts b/src/store/collection-panel/collection-panel-action.ts
index 15d5ef72..ca9542c5 100644
--- a/src/store/collection-panel/collection-panel-action.ts
+++ b/src/store/collection-panel/collection-panel-action.ts
@@ -3,22 +3,23 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { Dispatch } from "redux";
-import { loadCollectionFiles, COLLECTION_PANEL_LOAD_FILES_THRESHOLD } from "./collection-panel-files/collection-panel-files-actions";
-import { CollectionResource } from '~/models/collection';
-import { RootState } from "~/store/store";
-import { ServiceRepository } from "~/services/services";
-import { TagProperty } from "~/models/tag";
+import {
+    COLLECTION_PANEL_LOAD_FILES_THRESHOLD
+} from "./collection-panel-files/collection-panel-files-actions";
+import { CollectionResource } from 'models/collection';
+import { RootState } from "store/store";
+import { ServiceRepository } from "services/services";
+import { TagProperty } from "models/tag";
 import { snackbarActions } from "../snackbar/snackbar-actions";
-import { resourcesActions } from "~/store/resources/resources-actions";
-import { unionize, ofType, UnionOf } from '~/common/unionize';
-import { SnackbarKind } from '~/store/snackbar/snackbar-actions';
-import { navigateTo } from '~/store/navigation/navigation-action';
-import { loadDetailsPanel } from '~/store/details-panel/details-panel-action';
-import { addProperty, deleteProperty } from "~/lib/resource-properties";
+import { resourcesActions } from "store/resources/resources-actions";
+import { unionize, ofType, UnionOf } from 'common/unionize';
+import { SnackbarKind } from 'store/snackbar/snackbar-actions';
+import { navigateTo } from 'store/navigation/navigation-action';
+import { loadDetailsPanel } from 'store/details-panel/details-panel-action';
+import { addProperty, deleteProperty } from "lib/resource-properties";
 
 export const collectionPanelActions = unionize({
     SET_COLLECTION: ofType<CollectionResource>(),
-    LOAD_COLLECTION: ofType<{ uuid: string }>(),
     LOAD_COLLECTION_SUCCESS: ofType<{ item: CollectionResource }>(),
     LOAD_BIG_COLLECTIONS: ofType<boolean>(),
 });
@@ -27,43 +28,49 @@ export type CollectionPanelAction = UnionOf<typeof collectionPanelActions>;
 
 export const COLLECTION_TAG_FORM_NAME = 'collectionTagForm';
 
-export const loadCollectionPanel = (uuid: string) =>
+export const loadCollectionPanel = (uuid: string, forceReload = false) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         const { collectionPanel: { item } } = getState();
-        dispatch(collectionPanelActions.LOAD_COLLECTION({ uuid }));
-        const collection = item ? item : await services.collectionService.get(uuid);
-        dispatch(loadDetailsPanel(collection.uuid));
+        const collection = (item && item.uuid === uuid && !forceReload)
+            ? item
+            : await services.collectionService.get(uuid);
+        dispatch<any>(loadDetailsPanel(collection.uuid));
         dispatch(collectionPanelActions.LOAD_COLLECTION_SUCCESS({ item: collection }));
         dispatch(resourcesActions.SET_RESOURCES([collection]));
         if (collection.fileCount <= COLLECTION_PANEL_LOAD_FILES_THRESHOLD &&
             !getState().collectionPanel.loadBigCollections) {
-            dispatch<any>(loadCollectionFiles(collection.uuid));
+            // dispatch<any>(loadCollectionFiles(collection.uuid));
         }
         return collection;
     };
 
 export const createCollectionTag = (data: TagProperty) =>
-    async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         const item = getState().collectionPanel.item;
         if (!item) { return; }
 
         const properties = Object.assign({}, item.properties);
-        try {
-            const key = data.keyID || data.key;
-            const value = data.valueID || data.value;
-            const updatedCollection = await services.collectionService.update(
-                item.uuid, {
-                    properties: addProperty(properties, key, value)
-                }
-            );
+        const key = data.keyID || data.key;
+        const value = data.valueID || data.value;
+        services.collectionService.update(
+            item.uuid, {
+                properties: addProperty(properties, key, value)
+            }
+        ).then(updatedCollection => {
             dispatch(collectionPanelActions.SET_COLLECTION(updatedCollection));
             dispatch(resourcesActions.SET_RESOURCES([updatedCollection]));
-            dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Tag has been successfully added.", hideDuration: 2000, kind: SnackbarKind.SUCCESS }));
+            dispatch(snackbarActions.OPEN_SNACKBAR({
+                message: "Property has been successfully added.",
+                hideDuration: 2000,
+                kind: SnackbarKind.SUCCESS }));
+            dispatch<any>(loadDetailsPanel(updatedCollection.uuid));
             return updatedCollection;
-        } catch (e) {
-            dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.errors[0], hideDuration: 2000, kind: SnackbarKind.ERROR }));
-            return;
-        }
+        }).catch (e =>
+            dispatch(snackbarActions.OPEN_SNACKBAR({
+                message: e.errors[0],
+                hideDuration: 2000,
+                kind: SnackbarKind.ERROR }))
+        );
     };
 
 export const navigateToProcess = (uuid: string) =>
@@ -77,23 +84,25 @@ export const navigateToProcess = (uuid: string) =>
     };
 
 export const deleteCollectionTag = (key: string, value: string) =>
-    async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         const item = getState().collectionPanel.item;
         if (!item) { return; }
 
         const properties = Object.assign({}, item.properties);
-        try {
-            const updatedCollection = await services.collectionService.update(
-                item.uuid, {
-                    properties: deleteProperty(properties, key, value)
-                }
-            );
+        services.collectionService.update(
+            item.uuid, {
+                properties: deleteProperty(properties, key, value)
+            }
+        ).then(updatedCollection => {
             dispatch(collectionPanelActions.SET_COLLECTION(updatedCollection));
             dispatch(resourcesActions.SET_RESOURCES([updatedCollection]));
             dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Tag has been successfully deleted.", hideDuration: 2000, kind: SnackbarKind.SUCCESS }));
+            dispatch<any>(loadDetailsPanel(updatedCollection.uuid));
             return updatedCollection;
-        } catch (e) {
-            dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.errors[0], hideDuration: 2000, kind: SnackbarKind.ERROR }));
-            return;
-        }
+        }).catch (e => {
+            dispatch(snackbarActions.OPEN_SNACKBAR({
+                message: e.errors[0],
+                hideDuration: 2000,
+                kind: SnackbarKind.ERROR }));
+        });
     };