X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/4a055bfc98a5fc05cc311e2de1ab2213eec5497e..87184cd1febea084a96e87d2b94028b6751d4418:/src/store/repositories/repositories-actions.ts diff --git a/src/store/repositories/repositories-actions.ts b/src/store/repositories/repositories-actions.ts index f2f06e80..80ba12f0 100644 --- a/src/store/repositories/repositories-actions.ts +++ b/src/store/repositories/repositories-actions.ts @@ -3,16 +3,17 @@ // SPDX-License-Identifier: AGPL-3.0 import { Dispatch } from "redux"; -import { bindDataExplorerActions } from '~/store/data-explorer/data-explorer-action'; -import { RootState } from '~/store/store'; -import { ServiceRepository } from "~/services/services"; -import { navigateToRepositories } from "~/store/navigation/navigation-action"; -import { unionize, ofType, UnionOf } from "~/common/unionize"; -import { dialogActions } from '~/store/dialog/dialog-actions'; -import { RepositoryResource } from "~/models/repositories"; +import { bindDataExplorerActions } from 'store/data-explorer/data-explorer-action'; +import { RootState } from 'store/store'; +import { getUserUuid } from "common/getuser"; +import { ServiceRepository } from "services/services"; +import { navigateToRepositories } from "store/navigation/navigation-action"; +import { unionize, ofType, UnionOf } from "common/unionize"; +import { dialogActions } from 'store/dialog/dialog-actions'; +import { RepositoryResource } from "models/repositories"; import { startSubmit, reset, stopSubmit, FormErrors } from "redux-form"; -import { getCommonResourceServiceError, CommonResourceServiceError } from "~/services/common-service/common-resource-service"; -import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions'; +import { getCommonResourceServiceError, CommonResourceServiceError } from "services/common-service/common-resource-service"; +import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions'; export const repositoriesActions = unionize({ SET_REPOSITORIES: ofType(), @@ -40,7 +41,8 @@ export const openRepositoryAttributes = (uuid: string) => export const openRepositoryCreateDialog = () => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const userUuid = await services.authService.getUuid(); + const userUuid = getUserUuid(getState()); + if (!userUuid) { return; } const user = await services.userService.get(userUuid!); dispatch(reset(REPOSITORY_CREATE_FORM_NAME)); dispatch(dialogActions.OPEN_DIALOG({ id: REPOSITORY_CREATE_FORM_NAME, data: { user } })); @@ -48,7 +50,8 @@ export const openRepositoryCreateDialog = () => export const createRepository = (repository: RepositoryResource) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const userUuid = await services.authService.getUuid(); + const userUuid = getUserUuid(getState()); + if (!userUuid) { return; } const user = await services.userService.get(userUuid!); dispatch(startSubmit(REPOSITORY_CREATE_FORM_NAME)); try { @@ -82,7 +85,7 @@ export const openRemoveRepositoryDialog = (uuid: string) => export const removeRepository = (uuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Removing ...' })); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Removing ...', kind: SnackbarKind.INFO })); await services.repositoriesService.delete(uuid); dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Removed.', hideDuration: 2000, kind: SnackbarKind.SUCCESS })); dispatch(loadRepositoriesData());