X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/9b29a65b9f9f02b338445c12b5d08b292f797c1c..ecfd85a34f5852c160a25ab61bc5c38059927c56:/src/store/users/users-actions.ts diff --git a/src/store/users/users-actions.ts b/src/store/users/users-actions.ts index 42406858..7b12fe75 100644 --- a/src/store/users/users-actions.ts +++ b/src/store/users/users-actions.ts @@ -5,14 +5,15 @@ 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 { dialogActions } from '~/store/dialog/dialog-actions'; import { startSubmit, reset } from "redux-form"; import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions'; import { UserResource } from "~/models/user"; import { getResource } from '~/store/resources/resources'; -import { navigateToProject, navigateToUsers, navigateToRootProject } from "~/store/navigation/navigation-action"; -import { saveApiToken, getUserDetails } from '~/store/auth/auth-action'; +import { navigateTo, navigateToUsers, navigateToRootProject } from "~/store/navigation/navigation-action"; +import { authActions } from '~/store/auth/auth-action'; export const USERS_PANEL_ID = 'usersPanel'; export const USER_ATTRIBUTES_DIALOG = 'userAttributesDialog'; @@ -26,6 +27,12 @@ export interface UserCreateFormDialogData { groupVirtualMachine: string; } +export interface SetupShellAccountFormDialogData { + email: string; + virtualMachineName: string; + groupVirtualMachine: string; +} + export const openUserAttributes = (uuid: string) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const { resources } = getState(); @@ -36,11 +43,8 @@ export const openUserAttributes = (uuid: string) => export const openUserManagement = (uuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const { resources } = getState(); - const user = getResource(uuid)(resources); - const clients = await services.apiClientAuthorizationService.list(); - const client = clients.items.find(it => it.ownerUuid === uuid); - console.log(client); - dispatch(dialogActions.OPEN_DIALOG({ id: USER_MANAGEMENT_DIALOG, data: { user, client } })); + const data = getResource(uuid)(resources); + dispatch(dialogActions.OPEN_DIALOG({ id: USER_MANAGEMENT_DIALOG, data })); }; export const openSetupShellAccount = (uuid: string) => @@ -54,17 +58,20 @@ export const openSetupShellAccount = (uuid: string) => export const loginAs = (uuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const client = await services.apiClientAuthorizationService.get(uuid); - dispatch(saveApiToken(client.apiToken)); - dispatch(getUserDetails()).then(() => { + const { resources } = getState(); + const data = getResource(uuid)(resources); + const client = await services.apiClientAuthorizationService.create({ ownerUuid: uuid }); + if (data) { + dispatch(authActions.INIT_USER({ user: data, token: `v2/${client.uuid}/${client.apiToken}` })); location.reload(); dispatch(navigateToRootProject); - }); + } }; export const openUserCreateDialog = () => 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!); const virtualMachines = await services.virtualMachineService.list(); dispatch(reset(USER_CREATE_FORM_NAME)); @@ -73,7 +80,7 @@ export const openUserCreateDialog = () => export const openUserProjects = (uuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - dispatch(navigateToProject(uuid)); + dispatch(navigateTo(uuid)); }; @@ -93,6 +100,23 @@ export const createUser = (user: UserCreateFormDialogData) => } }; + +export const setupUserVM = (setupData: SetupShellAccountFormDialogData) => + async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + dispatch(startSubmit(USER_CREATE_FORM_NAME)); + try { + // TODO: make correct API call + // const setupResult = await services.userService.setup({ ...setupData }); + dispatch(dialogActions.CLOSE_DIALOG({ id: SETUP_SHELL_ACCOUNT_DIALOG })); + dispatch(reset(SETUP_SHELL_ACCOUNT_DIALOG)); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: "User has been added to VM.", hideDuration: 2000, kind: SnackbarKind.SUCCESS })); + dispatch(loadUsersPanel()); + dispatch(userBindedActions.REQUEST_ITEMS()); + } catch (e) { + return; + } + }; + export const openUserPanel = () => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const user = getState().auth.user; @@ -109,7 +133,12 @@ export const toggleIsActive = (uuid: string) => const { resources } = getState(); const data = getResource(uuid)(resources); const isActive = data!.isActive; - const newActivity = await services.userService.update(uuid, { ...data, isActive: !isActive }); + let newActivity; + if (isActive) { + newActivity = await services.userService.unsetup(uuid); + } else { + newActivity = await services.userService.update(uuid, { isActive: true }); + } dispatch(loadUsersPanel()); return newActivity; }; @@ -119,7 +148,7 @@ export const toggleIsAdmin = (uuid: string) => const { resources } = getState(); const data = getResource(uuid)(resources); const isAdmin = data!.isAdmin; - const newActivity = await services.userService.update(uuid, { ...data, isAdmin: !isAdmin }); + const newActivity = await services.userService.update(uuid, { isAdmin: !isAdmin }); dispatch(loadUsersPanel()); return newActivity; }; @@ -134,4 +163,4 @@ export const loadUsersData = () => export const loadUsersPanel = () => (dispatch: Dispatch) => { dispatch(userBindedActions.REQUEST_ITEMS()); - }; \ No newline at end of file + };