X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/f9dafeec8d45f0cb19d71326b7fa877891a7eb9e..de3b8d1fa96ec9a5d28b05dade868abf8132904b:/src/store/repositories/repositories-actions.ts diff --git a/src/store/repositories/repositories-actions.ts b/src/store/repositories/repositories-actions.ts index ea64bfc9..239b531c 100644 --- a/src/store/repositories/repositories-actions.ts +++ b/src/store/repositories/repositories-actions.ts @@ -5,6 +5,7 @@ import { Dispatch } from "redux"; 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"; @@ -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()); @@ -91,7 +94,7 @@ export const removeRepository = (uuid: string) => const repositoriesBindedActions = bindDataExplorerActions(REPOSITORIES_PANEL); export const openRepositoriesPanel = () => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { dispatch(navigateToRepositories); };