projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14874: Shows error message on properties update.
[arvados.git]
/
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 3b3e34c2b063765a02e2a1b9808ece9ab9aeb75c..cb28fcea8ad6aa768b49e7b21cc42f83f1faaf1b 100644
(file)
--- a/
src/store/collection-panel/collection-panel-action.ts
+++ b/
src/store/collection-panel/collection-panel-action.ts
@@
-7,7
+7,7
@@
import { loadCollectionFiles } from "./collection-panel-files/collection-panel-f
import { CollectionResource } from '~/models/collection';
import { collectionPanelFilesAction } from "./collection-panel-files/collection-panel-files-actions";
import { createTree } from "~/models/tree";
import { CollectionResource } from '~/models/collection';
import { collectionPanelFilesAction } from "./collection-panel-files/collection-panel-files-actions";
import { createTree } from "~/models/tree";
-import { RootState } from "
..
/store";
+import { RootState } from "
~/store
/store";
import { ServiceRepository } from "~/services/services";
import { TagProperty } from "~/models/tag";
import { snackbarActions } from "../snackbar/snackbar-actions";
import { ServiceRepository } from "~/services/services";
import { TagProperty } from "~/models/tag";
import { snackbarActions } from "../snackbar/snackbar-actions";
@@
-15,6
+15,7
@@
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 { 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';
export const collectionPanelActions = unionize({
SET_COLLECTION: ofType<CollectionResource>(),
export const collectionPanelActions = unionize({
SET_COLLECTION: ofType<CollectionResource>(),
@@
-31,6
+32,7
@@
export const loadCollectionPanel = (uuid: string) =>
dispatch(collectionPanelActions.LOAD_COLLECTION({ uuid }));
dispatch(collectionPanelFilesAction.SET_COLLECTION_FILES({ files: createTree() }));
const collection = await services.collectionService.get(uuid);
dispatch(collectionPanelActions.LOAD_COLLECTION({ uuid }));
dispatch(collectionPanelFilesAction.SET_COLLECTION_FILES({ files: createTree() }));
const collection = await services.collectionService.get(uuid);
+ dispatch(loadDetailsPanel(collection.uuid));
dispatch(collectionPanelActions.LOAD_COLLECTION_SUCCESS({ item: collection }));
dispatch(resourcesActions.SET_RESOURCES([collection]));
dispatch<any>(loadCollectionFiles(collection.uuid));
dispatch(collectionPanelActions.LOAD_COLLECTION_SUCCESS({ item: collection }));
dispatch(resourcesActions.SET_RESOURCES([collection]));
dispatch<any>(loadCollectionFiles(collection.uuid));
@@
-43,14
+45,19
@@
export const createCollectionTag = (data: TagProperty) =>
const uuid = item ? item.uuid : '';
try {
if (item) {
const uuid = item ? item.uuid : '';
try {
if (item) {
+ const d: Partial<CollectionResource> = {
+ 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;
item.properties[data.key] = data.value;
- const updatedCollection = await services.collectionService.update(uuid, item);
dispatch(resourcesActions.SET_RESOURCES([updatedCollection]));
dispatch(resourcesActions.SET_RESOURCES([updatedCollection]));
- dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Tag has been successfully added.", hideDuration: 2000 }));
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Tag has been successfully added.", hideDuration: 2000
, kind: SnackbarKind.SUCCESS
}));
return updatedCollection;
}
return;
} catch (e) {
return updatedCollection;
}
return;
} catch (e) {
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.errors[0], hideDuration: 2000, kind: SnackbarKind.ERROR }));
return;
}
};
return;
}
};
@@
-61,7
+68,7
@@
export const navigateToProcess = (uuid: string) =>
await services.containerRequestService.get(uuid);
dispatch<any>(navigateTo(uuid));
} catch {
await services.containerRequestService.get(uuid);
dispatch<any>(navigateTo(uuid));
} catch {
- dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'This process does not exist
s
!', hideDuration: 2000, kind: SnackbarKind.ERROR }));
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'This process does not exist!', hideDuration: 2000, kind: SnackbarKind.ERROR }));
}
};
}
};
@@
-71,14
+78,19
@@
export const deleteCollectionTag = (key: string) =>
const uuid = item ? item.uuid : '';
try {
if (item) {
const uuid = item ? item.uuid : '';
try {
if (item) {
+ const data: Partial<CollectionResource> = {
+ properties: JSON.parse(JSON.stringify(item.properties))
+ };
+ delete data.properties[key];
+ const updatedCollection = await services.collectionService.update(uuid, data);
delete item.properties[key];
delete item.properties[key];
- const updatedCollection = await services.collectionService.update(uuid, item);
dispatch(resourcesActions.SET_RESOURCES([updatedCollection]));
dispatch(resourcesActions.SET_RESOURCES([updatedCollection]));
- dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Tag has been successfully deleted.", hideDuration: 2000 }));
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Tag has been successfully deleted.", hideDuration: 2000
, kind: SnackbarKind.SUCCESS
}));
return updatedCollection;
}
return;
} catch (e) {
return updatedCollection;
}
return;
} catch (e) {
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.errors[0], hideDuration: 2000, kind: SnackbarKind.ERROR }));
return;
}
};
return;
}
};