From 41df718825e8a136eb2378a07aa60d572bdb00b4 Mon Sep 17 00:00:00 2001 From: Daniel Kos Date: Tue, 18 Sep 2018 13:21:33 +0200 Subject: [PATCH] Improved error handling in collection and favorites actions Feature #14186 Arvados-DCO-1.1-Signed-off-by: Daniel Kos --- .../collections/collection-copy-actions.ts | 6 ++++- .../collections/collection-create-actions.ts | 6 ++++- .../collections/collection-move-actions.ts | 14 ++++++++--- .../collection-partial-copy-actions.ts | 12 +++++++-- .../collections/collection-update-actions.ts | 4 +++ .../collections/collection-upload-actions.ts | 25 +++++++++++++------ src/store/favorites/favorites-actions.ts | 19 +++++++++++--- 7 files changed, 69 insertions(+), 17 deletions(-) diff --git a/src/store/collections/collection-copy-actions.ts b/src/store/collections/collection-copy-actions.ts index 09d4e04e..058d2dd4 100644 --- a/src/store/collections/collection-copy-actions.ts +++ b/src/store/collections/collection-copy-actions.ts @@ -10,6 +10,7 @@ import { RootState } from '~/store/store'; import { ServiceRepository } from '~/services/services'; import { getCommonResourceServiceError, CommonResourceServiceError } from '~/services/common-service/common-resource-service'; import { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog'; +import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions"; export const COLLECTION_COPY_FORM_NAME = 'collectionCopyFormName'; @@ -25,11 +26,13 @@ export const copyCollection = (resource: CopyFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { dispatch(startSubmit(COLLECTION_COPY_FORM_NAME)); try { + dispatch(progressIndicatorActions.START_WORKING(COLLECTION_COPY_FORM_NAME)); const collection = await services.collectionService.get(resource.uuid); const uuidKey = 'uuid'; delete collection[uuidKey]; await services.collectionService.create({ ...collection, ownerUuid: resource.ownerUuid, name: resource.name }); dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_COPY_FORM_NAME })); + dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_COPY_FORM_NAME)); return collection; } catch (e) { const error = getCommonResourceServiceError(e); @@ -39,6 +42,7 @@ export const copyCollection = (resource: CopyFormDialogData) => dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_COPY_FORM_NAME })); throw new Error('Could not copy the collection.'); } - return ; + dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_COPY_FORM_NAME)); + return; } }; diff --git a/src/store/collections/collection-create-actions.ts b/src/store/collections/collection-create-actions.ts index 254d6a8a..7f21887d 100644 --- a/src/store/collections/collection-create-actions.ts +++ b/src/store/collections/collection-create-actions.ts @@ -10,6 +10,7 @@ import { ServiceRepository } from '~/services/services'; import { getCommonResourceServiceError, CommonResourceServiceError } from "~/services/common-service/common-resource-service"; import { uploadCollectionFiles } from './collection-upload-actions'; import { fileUploaderActions } from '~/store/file-uploader/file-uploader-actions'; +import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions"; export interface CollectionCreateFormDialogData { ownerUuid: string; @@ -30,16 +31,19 @@ export const createCollection = (data: CollectionCreateFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { dispatch(startSubmit(COLLECTION_CREATE_FORM_NAME)); try { + dispatch(progressIndicatorActions.START_WORKING(COLLECTION_CREATE_FORM_NAME)); const newCollection = await services.collectionService.create(data); await dispatch(uploadCollectionFiles(newCollection.uuid)); dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_CREATE_FORM_NAME })); dispatch(reset(COLLECTION_CREATE_FORM_NAME)); + dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_CREATE_FORM_NAME)); return newCollection; } catch (e) { const error = getCommonResourceServiceError(e); if (error === CommonResourceServiceError.UNIQUE_VIOLATION) { dispatch(stopSubmit(COLLECTION_CREATE_FORM_NAME, { name: 'Collection with the same name already exists.' })); } - return ; + dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_CREATE_FORM_NAME)); + return; } }; diff --git a/src/store/collections/collection-move-actions.ts b/src/store/collections/collection-move-actions.ts index 420bcd01..9bdc5523 100644 --- a/src/store/collections/collection-move-actions.ts +++ b/src/store/collections/collection-move-actions.ts @@ -8,10 +8,11 @@ import { startSubmit, stopSubmit, initialize } from 'redux-form'; import { ServiceRepository } from '~/services/services'; import { RootState } from '~/store/store'; import { getCommonResourceServiceError, CommonResourceServiceError } from "~/services/common-service/common-resource-service"; -import { snackbarActions } from '~/store/snackbar/snackbar-actions'; +import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions'; import { projectPanelActions } from '~/store/project-panel/project-panel-action'; import { MoveToFormDialogData } from '~/store/move-to-dialog/move-to-dialog'; import { resetPickerProjectTree } from '~/store/project-tree-picker/project-tree-picker-actions'; +import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions"; export const COLLECTION_MOVE_FORM_NAME = 'collectionMoveFormName'; @@ -26,11 +27,17 @@ export const moveCollection = (resource: MoveToFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { dispatch(startSubmit(COLLECTION_MOVE_FORM_NAME)); try { + dispatch(progressIndicatorActions.START_WORKING(COLLECTION_MOVE_FORM_NAME)); const collection = await services.collectionService.get(resource.uuid); await services.collectionService.update(resource.uuid, { ...collection, ownerUuid: resource.ownerUuid }); dispatch(projectPanelActions.REQUEST_ITEMS()); dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_MOVE_FORM_NAME })); - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been moved', hideDuration: 2000 })); + dispatch(snackbarActions.OPEN_SNACKBAR({ + message: 'Collection has been moved', + hideDuration: 2000, + kind: SnackbarKind.SUCCESS + })); + dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_MOVE_FORM_NAME)); return collection; } catch (e) { const error = getCommonResourceServiceError(e); @@ -40,6 +47,7 @@ export const moveCollection = (resource: MoveToFormDialogData) => dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_MOVE_FORM_NAME })); dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not move the collection.', hideDuration: 2000 })); } - return ; + dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_MOVE_FORM_NAME)); + return; } }; diff --git a/src/store/collections/collection-partial-copy-actions.ts b/src/store/collections/collection-partial-copy-actions.ts index dedf75e1..4dac9c7d 100644 --- a/src/store/collections/collection-partial-copy-actions.ts +++ b/src/store/collections/collection-partial-copy-actions.ts @@ -9,8 +9,9 @@ import { resetPickerProjectTree } from '~/store/project-tree-picker/project-tree import { dialogActions } from '~/store/dialog/dialog-actions'; import { ServiceRepository } from '~/services/services'; import { filterCollectionFilesBySelection } from '../collection-panel/collection-panel-files/collection-panel-files-state'; -import { snackbarActions } from '~/store/snackbar/snackbar-actions'; +import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions'; import { getCommonResourceServiceError, CommonResourceServiceError } from '~/services/common-service/common-resource-service'; +import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions"; export const COLLECTION_PARTIAL_COPY_FORM_NAME = 'COLLECTION_PARTIAL_COPY_DIALOG'; @@ -42,6 +43,7 @@ export const copyCollectionPartial = ({ name, description, projectUuid }: Collec const currentCollection = state.collectionPanel.item; if (currentCollection) { try { + dispatch(progressIndicatorActions.START_WORKING(COLLECTION_PARTIAL_COPY_FORM_NAME)); const collection = await services.collectionService.get(currentCollection.uuid); const collectionCopy = { ...collection, @@ -54,7 +56,12 @@ export const copyCollectionPartial = ({ name, description, projectUuid }: Collec const paths = filterCollectionFilesBySelection(state.collectionPanelFiles, false).map(file => file.id); await services.collectionService.deleteFiles(newCollection.uuid, paths); dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_COPY_FORM_NAME })); - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'New collection created.', hideDuration: 2000 })); + dispatch(snackbarActions.OPEN_SNACKBAR({ + message: 'New collection created.', + hideDuration: 2000, + kind: SnackbarKind.SUCCESS + })); + dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_COPY_FORM_NAME)); } catch (e) { const error = getCommonResourceServiceError(e); if (error === CommonResourceServiceError.UNIQUE_VIOLATION) { @@ -66,6 +73,7 @@ export const copyCollectionPartial = ({ name, description, projectUuid }: Collec dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_COPY_FORM_NAME })); dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been copied but may contain incorrect files.', hideDuration: 2000 })); } + dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_COPY_FORM_NAME)); } } }; diff --git a/src/store/collections/collection-update-actions.ts b/src/store/collections/collection-update-actions.ts index bf05d4dd..9c859234 100644 --- a/src/store/collections/collection-update-actions.ts +++ b/src/store/collections/collection-update-actions.ts @@ -11,6 +11,7 @@ import { getCommonResourceServiceError, CommonResourceServiceError } from "~/ser import { ServiceRepository } from "~/services/services"; import { CollectionResource } from '~/models/collection'; import { ContextMenuResource } from "~/store/context-menu/context-menu-actions"; +import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions"; export interface CollectionUpdateFormDialogData { uuid: string; @@ -31,15 +32,18 @@ export const updateCollection = (collection: Partial) => const uuid = collection.uuid || ''; dispatch(startSubmit(COLLECTION_UPDATE_FORM_NAME)); try { + dispatch(progressIndicatorActions.START_WORKING(COLLECTION_UPDATE_FORM_NAME)); const updatedCollection = await services.collectionService.update(uuid, collection); dispatch(collectionPanelActions.LOAD_COLLECTION_SUCCESS({ item: updatedCollection as CollectionResource })); dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_UPDATE_FORM_NAME })); + dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_UPDATE_FORM_NAME)); return updatedCollection; } catch (e) { const error = getCommonResourceServiceError(e); if (error === CommonResourceServiceError.UNIQUE_VIOLATION) { dispatch(stopSubmit(COLLECTION_UPDATE_FORM_NAME, { name: 'Collection with the same name already exists.' })); } + dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_UPDATE_FORM_NAME)); return; } }; diff --git a/src/store/collections/collection-upload-actions.ts b/src/store/collections/collection-upload-actions.ts index 4a5aff35..ef241a7c 100644 --- a/src/store/collections/collection-upload-actions.ts +++ b/src/store/collections/collection-upload-actions.ts @@ -7,9 +7,10 @@ import { RootState } from '~/store/store'; import { ServiceRepository } from '~/services/services'; import { dialogActions } from '~/store/dialog/dialog-actions'; import { loadCollectionFiles } from '../collection-panel/collection-panel-files/collection-panel-files-actions'; -import { snackbarActions } from '~/store/snackbar/snackbar-actions'; +import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions'; import { fileUploaderActions } from '~/store/file-uploader/file-uploader-actions'; import { reset, startSubmit } from 'redux-form'; +import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions"; export const uploadCollectionFiles = (collectionUuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { @@ -31,11 +32,21 @@ export const submitCollectionFiles = () => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const currentCollection = getState().collectionPanel.item; if (currentCollection) { - dispatch(startSubmit(COLLECTION_UPLOAD_FILES_DIALOG)); - await dispatch(uploadCollectionFiles(currentCollection.uuid)); - dispatch(loadCollectionFiles(currentCollection.uuid)); - dispatch(closeUploadCollectionFilesDialog()); - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Data has been uploaded.', hideDuration: 2000 })); + try { + dispatch(progressIndicatorActions.START_WORKING(COLLECTION_UPLOAD_FILES_DIALOG)); + dispatch(startSubmit(COLLECTION_UPLOAD_FILES_DIALOG)); + await dispatch(uploadCollectionFiles(currentCollection.uuid)); + dispatch(loadCollectionFiles(currentCollection.uuid)); + dispatch(closeUploadCollectionFilesDialog()); + dispatch(snackbarActions.OPEN_SNACKBAR({ + message: 'Data has been uploaded.', + hideDuration: 2000, + kind: SnackbarKind.SUCCESS + })); + dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_UPLOAD_FILES_DIALOG)); + } catch (e) { + dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_UPLOAD_FILES_DIALOG)); + } } }; @@ -43,4 +54,4 @@ export const closeUploadCollectionFilesDialog = () => dialogActions.CLOSE_DIALOG const handleUploadProgress = (dispatch: Dispatch) => (fileId: number, loaded: number, total: number, currentTime: number) => { dispatch(fileUploaderActions.SET_UPLOAD_PROGRESS({ fileId, loaded, total, currentTime })); -}; \ No newline at end of file +}; diff --git a/src/store/favorites/favorites-actions.ts b/src/store/favorites/favorites-actions.ts index e5a8e591..5a3001fb 100644 --- a/src/store/favorites/favorites-actions.ts +++ b/src/store/favorites/favorites-actions.ts @@ -6,8 +6,9 @@ import { unionize, ofType, UnionOf } from "~/common/unionize"; import { Dispatch } from "redux"; import { RootState } from "../store"; import { checkFavorite } from "./favorites-reducer"; -import { snackbarActions } from "../snackbar/snackbar-actions"; +import { snackbarActions, SnackbarKind } from "../snackbar/snackbar-actions"; import { ServiceRepository } from "~/services/services"; +import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions"; export const favoritesActions = unionize({ TOGGLE_FAVORITE: ofType<{ resourceUuid: string }>(), @@ -19,10 +20,16 @@ export type FavoritesAction = UnionOf; export const toggleFavorite = (resource: { uuid: string; name: string }) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise => { + dispatch(progressIndicatorActions.START_WORKING("toggleFavorite")); const userUuid = getState().auth.user!.uuid; dispatch(favoritesActions.TOGGLE_FAVORITE({ resourceUuid: resource.uuid })); - dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Working..." })); const isFavorite = checkFavorite(resource.uuid, getState().favorites); + dispatch(snackbarActions.OPEN_SNACKBAR({ + message: isFavorite + ? "Removing from favorites..." + : "Adding to favorites..." + })); + const promise: any = isFavorite ? services.favoriteService.delete({ userUuid, resourceUuid: resource.uuid }) : services.favoriteService.create({ userUuid, resource }); @@ -35,8 +42,14 @@ export const toggleFavorite = (resource: { uuid: string; name: string }) => message: isFavorite ? "Removed from favorites" : "Added to favorites", - hideDuration: 2000 + hideDuration: 2000, + kind: SnackbarKind.SUCCESS })); + dispatch(progressIndicatorActions.STOP_WORKING("toggleFavorite")); + }) + .catch((e: any) => { + dispatch(progressIndicatorActions.STOP_WORKING("toggleFavorite")); + throw e; }); }; -- 2.30.2