From bdae12c5afac2e8e084f80ae6538ff48ff58bacf Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 27 Sep 2023 16:36:37 +0200 Subject: [PATCH] change user group actions to use entity actions --- .../user-groups/entity-actions/manifests.ts | 22 +++++++++ .../src/packages/users/user-groups/index.ts | 2 + .../packages/users/user-groups/manifests.ts | 2 + .../user-group-workspace-editor.element.ts | 48 +++---------------- 4 files changed, 32 insertions(+), 42 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/users/user-groups/entity-actions/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/entity-actions/manifests.ts new file mode 100644 index 0000000000..0c67c05e58 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/entity-actions/manifests.ts @@ -0,0 +1,22 @@ +import { USER_GROUP_REPOSITORY_ALIAS } from '../repository/manifests.js'; +import { UMB_USER_GROUP_ENTITY_TYPE } from '../index.js'; +import { UmbDeleteEntityAction } from '@umbraco-cms/backoffice/entity-action'; +import { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; + +const entityActions: Array = [ + { + type: 'entityAction', + alias: 'Umb.EntityAction.UserGroup.Delete', + name: 'Delete User Group Entity Action', + weight: 900, + meta: { + icon: 'umb:trash', + label: 'Delete...', + repositoryAlias: USER_GROUP_REPOSITORY_ALIAS, + api: UmbDeleteEntityAction, + entityTypes: [UMB_USER_GROUP_ENTITY_TYPE], + }, + }, +]; + +export const manifests = [...entityActions]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/index.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/index.ts index a63600bee5..81c17a6f51 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/index.ts @@ -1,2 +1,4 @@ export * from './types.js'; export * from './components/index.js'; + +export const UMB_USER_GROUP_ENTITY_TYPE = 'user-group'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/manifests.ts index 7772c9b787..5d01d53186 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/manifests.ts @@ -2,6 +2,7 @@ import { manifests as repositoryManifests } from './repository/manifests.js'; import { manifests as workspaceManifests } from './workspace/manifests.js'; import { manifests as modalManifests } from './modals/manifests.js'; import { manifests as sectionViewManifests } from './section-view/manifests.js'; +import { manifests as entityActionManifests } from './entity-actions/manifests.js'; import { manifests as entityBulkActionManifests } from './entity-bulk-actions/manifests.js'; export const manifests = [ @@ -9,5 +10,6 @@ export const manifests = [ ...workspaceManifests, ...modalManifests, ...sectionViewManifests, + ...entityActionManifests, ...entityBulkActionManifests, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace-editor.element.ts index ec044ddde6..27b86b1f40 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace-editor.element.ts @@ -1,13 +1,9 @@ +import { UMB_USER_GROUP_ENTITY_TYPE } from '../index.js'; import { UMB_USER_GROUP_WORKSPACE_CONTEXT } from './user-group-workspace.context.js'; import { UUIInputElement, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { UserGroupResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { - UMB_CONFIRM_MODAL, - UMB_MODAL_MANAGER_CONTEXT_TOKEN, - UmbModalManagerContext, -} from '@umbraco-cms/backoffice/modal'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbInputDocumentElement } from '@umbraco-cms/backoffice/document'; import { UmbInputSectionElement } from '@umbraco-cms/backoffice/components'; @@ -27,7 +23,6 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement { private _userKeys?: Array; #workspaceContext?: typeof UMB_USER_GROUP_WORKSPACE_CONTEXT.TYPE; - #modalContext?: UmbModalManagerContext; constructor() { super(); @@ -37,10 +32,6 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement { this.observe(this.#workspaceContext.data, (userGroup) => (this._userGroup = userGroup)); this.observe(this.#workspaceContext.userIds, (userKeys) => (this._userKeys = userKeys)); }); - - this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => { - this.#modalContext = instance; - }); } #onSectionsChange(event: UmbChangeEvent) { @@ -67,26 +58,6 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement { this.#workspaceContext?.updateUserKeys(target.selectedIds); } - async #onDelete() { - if (!this.#modalContext || !this.#workspaceContext) return; - - const modalContext = this.#modalContext.open(UMB_CONFIRM_MODAL, { - color: 'danger', - headline: `Delete user group ${this._userGroup?.name}?`, - content: html`Are you sure you want to delete ${this._userGroup?.name} user group?`, - confirmLabel: 'Delete', - }); - - await modalContext.onSubmit(); - - if (!this._userGroup || !this._userGroup.id) return; - - await this.#workspaceContext.delete(this._userGroup?.id); - //TODO: should we check if it actually succeeded in deleting the user group? - - history.pushState(null, '', 'section/users/view/user-groups'); - } - #onNameChange(event: UUIInputEvent) { if (event instanceof UUIInputEvent) { const target = event.composedPath()[0] as UUIInputElement; @@ -175,18 +146,11 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
- -
- - -
- - `; + + `; } static styles = [