X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ada23a4054724d0d6be4ee88efb22daecd86001f..24e864bc823b27ac27c39e9e5879987924330007:/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 76a40dcbea..cb28fcea8a 100644 --- a/src/store/collection-panel/collection-panel-action.ts +++ b/src/store/collection-panel/collection-panel-action.ts @@ -15,12 +15,10 @@ 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 { FilterBuilder } from "~/services/api/filter-builder"; import { loadDetailsPanel } from '~/store/details-panel/details-panel-action'; export const collectionPanelActions = unionize({ SET_COLLECTION: ofType(), - SET_NUMBER_OF_COLLECTIONS_WITH_SAME_PDH: ofType(), LOAD_COLLECTION: ofType<{ uuid: string }>(), LOAD_COLLECTION_SUCCESS: ofType<{ item: CollectionResource }>() }); @@ -34,12 +32,6 @@ export const loadCollectionPanel = (uuid: string) => dispatch(collectionPanelActions.LOAD_COLLECTION({ uuid })); dispatch(collectionPanelFilesAction.SET_COLLECTION_FILES({ files: createTree() })); const collection = await services.collectionService.get(uuid); - const collectionsByPDH = await services.collectionService.list({ - filters: new FilterBuilder() - .addEqual('portableDataHash', collection.portableDataHash) - .getFilters() - }); - dispatch(collectionPanelActions.SET_NUMBER_OF_COLLECTIONS_WITH_SAME_PDH(collectionsByPDH.itemsAvailable)); dispatch(loadDetailsPanel(collection.uuid)); dispatch(collectionPanelActions.LOAD_COLLECTION_SUCCESS({ item: collection })); dispatch(resourcesActions.SET_RESOURCES([collection])); @@ -53,16 +45,19 @@ export const createCollectionTag = (data: TagProperty) => const uuid = item ? item.uuid : ''; try { if (item) { + const d: Partial = { + properties: JSON.parse(JSON.stringify(item.properties)) + }; + d.properties[data.key] = data.value; + const updatedCollection = await services.collectionService.update(uuid, d); item.properties[data.key] = data.value; - const version = 'version'; - delete item[version]; - const updatedCollection = await services.collectionService.update(uuid, item); dispatch(resourcesActions.SET_RESOURCES([updatedCollection])); dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Tag has been successfully added.", hideDuration: 2000, kind: SnackbarKind.SUCCESS })); return updatedCollection; } return; } catch (e) { + dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.errors[0], hideDuration: 2000, kind: SnackbarKind.ERROR })); return; } }; @@ -73,7 +68,7 @@ export const navigateToProcess = (uuid: string) => await services.containerRequestService.get(uuid); dispatch(navigateTo(uuid)); } catch { - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'This process does not exists!', hideDuration: 2000, kind: SnackbarKind.ERROR })); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'This process does not exist!', hideDuration: 2000, kind: SnackbarKind.ERROR })); } }; @@ -83,14 +78,19 @@ export const deleteCollectionTag = (key: string) => const uuid = item ? item.uuid : ''; try { if (item) { + const data: Partial = { + properties: JSON.parse(JSON.stringify(item.properties)) + }; + delete data.properties[key]; + const updatedCollection = await services.collectionService.update(uuid, data); delete item.properties[key]; - const updatedCollection = await services.collectionService.update(uuid, item); dispatch(resourcesActions.SET_RESOURCES([updatedCollection])); dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Tag has been successfully deleted.", hideDuration: 2000, kind: SnackbarKind.SUCCESS })); return updatedCollection; } return; } catch (e) { + dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.errors[0], hideDuration: 2000, kind: SnackbarKind.ERROR })); return; } };