X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/25216cc7acedc987c26a159f0b640210c0ef101e..f6396d366359d62ec22ca7a0efd4bf22a395f933:/src/store/groups-panel/groups-panel-actions.ts diff --git a/src/store/groups-panel/groups-panel-actions.ts b/src/store/groups-panel/groups-panel-actions.ts index 0d92e946..6e63702e 100644 --- a/src/store/groups-panel/groups-panel-actions.ts +++ b/src/store/groups-panel/groups-panel-actions.ts @@ -3,25 +3,23 @@ // SPDX-License-Identifier: AGPL-3.0 import { Dispatch } from 'redux'; -import { reset, startSubmit, stopSubmit, FormErrors } from 'redux-form'; +import { reset, startSubmit, stopSubmit, FormErrors, initialize } from 'redux-form'; import { bindDataExplorerActions } from "store/data-explorer/data-explorer-action"; import { dialogActions } from 'store/dialog/dialog-actions'; -import { Participant } from 'views-components/sharing-dialog/participant-select'; import { RootState } from 'store/store'; import { ServiceRepository } from 'services/services'; import { getResource } from 'store/resources/resources'; -import { GroupResource } from 'models/group'; +import { GroupResource, GroupClass } from 'models/group'; import { getCommonResourceServiceError, CommonResourceServiceError } from 'services/common-service/common-resource-service'; import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions'; import { PermissionLevel } from 'models/permission'; import { PermissionService } from 'services/permission-service/permission-service'; import { FilterBuilder } from 'services/api/filter-builder'; +import { ProjectUpdateFormDialogData, PROJECT_UPDATE_FORM_NAME } from 'store/projects/project-update-actions'; +import { PROJECT_CREATE_FORM_NAME } from 'store/projects/project-create-actions'; export const GROUPS_PANEL_ID = "groupsPanel"; -export const CREATE_GROUP_DIALOG = "createGroupDialog"; -export const CREATE_GROUP_FORM = "createGroupForm"; -export const CREATE_GROUP_NAME_FIELD_NAME = 'name'; -export const CREATE_GROUP_USERS_FIELD_NAME = 'users'; + export const GROUP_ATTRIBUTES_DIALOG = 'groupAttributesDialog'; export const GROUP_REMOVE_DIALOG = 'groupRemoveDialog'; @@ -30,9 +28,14 @@ export const GroupsPanelActions = bindDataExplorerActions(GROUPS_PANEL_ID); export const loadGroupsPanel = () => GroupsPanelActions.REQUEST_ITEMS(); export const openCreateGroupDialog = () => - (dispatch: Dispatch) => { - dispatch(dialogActions.OPEN_DIALOG({ id: CREATE_GROUP_DIALOG, data: {} })); - dispatch(reset(CREATE_GROUP_FORM)); + (dispatch: Dispatch, getState: () => RootState) => { + dispatch(initialize(PROJECT_CREATE_FORM_NAME, {})); + dispatch(dialogActions.OPEN_DIALOG({ + id: PROJECT_CREATE_FORM_NAME, + data: { + sourcePanel: GroupClass.ROLE, + } + })); }; export const openGroupAttributes = (uuid: string) => @@ -63,16 +66,43 @@ export const openRemoveGroupDialog = (uuid: string) => })); }; -export interface CreateGroupFormData { - [CREATE_GROUP_NAME_FIELD_NAME]: string; - [CREATE_GROUP_USERS_FIELD_NAME]?: Participant[]; -} +// Group edit dialog uses project update dialog with sourcePanel set to reload the appropriate parts +export const openGroupUpdateDialog = (resource: ProjectUpdateFormDialogData) => + (dispatch: Dispatch, getState: () => RootState) => { + dispatch(initialize(PROJECT_UPDATE_FORM_NAME, resource)); + dispatch(dialogActions.OPEN_DIALOG({ + id: PROJECT_UPDATE_FORM_NAME, + data: { + sourcePanel: GroupClass.ROLE, + } + })); + }; -export const createGroup = ({ name, users = [] }: CreateGroupFormData) => +export const updateGroup = (project: ProjectUpdateFormDialogData) => + async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + const uuid = project.uuid || ''; + dispatch(startSubmit(PROJECT_UPDATE_FORM_NAME)); + try { + const updatedGroup = await services.groupsService.update(uuid, { name: project.name, description: project.description }); + dispatch(GroupsPanelActions.REQUEST_ITEMS()); + dispatch(reset(PROJECT_UPDATE_FORM_NAME)); + dispatch(dialogActions.CLOSE_DIALOG({ id: PROJECT_UPDATE_FORM_NAME })); + return updatedGroup; + } catch (e) { + dispatch(stopSubmit(PROJECT_UPDATE_FORM_NAME)); + const error = getCommonResourceServiceError(e); + if (error === CommonResourceServiceError.UNIQUE_NAME_VIOLATION) { + dispatch(stopSubmit(PROJECT_UPDATE_FORM_NAME, { name: 'Group with the same name already exists.' } as FormErrors)); + } + return ; + } + }; + +export const createGroup = ({ name, users = [], description }: ProjectUpdateFormDialogData) => async (dispatch: Dispatch, _: {}, { groupsService, permissionService }: ServiceRepository) => { - dispatch(startSubmit(CREATE_GROUP_FORM)); + dispatch(startSubmit(PROJECT_CREATE_FORM_NAME)); try { - const newGroup = await groupsService.create({ name }); + const newGroup = await groupsService.create({ name, description, groupClass: GroupClass.ROLE }); for (const user of users) { await addGroupMember({ user, @@ -81,8 +111,8 @@ export const createGroup = ({ name, users = [] }: CreateGroupFormData) => permissionService, }); } - dispatch(dialogActions.CLOSE_DIALOG({ id: CREATE_GROUP_DIALOG })); - dispatch(reset(CREATE_GROUP_FORM)); + dispatch(dialogActions.CLOSE_DIALOG({ id: PROJECT_CREATE_FORM_NAME })); + dispatch(reset(PROJECT_CREATE_FORM_NAME)); dispatch(loadGroupsPanel()); dispatch(snackbarActions.OPEN_SNACKBAR({ message: `${newGroup.name} group has been created`, @@ -92,7 +122,7 @@ export const createGroup = ({ name, users = [] }: CreateGroupFormData) => } catch (e) { const error = getCommonResourceServiceError(e); if (error === CommonResourceServiceError.UNIQUE_NAME_VIOLATION) { - dispatch(stopSubmit(CREATE_GROUP_FORM, { name: 'Group with the same name already exists.' } as FormErrors)); + dispatch(stopSubmit(PROJECT_CREATE_FORM_NAME, { name: 'Group with the same name already exists.' } as FormErrors)); } return; } @@ -113,8 +143,8 @@ interface AddGroupMemberArgs { */ export const addGroupMember = async ({ user, group, ...args }: AddGroupMemberArgs) => { await createPermission({ - head: { ...user }, - tail: { ...group }, + head: { ...group }, + tail: { ...user }, permissionLevel: PermissionLevel.CAN_READ, ...args, }); @@ -144,33 +174,29 @@ const createPermission = async ({ head, tail, permissionLevel, dispatch, permiss }; interface DeleteGroupMemberArgs { - user: { uuid: string, name: string }; - group: { uuid: string, name: string }; + link: { uuid: string }; dispatch: Dispatch; permissionService: PermissionService; } -export const deleteGroupMember = async ({ user, group, ...args }: DeleteGroupMemberArgs) => { +export const deleteGroupMember = async ({ link, ...args }: DeleteGroupMemberArgs) => { await deletePermission({ - tail: group, - head: user, + uuid: link.uuid, ...args, }); }; interface DeletePermissionLinkArgs { - head: { uuid: string, name: string }; - tail: { uuid: string, name: string }; + uuid: string; dispatch: Dispatch; permissionService: PermissionService; } -export const deletePermission = async ({ head, tail, dispatch, permissionService }: DeletePermissionLinkArgs) => { +export const deletePermission = async ({ uuid, dispatch, permissionService }: DeletePermissionLinkArgs) => { try { const permissionsResponse = await permissionService.list({ filters: new FilterBuilder() - .addEqual('tail_uuid', tail.uuid) - .addEqual('head_uuid', head.uuid) + .addEqual('uuid', uuid) .getFilters() }); const [permission] = permissionsResponse.items; @@ -181,8 +207,8 @@ export const deletePermission = async ({ head, tail, dispatch, permissionService } } catch (e) { dispatch(snackbarActions.OPEN_SNACKBAR({ - message: `Could not delete ${tail.name} -> ${head.name} relation`, + message: `Could not delete ${uuid} permission`, kind: SnackbarKind.ERROR, })); } -}; \ No newline at end of file +};