X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c324b64f3b26e79b4640b6f0cf55671f1a261bca..818979d32a30f9b0bdbf5cee646124c131386d70:/src/store/favorites/favorites-actions.ts diff --git a/src/store/favorites/favorites-actions.ts b/src/store/favorites/favorites-actions.ts index 5a3001fbc0..bd4d878ed5 100644 --- a/src/store/favorites/favorites-actions.ts +++ b/src/store/favorites/favorites-actions.ts @@ -2,13 +2,14 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { unionize, ofType, UnionOf } from "~/common/unionize"; +import { unionize, ofType, UnionOf } from "common/unionize"; import { Dispatch } from "redux"; import { RootState } from "../store"; +import { getUserUuid } from "common/getuser"; import { checkFavorite } from "./favorites-reducer"; import { snackbarActions, SnackbarKind } from "../snackbar/snackbar-actions"; -import { ServiceRepository } from "~/services/services"; -import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions"; +import { ServiceRepository } from "services/services"; +import { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions"; export const favoritesActions = unionize({ TOGGLE_FAVORITE: ofType<{ resourceUuid: string }>(), @@ -20,14 +21,18 @@ export type FavoritesAction = UnionOf; export const toggleFavorite = (resource: { uuid: string; name: string }) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise => { + const userUuid = getUserUuid(getState()); + if (!userUuid) { + return Promise.reject("No user"); + } dispatch(progressIndicatorActions.START_WORKING("toggleFavorite")); - const userUuid = getState().auth.user!.uuid; dispatch(favoritesActions.TOGGLE_FAVORITE({ resourceUuid: resource.uuid })); const isFavorite = checkFavorite(resource.uuid, getState().favorites); dispatch(snackbarActions.OPEN_SNACKBAR({ message: isFavorite ? "Removing from favorites..." - : "Adding to favorites..." + : "Adding to favorites...", + kind: SnackbarKind.INFO })); const promise: any = isFavorite @@ -55,7 +60,8 @@ export const toggleFavorite = (resource: { uuid: string; name: string }) => export const updateFavorites = (resourceUuids: string[]) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const userUuid = getState().auth.user!.uuid; + const userUuid = getUserUuid(getState()); + if (!userUuid) { return; } dispatch(favoritesActions.CHECK_PRESENCE_IN_FAVORITES(resourceUuids)); services.favoriteService .checkPresenceInFavorites(userUuid, resourceUuids)