From 4aed44146bf8de69d6b0809c77b6e110d2409712 Mon Sep 17 00:00:00 2001 From: mhsdesign <85400359+mhsdesign@users.noreply.github.com> Date: Tue, 17 Dec 2024 10:03:21 +0100 Subject: [PATCH] TASK: Revert WIP workspace role assigment Ui (sorry robert :D - well work on this in a another pr - by reverting this change ^^) reverts all actions: - editWorkspaceRoleAssignmentsAction - createWorkspaceRoleAssignmentAction - addWorkspaceRoleAssignmentAction - confirmDeleteWorkspaceRoleAssignmentAction - deleteWorkspaceRoleAssignmentAction --- .../Controller/WorkspaceController.php | 188 +----------------- ...mDeleteWorkspaceRoleAssignmentFormData.php | 31 --- .../CreateWorkspaceRoleAssignmentFormData.php | 59 ------ .../EditWorkspaceRoleAssignmentsFormData.php | 41 ---- .../ViewModel/RoleAssignmentListItem.php | 39 ---- ...nfirmDeleteWorkspaceRoleAssignments.fusion | 13 -- .../CreateWorkspaceRoleAssignment.fusion | 15 -- .../Features/Workspace/Actions/Edit.fusion | 6 - .../EditWorkspaceRoleAssignments.fusion | 19 -- .../WorkspaceRoleAssignmentTableRow.fusion | 51 ----- .../Components/WorkspaceTableRow.fusion | 17 -- ...onfirmDeleteWorkspaceRoleAssignment.fusion | 56 ------ .../CreateWorkspaceRoleAssignment.fusion | 122 ------------ .../EditWorkspaceRoleAssignments.fusion | 76 ------- .../Private/Translations/en/Main.xlf | 30 --- 15 files changed, 1 insertion(+), 762 deletions(-) delete mode 100644 Neos.Workspace.Ui/Classes/ViewModel/ConfirmDeleteWorkspaceRoleAssignmentFormData.php delete mode 100644 Neos.Workspace.Ui/Classes/ViewModel/CreateWorkspaceRoleAssignmentFormData.php delete mode 100644 Neos.Workspace.Ui/Classes/ViewModel/EditWorkspaceRoleAssignmentsFormData.php delete mode 100644 Neos.Workspace.Ui/Classes/ViewModel/RoleAssignmentListItem.php delete mode 100644 Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Actions/ConfirmDeleteWorkspaceRoleAssignments.fusion delete mode 100644 Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Actions/CreateWorkspaceRoleAssignment.fusion delete mode 100644 Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Actions/EditWorkspaceRoleAssignments.fusion delete mode 100644 Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Components/WorkspaceRoleAssignmentTableRow.fusion delete mode 100644 Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Modals/ConfirmDeleteWorkspaceRoleAssignment.fusion delete mode 100644 Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Modals/CreateWorkspaceRoleAssignment.fusion delete mode 100644 Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Modals/EditWorkspaceRoleAssignments.fusion diff --git a/Neos.Workspace.Ui/Classes/Controller/WorkspaceController.php b/Neos.Workspace.Ui/Classes/Controller/WorkspaceController.php index 5a99b6a60d8..e588ba20600 100644 --- a/Neos.Workspace.Ui/Classes/Controller/WorkspaceController.php +++ b/Neos.Workspace.Ui/Classes/Controller/WorkspaceController.php @@ -50,14 +50,9 @@ use Neos\Media\Domain\Model\ImageInterface; use Neos\Neos\Controller\Module\AbstractModuleController; use Neos\Neos\Domain\Model\User; -use Neos\Neos\Domain\Model\UserId; use Neos\Neos\Domain\Model\WorkspaceClassification; use Neos\Neos\Domain\Model\WorkspaceDescription; -use Neos\Neos\Domain\Model\WorkspaceRole; -use Neos\Neos\Domain\Model\WorkspaceRoleAssignment; use Neos\Neos\Domain\Model\WorkspaceRoleAssignments; -use Neos\Neos\Domain\Model\WorkspaceRoleSubject; -use Neos\Neos\Domain\Model\WorkspaceRoleSubjectType; use Neos\Neos\Domain\Model\WorkspaceTitle; use Neos\Neos\Domain\NodeLabel\NodeLabelGeneratorInterface; use Neos\Neos\Domain\Repository\SiteRepository; @@ -72,7 +67,6 @@ use Neos\Neos\Security\Authorization\ContentRepositoryAuthorizationService; use Neos\Neos\Utility\NodeTypeWithFallbackProvider; use Neos\Workspace\Ui\ViewModel\ChangeItem; -use Neos\Workspace\Ui\ViewModel\ConfirmDeleteWorkspaceRoleAssignmentFormData; use Neos\Workspace\Ui\ViewModel\ContentChangeItem; use Neos\Workspace\Ui\ViewModel\ContentChangeItems; use Neos\Workspace\Ui\ViewModel\ContentChangeProperties; @@ -81,13 +75,10 @@ use Neos\Workspace\Ui\ViewModel\ContentChanges\ImageContentChange; use Neos\Workspace\Ui\ViewModel\ContentChanges\TagContentChange; use Neos\Workspace\Ui\ViewModel\ContentChanges\TextContentChange; -use Neos\Workspace\Ui\ViewModel\CreateWorkspaceRoleAssignmentFormData; use Neos\Workspace\Ui\ViewModel\DocumentChangeItem; use Neos\Workspace\Ui\ViewModel\DocumentItem; use Neos\Workspace\Ui\ViewModel\EditWorkspaceFormData; -use Neos\Workspace\Ui\ViewModel\EditWorkspaceRoleAssignmentsFormData; use Neos\Workspace\Ui\ViewModel\PendingChanges; -use Neos\Workspace\Ui\ViewModel\RoleAssignmentListItem; use Neos\Workspace\Ui\ViewModel\WorkspaceListItem; use Neos\Workspace\Ui\ViewModel\WorkspaceListItems; @@ -485,156 +476,6 @@ public function deleteAction(WorkspaceName $workspaceName): void } } - - public function editWorkspaceRoleAssignmentsAction(WorkspaceName $workspaceName): void - { - $contentRepositoryId = SiteDetectionResult::fromRequest($this->request->getHttpRequest())->contentRepositoryId; - $workspaceMetadata = $this->workspaceService->getWorkspaceMetadata($contentRepositoryId, $workspaceName); - - // TODO: Render a form to edit role assignments - // TODO can current user see/edit role assignments? - $roleAssignmentsVisible = true; - $roleAssignmentsEditable = true; - - /** @var array $workspaceRoleAssignments */ - $workspaceRoleAssignments = []; - - foreach ($this->workspaceService->getWorkspaceRoleAssignments($contentRepositoryId, $workspaceName) as $workspaceRoleAssignment) { - $subjectLabel = match ($workspaceRoleAssignment->subject->type) { - WorkspaceRoleSubjectType::USER => $this->userService->findUserById(UserId::fromString($workspaceRoleAssignment->subject->value))?->getLabel() ?? $workspaceRoleAssignment->subject->value, - WorkspaceRoleSubjectType::GROUP => $workspaceRoleAssignment->subject->value, - }; - - $roleLabel = $workspaceRoleAssignment->role->value; - - $workspaceRoleAssignments[] = new RoleAssignmentListItem( - subjectValue: $workspaceRoleAssignment->subject->value, - subjectLabel: $subjectLabel, - subjectTypeValue: $workspaceRoleAssignment->subject->type->value, - roleLabel: $roleLabel, - subjectType: $workspaceRoleAssignment->subject->type->value, - ); - } - - - - $editWorkspaceRoleAssignmentsFormData = new EditWorkspaceRoleAssignmentsFormData( - workspaceName: $workspaceName, - workspaceTitle: $workspaceMetadata->title, - roleAssignmentsEditable: $roleAssignmentsEditable, - roleAssignments: $workspaceRoleAssignments, - ); - - $this->view->assign('editWorkspaceRoleAssignmentsFormData', $editWorkspaceRoleAssignmentsFormData); - } - - public function createWorkspaceRoleAssignmentAction(WorkspaceName $workspaceName): void - { - $contentRepositoryId = SiteDetectionResult::fromRequest($this->request->getHttpRequest())->contentRepositoryId; - $workspaceMetadata = $this->workspaceService->getWorkspaceMetadata($contentRepositoryId, $workspaceName); - - $userOptions = []; - foreach ($this->userService->getUsers()->toArray() as $user) { - $userOptions[$user->getId()->value] = $user->getLabel(); - } - - $rolesInSystem = $this->policyService->getRoles(); - $groupOptions = []; - foreach ($rolesInSystem as $role) { - $groupOptions[$role->getIdentifier()] = $role->getLabel(); - } - - $workspaceRoleSubjectTypes = WorkspaceRoleSubjectType::cases(); - /** @var array $subjectTypeOptions where key is the Id and value is the translated label of the SubjectType */ - $subjectTypeOptions = []; - foreach ($workspaceRoleSubjectTypes as $workspaceRoleSubjectType) { - $subjectTypeOptions[$workspaceRoleSubjectType->value] = $this->getModuleLabel("workspaces.workspace.workspaceRoleAssignment.subjectType.label.$workspaceRoleSubjectType->value"); - } - - $workspaceRoles = WorkspaceRole::cases(); - /** @var array $roleOptions where key is the Id and value is the translated label of the Role */ - $roleOptions = []; - foreach ($workspaceRoles as $workspaceRole) { - $roleOptions[$workspaceRole->value] = $this->getModuleLabel("workspaces.workspace.workspaceRoleAssignment.role.label.$workspaceRole->value"); - } - - $this->view->assign('createWorkspaceRoleAssignmentFormData', new CreateWorkspaceRoleAssignmentFormData( - workspaceName: $workspaceName, - workspaceTitle: $workspaceMetadata->title, - userOptions: $userOptions, - groupOptions: $groupOptions, - subjectTypeOptions: $subjectTypeOptions, - roleOptions: $roleOptions, - )); - } - - public function addWorkspaceRoleAssignmentAction( - WorkspaceName $workspaceName, - string $subjectValue, - string $subjectTypeValue, - string $roleValue, - ): void - { - // TODO: Validate if user can add role assignment to workspace - - $subjectType = WorkspaceRoleSubjectType::from($subjectTypeValue); - $subject = WorkspaceRoleSubject::create($subjectType, $subjectValue); - $role = WorkspaceRole::from($roleValue); - - if ($subjectType === WorkspaceRoleSubjectType::USER) { - $this->addUserRoleAssignment($workspaceName, $subject, $role); - } elseif ($subjectType === WorkspaceRoleSubjectType::GROUP) { - $this->addGroupRoleAssignment($workspaceName, $subject, $role); - } else { - $this->addFlashMessage( - $this->getModuleLabel('workspaces.roleAssignmentCouldNotBeAdded'), - '', - Message::SEVERITY_ERROR - ); - $this->throwStatus(400, 'Invalid subject type'); - } - } - - public function confirmDeleteWorkspaceRoleAssignmentAction(WorkspaceName $workspaceName, string $subjectValue, string $subjectType): void - { - $contentRepositoryId = SiteDetectionResult::fromRequest($this->request->getHttpRequest())->contentRepositoryId; - $workspaceMetadata = $this->workspaceService->getWorkspaceMetadata($contentRepositoryId, $workspaceName); - - $confirmDeleteWorkspaceRoleAssignmentFormData = new ConfirmDeleteWorkspaceRoleAssignmentFormData( - workspaceName: $workspaceName, - workspaceTitle: $workspaceMetadata->title, - subjectValue: $subjectValue, - subjectType: $subjectType, - ); - - $this->view->assign('confirmDeleteWorkspaceRoleAssignmentFormData', $confirmDeleteWorkspaceRoleAssignmentFormData); - } - - public function deleteWorkspaceRoleAssignmentAction(WorkspaceName $workspaceName, string $subjectValue, string $subjectType): void - { - $contentRepositoryId = SiteDetectionResult::fromRequest($this->request->getHttpRequest())->contentRepositoryId; - try { - $this->workspaceService->unassignWorkspaceRole( - $contentRepositoryId, - $workspaceName, - WorkspaceRoleSubject::create( - WorkspaceRoleSubjectType::from($subjectType), - $subjectValue - ) - ); - } catch (\Exception $e) { - // TODO: error handling - $this->addFlashMessage( - $this->getModuleLabel('workspaces.roleAssignmentCouldNotBeDeleted'), - '', - Message::SEVERITY_ERROR - ); - $this->throwStatus(500, 'Role assignment could not be deleted'); - } - - $this->redirect('editWorkspaceRoleAssignments', null, null, ['workspaceName' => $workspaceName->value]); - } - /** * Rebase the current users personal workspace onto the given $targetWorkspace and then * redirects to the $targetNode in the content module. @@ -1519,38 +1360,11 @@ protected function getWorkspaceListItems( } return WorkspaceListItems::fromArray($workspaceListItems); } + protected function getChangesFromWorkspace(Workspace $selectedWorkspace,ContentRepository $contentRepository ): Changes{ return $contentRepository->projectionState(ChangeFinder::class) ->findByContentStreamId( $selectedWorkspace->currentContentStreamId ); } - - private function addUserRoleAssignment(WorkspaceName $workspaceName, WorkspaceRoleSubject $subject, WorkspaceRole $role): void - { - if ($this->userService->findUserById(UserId::fromString($subject->value)) === null) { - $this->addFlashMessage( - $this->getModuleLabel('workspaces.roleAssignmentCouldNotBeAdded'), - '', - Message::SEVERITY_ERROR - ); - $this->throwStatus(400, 'Invalid user'); - } - - $this->workspaceService->assignWorkspaceRole( - SiteDetectionResult::fromRequest($this->request->getHttpRequest())->contentRepositoryId, - $workspaceName, - WorkspaceRoleAssignment::createForUser(UserId::fromString($subject->value), $role) - ); - } - - private function addGroupRoleAssignment(WorkspaceName $workspaceName, WorkspaceRoleSubject $subject, WorkspaceRole $role): void - { - // TODO check if group exists? - $this->workspaceService->assignWorkspaceRole( - SiteDetectionResult::fromRequest($this->request->getHttpRequest())->contentRepositoryId, - $workspaceName, - WorkspaceRoleAssignment::createForGroup($subject->value, $role) - ); - } } diff --git a/Neos.Workspace.Ui/Classes/ViewModel/ConfirmDeleteWorkspaceRoleAssignmentFormData.php b/Neos.Workspace.Ui/Classes/ViewModel/ConfirmDeleteWorkspaceRoleAssignmentFormData.php deleted file mode 100644 index 96dd037be88..00000000000 --- a/Neos.Workspace.Ui/Classes/ViewModel/ConfirmDeleteWorkspaceRoleAssignmentFormData.php +++ /dev/null @@ -1,31 +0,0 @@ - - */ - public array $userOptions, - /** - * Options for the workspaceManager selector where the value is the group. - * @var array - */ - public array $groupOptions, - /** - * TODO: translate subject type labels? - * Options for the workspaceManager selector where the key is the subject type and the value is the subject label. - * @var array - */ - public array $subjectTypeOptions, - /** - * TODO: translate role labels? - * Options for the workspaceManager selector where the key is the role identifier and the value is the role label. - * @var array - */ - public array $roleOptions - ) - { - } -} diff --git a/Neos.Workspace.Ui/Classes/ViewModel/EditWorkspaceRoleAssignmentsFormData.php b/Neos.Workspace.Ui/Classes/ViewModel/EditWorkspaceRoleAssignmentsFormData.php deleted file mode 100644 index 08fab42cdad..00000000000 --- a/Neos.Workspace.Ui/Classes/ViewModel/EditWorkspaceRoleAssignmentsFormData.php +++ /dev/null @@ -1,41 +0,0 @@ - $roleAssignments - */ - public function __construct( - public WorkspaceName $workspaceName, - public WorkspaceTitle $workspaceTitle, - public bool $roleAssignmentsEditable, - public array $roleAssignments, - ) { - } -} diff --git a/Neos.Workspace.Ui/Classes/ViewModel/RoleAssignmentListItem.php b/Neos.Workspace.Ui/Classes/ViewModel/RoleAssignmentListItem.php deleted file mode 100644 index 3d827a94e9e..00000000000 --- a/Neos.Workspace.Ui/Classes/ViewModel/RoleAssignmentListItem.php +++ /dev/null @@ -1,39 +0,0 @@ - - ` -} diff --git a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Actions/CreateWorkspaceRoleAssignment.fusion b/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Actions/CreateWorkspaceRoleAssignment.fusion deleted file mode 100644 index 8bac8dde26b..00000000000 --- a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Actions/CreateWorkspaceRoleAssignment.fusion +++ /dev/null @@ -1,15 +0,0 @@ -Neos.Workspace.Ui.WorkspaceController.createWorkspaceRoleAssignment = Neos.Fusion:Component { - createWorkspaceRoleAssignmentFormData = ${createWorkspaceRoleAssignmentFormData} - - renderer = afx` - - ` -} diff --git a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Actions/Edit.fusion b/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Actions/Edit.fusion index 48bc6012bc0..683392bd0b1 100644 --- a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Actions/Edit.fusion +++ b/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Actions/Edit.fusion @@ -11,12 +11,6 @@ Neos.Workspace.Ui.WorkspaceController.edit = Neos.Fusion:Component { workspaceHasChanges={props.editWorkspaceFormData.workspaceHasChanges} baseWorkspaceOptions={props.editWorkspaceFormData.baseWorkspaceOptions} - - roleAssignmentsVisible={props.editWorkspaceFormData.roleAssignmentsVisible} - roleAssignmentsEditable={props.editWorkspaceFormData.roleAssignmentsEditable} - roleAssignments={props.editWorkspaceFormData.roleAssignments} - roleAssignmentUserOptions={props.editWorkspaceFormData.roleAssignmentUserOptions} - roleAssignmentGroupOptions={props.editWorkspaceFormData.roleAssignmentGroupOptions} /> ` } diff --git a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Actions/EditWorkspaceRoleAssignments.fusion b/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Actions/EditWorkspaceRoleAssignments.fusion deleted file mode 100644 index 4c42008960b..00000000000 --- a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Actions/EditWorkspaceRoleAssignments.fusion +++ /dev/null @@ -1,19 +0,0 @@ -Neos.Workspace.Ui.WorkspaceController.editWorkspaceRoleAssignments = Neos.Fusion:Component { - /// \Neos\Workspace\Ui\ViewModel\EditWorkspaceRoleAssignmentsFormData - editWorkspaceRoleAssignmentsFormData = ${editWorkspaceRoleAssignmentsFormData} - - renderer = afx` - - ` -} diff --git a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Components/WorkspaceRoleAssignmentTableRow.fusion b/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Components/WorkspaceRoleAssignmentTableRow.fusion deleted file mode 100644 index 20c9db19bce..00000000000 --- a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Components/WorkspaceRoleAssignmentTableRow.fusion +++ /dev/null @@ -1,51 +0,0 @@ -## -# Renders a single WorkspaceRoleAssignment list item -# -prototype(Neos.Workspace.Ui:Component.WorkspaceRoleAssignmentTableRow) < prototype(Neos.Fusion:Component) { - /// string - workspaceName = null - /// bool - roleAssignmentsEditable = false - /// Neos\Workspace\Ui\ViewModel\RoleAssignmentListItem - roleAssignmentFormData = null - - @private { - i18n = ${I18n.id('').source('Main').package('Neos.Workspace.Ui')} - confirmDeleteWorkspaceRoleAssignmentPopoverId = 'confirm-delete-workspace-role-assignment-popover' - confirmDeleteWorkspaceRoleAssignmentUri = Neos.Fusion:ActionUri { - action = 'confirmDeleteWorkspaceRoleAssignment' - format = 'htmx' - arguments { - workspaceName = ${props.workspaceName} - subjectValue = ${props.roleAssignmentFormData.subjectValue} - subjectType = ${props.roleAssignmentFormData.subjectType} - } - } - } - - renderer = afx` - - - - - {props.roleAssignmentFormData.subjectLabel} - {props.roleAssignmentFormData.roleLabel} - - - - - ` -} diff --git a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Components/WorkspaceTableRow.fusion b/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Components/WorkspaceTableRow.fusion index 994d7c6d059..991193f7718 100644 --- a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Components/WorkspaceTableRow.fusion +++ b/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Components/WorkspaceTableRow.fusion @@ -67,13 +67,6 @@ prototype(Neos.Workspace.Ui:Component.WorkspaceTableRow) < prototype(Neos.Fusion workspaceName = ${props.workspaceListItem.name} } } - editWorkspaceRoleAssignmentsUri = Neos.Fusion:ActionUri { - action = 'editWorkspaceRoleAssignments' - format = 'htmx' - arguments { - workspaceName = ${props.workspaceListItem.name} - } - } deleteWorkspaceUri = Neos.Fusion:ActionUri { action = 'delete' format = 'htmx' @@ -83,7 +76,6 @@ prototype(Neos.Workspace.Ui:Component.WorkspaceTableRow) < prototype(Neos.Fusion } deleteWorkspacePopoverId = 'workspace-delete-modal' editWorkspacePopoverId = 'workspace-edit-modal' - editWorkspaceRoleAssignmentsPopoverId = 'workspace-edit-role-assignments-modal' } renderer = afx` @@ -145,15 +137,6 @@ prototype(Neos.Workspace.Ui:Component.WorkspaceTableRow) < prototype(Neos.Fusion attributes.hx-on--after-request={'document.getElementById("' + private.editWorkspacePopoverId + '").showPopover()'} attributes.disabled={props.workspaceListItem.permissions.manage == false} /> - -
- -
- {private.i18n.id('workspaces.createWorkspaceRoleAssignment').arguments([props.workspaceTitle])} -
-
-
- - -
- - ` -} diff --git a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Modals/CreateWorkspaceRoleAssignment.fusion b/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Modals/CreateWorkspaceRoleAssignment.fusion deleted file mode 100644 index 40457d95bc0..00000000000 --- a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Modals/CreateWorkspaceRoleAssignment.fusion +++ /dev/null @@ -1,122 +0,0 @@ -prototype(Neos.Workspace.Ui:Component.Modal.CreateWorkspaceRoleAssignment) < prototype(Neos.Fusion:Component) { - workspaceName='' - workspaceTitle='' - - userOptions=${[]} - groupOptions=${[]} - subjectTypeOptions=${[]} - roleOptions=${[]} - - @private { - i18n = ${I18n.id('').source('Main').package('Neos.Workspace.Ui')} - popoverId = 'create-workspace-role-assignment-popover' - - // Default SubjectType is USER. - defaultSubjectType = 'USER' - } - - prototype(Neos.Fusion.Form:LabelRenderer) { - translationPackage = 'Neos.Workspace.Ui' - translationSource = 'Main' - } - - prototype(Neos.Fusion.Form:Neos.BackendModule.FieldContainer) { - translation.label { - package = 'Neos.Workspace.Ui' - source = 'Main' - } - } - - // TODO: hide/show user/group select based on subjectType - - renderer = afx` -
-
- -
- {private.i18n.id('workspaces.createWorkspaceRoleAssignment').arguments([props.workspaceTitle])} -
-
-
- -
- - - - - {subjectTypeTitle} - - - - - - - - - - - {userName} - - - - - - - - - - {roleName} - - - - -
-
- -
- -
-
- ` -} diff --git a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Modals/EditWorkspaceRoleAssignments.fusion b/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Modals/EditWorkspaceRoleAssignments.fusion deleted file mode 100644 index 01623f706d8..00000000000 --- a/Neos.Workspace.Ui/Resources/Private/Fusion/Features/Workspace/Modals/EditWorkspaceRoleAssignments.fusion +++ /dev/null @@ -1,76 +0,0 @@ -prototype(Neos.Workspace.Ui:Component.Modal.EditWorkspaceRoleAssignments) < prototype(Neos.Fusion:Component) { - workspaceName='' - workspaceTitle='' - roleAssignmentsEditable=false - - /// array - roleAssignments=${[]} - - @private { - i18n = ${I18n.id('').source('Main').package('Neos.Workspace.Ui')} - popoverId = 'workspace-edit-role-assignments-modal' - workspaceTableRowId = ${'workspace-row-' + props.workspaceName} - - confirmDeleteWorkspaceRoleAssignmentPopoverId = 'confirm-delete-workspace-role-assignment-popover' - createWorkspaceRoleAssignmentPopoverId = 'create-workspace-role-assignment-popover' - createWorkspaceRoleAssignmentUri = Neos.Fusion:ActionUri { - action = 'createWorkspaceRoleAssignment' - format = 'htmx' - arguments { - workspaceName = ${props.workspaceName} - } - } - } - - renderer = afx` -
-
- -
- {private.i18n.id('workspaces.editWorkspaceRoleAssignments').arguments([props.workspaceTitle])} -
-
-
- - - - - - - - - - - - - - -
{private.i18n.id('workspaces.workspace.workspaceRoleAssignment.subjectType')}{private.i18n.id('workspaces.workspace.workspaceRoleAssignment.subject')}{private.i18n.id('workspaces.workspace.workspaceRoleAssignment.role')} - {private.i18n.id('workspaces.workspace.workspaceRoleAssignment.actions')} -
- -
-
-
-
- ` -} diff --git a/Neos.Workspace.Ui/Resources/Private/Translations/en/Main.xlf b/Neos.Workspace.Ui/Resources/Private/Translations/en/Main.xlf index 0b22c16873a..d114888b4d5 100644 --- a/Neos.Workspace.Ui/Resources/Private/Translations/en/Main.xlf +++ b/Neos.Workspace.Ui/Resources/Private/Translations/en/Main.xlf @@ -51,12 +51,6 @@ Edit workspace "{0}" - - Edit workspace permissions of "{0}" - - - Create Role Assignment for workspace "{0}" - Personal workspace @@ -99,30 +93,6 @@ Workspace "{0}" does not exist - - Type - - - Group - - - User - - - Name - - - Role - - - Manager - - - Collaborator - - - Actions - {0} node was added