@umbraco-cms/backoffice 18.0.2 → 18.1.0-rc

package/dist-cms/packages/elements/publishing/unpublish/entity-bulk-action/unpublish.bulk-action.js

@@ -1,7 +1,7 @@
-import { UmbUnpublishElementEntityAction } from '../entity-action/index.js';
+import { UmbElementUnpublishManifestEntityActionMeta } from '../entity-action/constants.js';
 import { UMB_ELEMENT_ENTITY_TYPE } from '../../../entity.js';
-import { UMB_ELEMENT_UNPUBLISH_MODAL } from '../modal/constants.js';
 import { UmbElementPublishingRepository } from '../../repository/index.js';
+import { UMB_CONTENT_UNPUBLISH_MODAL, UmbContentUnpublishEntityAction } from '../../../../content/content/index.js';
 import { umbConfirmModal, umbOpenModal } from '../../../../core/modal/index.js';
 import { UmbEntityBulkActionBase } from '../../../../core/entity-bulk-action/index.js';
 import { UMB_APP_LANGUAGE_CONTEXT, UmbLanguageCollectionRepository } from '../../../../language/index.js';
@@ -27,10 +27,10 @@ export class UmbElementUnpublishEntityBulkAction extends UmbEntityBulkActionBase
             throw new Error('Entity unique not found');
         // If there is only one selection, we can refer to the regular unpublish entity action:
         if (this.selection.length === 1) {
-            const action = new UmbUnpublishElementEntityAction(this._host, {
+            const action = new UmbContentUnpublishEntityAction(this._host, {
                 unique: this.selection[0],
                 entityType: UMB_ELEMENT_ENTITY_TYPE,
-                meta: {},
+                meta: UmbElementUnpublishManifestEntityActionMeta,
             });
             await action.execute();
             return;
@@ -103,7 +103,7 @@ export class UmbElementUnpublishEntityBulkAction extends UmbEntityBulkActionBase
         if (appCulture && options.some((o) => o.unique === appCulture)) {
             selection.push(new UmbVariantId(appCulture, null).toString());
         }
-        const result = await umbOpenModal(this, UMB_ELEMENT_UNPUBLISH_MODAL, {
+        const result = await umbOpenModal(this, UMB_CONTENT_UNPUBLISH_MODAL, {
             data: {
                 options,
             },

package/dist-cms/packages/elements/publishing/unpublish/index.d.ts

@@ -0,0 +1 @@
+export * from './entity-action/index.js';

package/dist-cms/packages/elements/publishing/unpublish/index.js

@@ -0,0 +1 @@
+export * from './entity-action/index.js';

package/dist-cms/packages/elements/publishing/unpublish/modal/element-unpublish-modal.element.d.ts

@@ -9,9 +9,11 @@ import '../../../modals/shared/element-variant-language-picker.element.js';
  * @returns {boolean} boolean
  */
 export declare function isPublished(option: UmbElementVariantOptionModel): boolean;
+/** @deprecated Use `umb-content-unpublish-modal` from `@umbraco-cms/backoffice/content` instead. Scheduled for removal in Umbraco 20. */
 export declare class UmbElementUnpublishModalElement extends UmbModalBaseElement<UmbElementUnpublishModalData, UmbElementUnpublishModalValue> {
     #private;
     protected readonly _selectionManager: UmbSelectionManager<string>;
+    constructor();
     private _options;
     private _selection;
     private _hasInvalidSelection;

package/dist-cms/packages/elements/publishing/unpublish/modal/element-unpublish-modal.element.js

@@ -8,7 +8,7 @@ import { UmbElementVariantState } from '../../../variant-state.js';
 import { css, customElement, html, state, when } from '../../../../../external/lit/index.js';
 import { UmbModalBaseElement } from '../../../../core/modal/index.js';
 import { UmbTextStyles } from '../../../../core/style/index.js';
-import { UmbSelectionManager } from '../../../../core/utils/index.js';
+import { UmbDeprecation, UmbSelectionManager } from '../../../../core/utils/index.js';
 import '../../../modals/shared/element-variant-language-picker.element.js';
 /**
  * @function isPublished
@@ -19,9 +19,10 @@ export function isPublished(option) {
     return (option.variant?.state === UmbElementVariantState.PUBLISHED ||
         option.variant?.state === UmbElementVariantState.PUBLISHED_PENDING_CHANGES);
 }
+/** @deprecated Use `umb-content-unpublish-modal` from `@umbraco-cms/backoffice/content` instead. Scheduled for removal in Umbraco 20. */
 let UmbElementUnpublishModalElement = class UmbElementUnpublishModalElement extends UmbModalBaseElement {
     constructor() {
-        super(...arguments);
+        super();
         this._selectionManager = new UmbSelectionManager(this);
         this._options = [];
         this._selection = [];
@@ -36,6 +37,11 @@ let UmbElementUnpublishModalElement = class UmbElementUnpublishModalElement exte
         this._requiredFilter = (variantOption) => {
             return variantOption.language.isMandatory && !this._selection.includes(variantOption.unique);
         };
+        new UmbDeprecation({
+            deprecated: 'UmbElementUnpublishModalElement is deprecated.',
+            removeInVersion: '20.0.0',
+            solution: 'Use umb-content-unpublish-modal from @umbraco-cms/backoffice/content instead.',
+        }).warn();
     }
     #pickableFilter;
     firstUpdated() {

package/dist-cms/packages/elements/publishing/unpublish/modal/element-unpublish-modal.token.d.ts

@@ -1,8 +1,12 @@
 import type { UmbElementVariantPickerData, UmbElementVariantPickerValue } from '../../../modals/types.js';
 import { UmbModalToken } from '../../../../core/modal/index.js';
+/** @deprecated No longer used internally. Use `UMB_CONTENT_UNPUBLISH_MODAL_ALIAS` from `@umbraco-cms/backoffice/content` instead. Scheduled for removal in Umbraco 20. */
 export declare const UMB_ELEMENT_UNPUBLISH_MODAL_ALIAS = "Umb.Modal.ElementUnpublish";
+/** @deprecated Use `UmbContentUnpublishModalData` from `@umbraco-cms/backoffice/content` instead. Scheduled for removal in Umbraco 20. */
 export interface UmbElementUnpublishModalData extends UmbElementVariantPickerData {
 }
+/** @deprecated Use `UmbContentUnpublishModalValue` from `@umbraco-cms/backoffice/content` instead. Scheduled for removal in Umbraco 20. */
 export interface UmbElementUnpublishModalValue extends UmbElementVariantPickerValue {
 }
+/** @deprecated No longer used internally. Use `UMB_CONTENT_UNPUBLISH_MODAL` from `@umbraco-cms/backoffice/content` instead. Scheduled for removal in Umbraco 20. */
 export declare const UMB_ELEMENT_UNPUBLISH_MODAL: UmbModalToken<UmbElementUnpublishModalData, UmbElementUnpublishModalValue>;

package/dist-cms/packages/elements/publishing/unpublish/modal/element-unpublish-modal.token.js

@@ -1,5 +1,7 @@
 import { UmbModalToken } from '../../../../core/modal/index.js';
+/** @deprecated No longer used internally. Use `UMB_CONTENT_UNPUBLISH_MODAL_ALIAS` from `@umbraco-cms/backoffice/content` instead. Scheduled for removal in Umbraco 20. */
 export const UMB_ELEMENT_UNPUBLISH_MODAL_ALIAS = 'Umb.Modal.ElementUnpublish';
+/** @deprecated No longer used internally. Use `UMB_CONTENT_UNPUBLISH_MODAL` from `@umbraco-cms/backoffice/content` instead. Scheduled for removal in Umbraco 20. */
 export const UMB_ELEMENT_UNPUBLISH_MODAL = new UmbModalToken(UMB_ELEMENT_UNPUBLISH_MODAL_ALIAS, {
     modal: {
         type: 'dialog',

package/dist-cms/packages/elements/publishing/workspace-context/element-publishing.workspace-context.js

@@ -2,8 +2,7 @@ import { UMB_ELEMENT_WORKSPACE_CONTEXT } from '../../workspace/element-workspace
 import { UmbElementVariantState } from '../../variant-state.js';
 import { UmbElementPublishingRepository } from '../repository/index.js';
 import { UmbElementPublishedPendingChangesManager } from '../pending-changes/index.js';
-import { UMB_ELEMENT_PUBLISH_MODAL } from '../publish/constants.js';
-import { UMB_ELEMENT_UNPUBLISH_MODAL } from '../unpublish/constants.js';
+import { UmbElementUnpublishManifestEntityActionMeta } from '../unpublish/entity-action/constants.js';
 import { UMB_ELEMENT_SCHEDULE_MODAL } from '../schedule-publish/constants.js';
 import { UMB_ELEMENT_ENTITY_TYPE } from '../../entity.js';
 import { UMB_ELEMENT_WORKSPACE_ALIAS } from '../../workspace/constants.js';
@@ -12,6 +11,7 @@ import { UMB_ELEMENT_PUBLISHING_SHORTCUT_UNIQUE } from './constants.js';
 import { firstValueFrom } from '../../../../external/rxjs/index.js';
 import { observeMultiple } from '../../../../libs/observable-api/index.js';
 import { umbOpenModal } from '../../../core/modal/index.js';
+import { UMB_CONTENT_PUBLISH_MODAL, UmbContentUnpublishEntityAction } from '../../../content/content/index.js';
 import { UmbContextBase } from '../../../../libs/class-api/index.js';
 import { UmbLocalizationController } from '../../../../libs/localization-api/index.js';
 import { UmbRequestReloadStructureForEntityEvent } from '../../../core/entity-action/index.js';
@@ -112,46 +112,17 @@ export class UmbElementPublishingWorkspaceContext extends UmbContextBase {
         const entityType = this.#elementWorkspaceContext.getEntityType();
         if (!entityType)
             throw new Error('Entity type is missing');
-        const { options, selected } = await this.#determineVariantOptions();
-        // Filter to only show published variants
-        const publishedOptions = options.filter((option) => option.variant?.state === UmbElementVariantState.PUBLISHED ||
-            option.variant?.state === UmbElementVariantState.PUBLISHED_PENDING_CHANGES);
-        if (publishedOptions.length === 0) {
-            this.#notificationContext?.peek('warning', {
-                data: { message: this.#localize.term('content_itemNotPublished') },
-            });
-            return;
-        }
-        // If invariant (single culture = null), unpublish directly without modal
-        if (publishedOptions.length === 1 && publishedOptions[0].culture === null) {
-            const variantIds = [UmbVariantId.CreateInvariant()];
-            await this.#performUnpublish(unique, entityType, variantIds);
-            return;
-        }
-        const result = await umbOpenModal(this, UMB_ELEMENT_UNPUBLISH_MODAL, {
-            data: {
-                options: publishedOptions,
-                pickableFilter: this.#publishableVariantsFilter,
-            },
-            value: { selection: selected.filter((s) => publishedOptions.some((o) => o.unique === s)) },
-        }).catch(() => undefined);
-        if (!result?.selection.length)
+        const action = new UmbContentUnpublishEntityAction(this, {
+            unique,
+            entityType,
+            meta: UmbElementUnpublishManifestEntityActionMeta,
+        });
+        const didUnpublish = await action.executeWithResult();
+        if (!didUnpublish)
             return;
-        const variantIds = result.selection.map((x) => UmbVariantId.FromString(x));
-        await this.#performUnpublish(unique, entityType, variantIds);
-    }
-    async #performUnpublish(unique, entityType, variantIds) {
-        const { error } = await this.#publishingRepository.unpublish(unique, variantIds);
-        if (!error) {
-            this.#notificationContext?.peek('positive', {
-                data: { message: this.#localize.term('speechBubbles_editElementUnpublishedHeader') },
-            });
-            this.#clear();
-            await this.#elementWorkspaceContext?.reload();
-            await this.#loadAndProcessLastPublished();
-            const event = new UmbRequestReloadStructureForEntityEvent({ unique, entityType });
-            this.#eventContext?.dispatchEvent(event);
-        }
+        // Reload workspace data to reflect the unpublished state
+        await this.#elementWorkspaceContext.reload();
+        await this.#loadAndProcessLastPublished();
     }
     /**
      * Schedule the element for publishing
@@ -199,24 +170,36 @@ export class UmbElementPublishingWorkspaceContext extends UmbContextBase {
         const saveData = await this.#elementWorkspaceContext.constructSaveData(variantIds);
         await this.#elementWorkspaceContext.runMandatoryValidationForSaveData(saveData, variantIds);
         await this.#elementWorkspaceContext.askServerToValidate(saveData, variantIds);
-        return this.#elementWorkspaceContext.validateAndSubmit(async () => {
-            if (!this.#elementWorkspaceContext) {
-                throw new Error('Element workspace context is missing');
+        return this.#elementWorkspaceContext.validateVariantsAndSubmit(variantIds, async () => {
+            try {
+                if (!this.#elementWorkspaceContext) {
+                    throw new Error('Element workspace context is missing');
+                }
+                // Save the element before scheduling
+                await this.#elementWorkspaceContext.performCreateOrUpdate(variantIds, saveData);
+                // Schedule the element
+                const { error } = await this.#publishingRepository.publish(unique, variants);
+                if (error) {
+                    throw error;
+                }
+                const notification = {
+                    data: { message: this.#localize.term('speechBubbles_editContentScheduledSavedText') },
+                };
+                this.#notificationContext?.peek('positive', notification);
+                // reload the element so all states are updated after the schedule operation
+                await this.#elementWorkspaceContext.reload();
+                // request reload of this entity
+                const structureEvent = new UmbRequestReloadStructureForEntityEvent({ entityType, unique });
+                this.#eventContext?.dispatchEvent(structureEvent);
             }
-            // Save the element before scheduling
-            await this.#elementWorkspaceContext.performCreateOrUpdate(variantIds, saveData);
-            // Schedule the element
-            const { error } = await this.#publishingRepository.publish(unique, variants);
-            if (error) {
+            catch (error) {
+                // Notify only on the publish path. The validation-failure path below already
+                // notifies, so a shared top-level .catch would fire a second toast.
+                this.#notificationContext?.peek('danger', {
+                    data: { message: this.#localize.term('speechBubbles_editContentScheduledNotSavedText') },
+                });
                 return Promise.reject(error);
             }
-            const notification = { data: { message: this.#localize.term('speechBubbles_editContentScheduledSavedText') } };
-            this.#notificationContext?.peek('positive', notification);
-            // reload the element so all states are updated after the schedule operation
-            await this.#elementWorkspaceContext.reload();
-            // request reload of this entity
-            const structureEvent = new UmbRequestReloadStructureForEntityEvent({ entityType, unique });
-            this.#eventContext?.dispatchEvent(structureEvent);
         }, async (reason) => {
             this.#notificationContext?.peek('danger', {
                 data: { message: this.#localize.term('speechBubbles_editContentScheduledNotSavedText') },
@@ -261,11 +244,11 @@ export class UmbElementPublishingWorkspaceContext extends UmbContextBase {
         }
         else {
             // If there are multiple variants, we will open the modal to let the user pick which variants to publish.
-            const result = await umbOpenModal(this, UMB_ELEMENT_PUBLISH_MODAL, {
+            const result = await umbOpenModal(this, UMB_CONTENT_PUBLISH_MODAL, {
                 data: {
                     headline: this.#localize.term('content_saveAndPublishModalTitle'),
                     options,
-                    pickableFilter: this.#publishableVariantsFilter,
+                    pickableFilter: (option) => this.#publishableVariantsFilter(option),
                 },
                 value: { selection: selected },
             }).catch(() => undefined);
@@ -278,8 +261,15 @@ export class UmbElementPublishingWorkspaceContext extends UmbContextBase {
         const saveData = await this.#elementWorkspaceContext.constructSaveData(variantIds);
         await this.#elementWorkspaceContext.runMandatoryValidationForSaveData(saveData, variantIds);
         await this.#elementWorkspaceContext.askServerToValidate(saveData, variantIds);
-        return this.#elementWorkspaceContext.validateAndSubmit(async () => {
-            return this.#performSaveAndPublish(variantIds, saveData);
+        return this.#elementWorkspaceContext.validateVariantsAndSubmit(variantIds, () => {
+            // Notify only on the publish path. The validation-failure path below already
+            // notifies, so a shared top-level .catch would fire a second, contradictory toast.
+            return this.#performSaveAndPublish(variantIds, saveData).catch((error) => {
+                this.#notificationContext?.peek('danger', {
+                    data: { message: this.#localize.term('speechBubbles_editElementPublishedFailed') },
+                });
+                return Promise.reject(error);
+            });
         }, async (reason) => {
             // If data of the selection is not valid Then just save:
             await this.#elementWorkspaceContext.performCreateOrUpdate(variantIds, saveData);
@@ -300,23 +290,47 @@ export class UmbElementPublishingWorkspaceContext extends UmbContextBase {
         const entityType = this.#elementWorkspaceContext.getEntityType();
         if (!entityType)
             throw new Error('Entity type is missing');
-        await this.#elementWorkspaceContext.performCreateOrUpdate(variantIds, saveData);
-        const { error } = await this.#publishingRepository.publish(unique, variantIds.map((variantId) => ({ variantId })));
-        if (!error) {
-            this.#notificationContext?.peek('positive', {
-                data: { message: this.#localize.term('speechBubbles_editElementPublishedHeader') },
+        // The publish already succeeded server-side once we reach the read-back; a failed read-back must not be
+        // reported as a publish failure, so we fall back to the submitted data and flag the editor as stale.
+        let reloadAfterPublishFailed = false;
+        const loadAfterPublish = async () => {
+            try {
+                return await this.#elementWorkspaceContext.loadWithoutPersist();
+            }
+            catch {
+                reloadAfterPublishFailed = true;
+                return saveData;
+            }
+        };
+        await this.#elementWorkspaceContext.performCreateOrUpdate(variantIds, saveData, {
+            create: async (data, ids, parent) => {
+                const { error } = await this.#publishingRepository.createAndPublish(data, ids, parent.unique);
+                if (error)
+                    throw new Error('Error creating and publishing element', { cause: error });
+                return loadAfterPublish();
+            },
+            update: async (data, ids) => {
+                const { error } = await this.#publishingRepository.updateAndPublish(data, ids);
+                if (error)
+                    throw new Error('Error updating and publishing element', { cause: error });
+                return loadAfterPublish();
+            },
+        });
+        this.#notificationContext?.peek('positive', {
+            data: {
+                message: this.#localize.term('speechBubbles_editElementPublishedHeader'),
+            },
+        });
+        if (reloadAfterPublishFailed) {
+            this.#notificationContext?.peek('warning', {
+                data: {
+                    message: this.#localize.term('speechBubbles_editElementPublishedReloadFailed'),
+                },
             });
-            // Clear stale published data and pending changes state so the
-            // persistedData observer does not run a comparison against outdated
-            // data during reload, which would briefly show a false-positive
-            // "pending changes" state.
-            this.#clear();
-            // reload the element so all states are updated after the publish operation
-            await this.#elementWorkspaceContext.reload();
-            await this.#loadAndProcessLastPublished();
-            const event = new UmbRequestReloadStructureForEntityEvent({ unique, entityType });
-            this.#eventContext?.dispatchEvent(event);
         }
+        await this.#loadAndProcessLastPublished();
+        const event = new UmbRequestReloadStructureForEntityEvent({ unique, entityType });
+        this.#eventContext?.dispatchEvent(event);
     }
     #publishableVariantsFilter;
     async #determineVariantOptions() {
@@ -386,10 +400,9 @@ export class UmbElementPublishingWorkspaceContext extends UmbContextBase {
         const hasPublishedVariant = this.#hasPublishedVariant();
         if (!hasPublishedVariant)
             return;
-        // TODO: Implement once ElementService.getElementByIdPublished endpoint exists [LK]
-        // const { data } = await this.#publishingRepository.published(unique);
-        // this.#publishedElementData = data;
-        // this.#processPendingChanges();
+        const { data } = await this.#publishingRepository.published(unique);
+        this.#publishedElementData = data;
+        this.#processPendingChanges();
     }
     #processPendingChanges() {
         if (!this.#elementWorkspaceContext)

package/dist-cms/packages/elements/recycle-bin/entity-actions/manifests.js

@@ -12,6 +12,7 @@ const elementActions = [
         kind: 'trashWithRelation',
         alias: 'Umb.EntityAction.Element.RecycleBin.Trash',
         name: 'Trash Element Entity Action',
+        api: () => import('./trash/element-trash-with-relation.action.js'),
         forEntityTypes: [UMB_ELEMENT_ENTITY_TYPE],
         meta: {
             itemDataResolver: UmbElementItemDataResolver,

package/dist-cms/packages/elements/recycle-bin/entity-actions/trash/element-trash-with-relation.action.d.ts

@@ -0,0 +1,5 @@
+import { UmbTrashWithRelationEntityAction } from '../../../../relations/relations/index.js';
+export declare class UmbElementTrashWithRelationEntityAction extends UmbTrashWithRelationEntityAction {
+    protected _confirmTrash(item: any): Promise<void>;
+}
+export { UmbElementTrashWithRelationEntityAction as api };

package/dist-cms/packages/elements/recycle-bin/entity-actions/trash/element-trash-with-relation.action.js

@@ -0,0 +1,19 @@
+import { UmbElementConfigurationRepository } from '../../../configuration/configuration.repository.js';
+import { UMB_TRASH_WITH_RELATION_CONFIRM_MODAL, UmbTrashWithRelationEntityAction, } from '../../../../relations/relations/index.js';
+import { umbOpenModal } from '../../../../core/modal/index.js';
+export class UmbElementTrashWithRelationEntityAction extends UmbTrashWithRelationEntityAction {
+    async _confirmTrash(item) {
+        const { data: config } = await new UmbElementConfigurationRepository(this).requestConfiguration();
+        await umbOpenModal(this, UMB_TRASH_WITH_RELATION_CONFIRM_MODAL, {
+            data: {
+                unique: item.unique,
+                entityType: item.entityType,
+                itemRepositoryAlias: this.args.meta.itemRepositoryAlias,
+                referenceRepositoryAlias: this.args.meta.referenceRepositoryAlias,
+                itemDataResolver: this.args.meta.itemDataResolver,
+                disableDeleteWhenReferenced: config?.disableDeleteWhenReferenced ?? false,
+            },
+        });
+    }
+}
+export { UmbElementTrashWithRelationEntityAction as api };

package/dist-cms/packages/elements/recycle-bin/entity-bulk-actions/manifests.js

@@ -12,6 +12,7 @@ const trash = {
     kind: UMB_ENTITY_BULK_ACTION_TRASH_WITH_RELATION_KIND,
     alias: 'Umb.EntityBulkAction.Element.Trash',
     name: 'Trash Element Entity Bulk Action',
+    api: () => import('./trash/element-bulk-trash-with-relation.action.js'),
     weight: 10,
     forEntityTypes: [UMB_ELEMENT_ENTITY_TYPE],
     meta: {

package/dist-cms/packages/elements/recycle-bin/entity-bulk-actions/trash/element-bulk-trash-with-relation.action.d.ts

@@ -0,0 +1,5 @@
+import { UmbBulkTrashWithRelationEntityAction } from '../../../../relations/relations/index.js';
+export declare class UmbElementBulkTrashWithRelationEntityAction extends UmbBulkTrashWithRelationEntityAction {
+    protected _confirmTrash(): Promise<void>;
+}
+export { UmbElementBulkTrashWithRelationEntityAction as api };

package/dist-cms/packages/elements/recycle-bin/entity-bulk-actions/trash/element-bulk-trash-with-relation.action.js

@@ -0,0 +1,17 @@
+import { UmbElementConfigurationRepository } from '../../../configuration/configuration.repository.js';
+import { UMB_BULK_TRASH_WITH_RELATION_CONFIRM_MODAL, UmbBulkTrashWithRelationEntityAction, } from '../../../../relations/relations/index.js';
+import { umbOpenModal } from '../../../../core/modal/index.js';
+export class UmbElementBulkTrashWithRelationEntityAction extends UmbBulkTrashWithRelationEntityAction {
+    async _confirmTrash() {
+        const { data: config } = await new UmbElementConfigurationRepository(this).requestConfiguration();
+        await umbOpenModal(this, UMB_BULK_TRASH_WITH_RELATION_CONFIRM_MODAL, {
+            data: {
+                uniques: this.selection,
+                itemRepositoryAlias: this.args.meta.itemRepositoryAlias,
+                referenceRepositoryAlias: this.args.meta.referenceRepositoryAlias,
+                disableDeleteWhenReferenced: config?.disableDeleteWhenReferenced ?? false,
+            },
+        });
+    }
+}
+export { UmbElementBulkTrashWithRelationEntityAction as api };

package/dist-cms/packages/elements/recycle-bin/menu/manifests.js

@@ -1,3 +1,5 @@
+import { UMB_ELEMENT_OR_ELEMENT_FOLDER_USER_PERMISSION_CONDITION_ALIAS, UMB_USER_PERMISSION_ELEMENT_READ, } from '../../user-permissions/constants.js';
+import { UMB_USER_PERMISSION_ELEMENT_FOLDER_READ } from '../../folder/user-permissions/constants.js';
 import { UMB_CURRENT_USER_ALLOW_ELEMENT_RECYCLE_BIN_CONDITION_ALIAS } from '../conditions/allow-element-recycle-bin.condition.js';
 import { UMB_ELEMENT_MENU_ALIAS } from '../../menu/constants.js';
 import { UMB_ELEMENT_WORKSPACE_ALIAS } from '../../workspace/constants.js';
@@ -17,7 +19,14 @@ const menuItem = {
         menus: [UMB_ELEMENT_MENU_ALIAS],
         treeAlias: UMB_ELEMENT_RECYCLE_BIN_TREE_ALIAS,
     },
-    conditions: [{ alias: UMB_CURRENT_USER_ALLOW_ELEMENT_RECYCLE_BIN_CONDITION_ALIAS }],
+    conditions: [
+        { alias: UMB_CURRENT_USER_ALLOW_ELEMENT_RECYCLE_BIN_CONDITION_ALIAS },
+        {
+            alias: UMB_ELEMENT_OR_ELEMENT_FOLDER_USER_PERMISSION_CONDITION_ALIAS,
+            element: { allOf: [UMB_USER_PERMISSION_ELEMENT_READ] },
+            folder: { allOf: [UMB_USER_PERMISSION_ELEMENT_FOLDER_READ] },
+        },
+    ],
 };
 const workspaceContext = {
     type: 'workspaceContext',

package/dist-cms/packages/elements/recycle-bin/root/workspace/manifests.js

@@ -1,3 +1,5 @@
+import { UMB_ELEMENT_OR_ELEMENT_FOLDER_USER_PERMISSION_CONDITION_ALIAS, UMB_USER_PERMISSION_ELEMENT_READ, } from '../../../user-permissions/constants.js';
+import { UMB_USER_PERMISSION_ELEMENT_FOLDER_READ } from '../../../folder/user-permissions/constants.js';
 import { UMB_ELEMENT_RECYCLE_BIN_COLLECTION_ALIAS } from '../../collection/constants.js';
 import { UMB_ELEMENT_RECYCLE_BIN_ROOT_ENTITY_TYPE } from '../entity.js';
 import { UMB_ELEMENT_RECYCLE_BIN_ROOT_WORKSPACE_ALIAS } from './constants.js';
@@ -28,6 +30,11 @@ const workspaceView = {
             alias: UMB_WORKSPACE_CONDITION_ALIAS,
             match: UMB_ELEMENT_RECYCLE_BIN_ROOT_WORKSPACE_ALIAS,
         },
+        {
+            alias: UMB_ELEMENT_OR_ELEMENT_FOLDER_USER_PERMISSION_CONDITION_ALIAS,
+            element: { allOf: [UMB_USER_PERMISSION_ELEMENT_READ] },
+            folder: { allOf: [UMB_USER_PERMISSION_ELEMENT_FOLDER_READ] },
+        },
     ],
 };
 export const manifests = [workspace, workspaceView];

package/dist-cms/packages/elements/repository/detail/element-detail-request.mappers.d.ts

@@ -0,0 +1,17 @@
+import type { UmbElementDetailModel } from '../../types.js';
+import type { CreateElementRequestModel, UpdateElementRequestModel } from '../../../core/backend-api/index.js';
+/**
+ * Maps an Element detail model to the create request body.
+ * Shared by the detail create endpoint and the publishing create-and-publish endpoint.
+ * @param {UmbElementDetailModel} model - The Element to create
+ * @param {string | null} parentUnique - The unique of the parent to create under
+ * @returns {CreateElementRequestModel} The create request body
+ */
+export declare function umbMapElementCreateRequestBody(model: UmbElementDetailModel, parentUnique: string | null): CreateElementRequestModel;
+/**
+ * Maps an Element detail model to the update request body.
+ * Shared by the detail update endpoint and the publishing update-and-publish endpoint.
+ * @param {UmbElementDetailModel} model - The Element to update
+ * @returns {UpdateElementRequestModel} The update request body
+ */
+export declare function umbMapElementUpdateRequestBody(model: UmbElementDetailModel): UpdateElementRequestModel;

package/dist-cms/packages/elements/repository/detail/element-detail-request.mappers.js

@@ -0,0 +1,28 @@
+/**
+ * Maps an Element detail model to the create request body.
+ * Shared by the detail create endpoint and the publishing create-and-publish endpoint.
+ * @param {UmbElementDetailModel} model - The Element to create
+ * @param {string | null} parentUnique - The unique of the parent to create under
+ * @returns {CreateElementRequestModel} The create request body
+ */
+export function umbMapElementCreateRequestBody(model, parentUnique) {
+    return {
+        id: model.unique,
+        parent: parentUnique ? { id: parentUnique } : null,
+        documentType: { id: model.documentType.unique },
+        values: model.values,
+        variants: model.variants,
+    };
+}
+/**
+ * Maps an Element detail model to the update request body.
+ * Shared by the detail update endpoint and the publishing update-and-publish endpoint.
+ * @param {UmbElementDetailModel} model - The Element to update
+ * @returns {UpdateElementRequestModel} The update request body
+ */
+export function umbMapElementUpdateRequestBody(model) {
+    return {
+        values: model.values,
+        variants: model.variants,
+    };
+}

package/dist-cms/packages/elements/repository/detail/element-detail-response.mappers.d.ts

@@ -0,0 +1,9 @@
+import type { UmbElementDetailModel } from '../../types.js';
+import type { ElementResponseModel, PublishedElementResponseModel } from '../../../core/backend-api/index.js';
+/**
+ * Maps an Element response model to the Element detail model.
+ * Shared by the detail read endpoint and the publishing published endpoint.
+ * @param {ElementResponseModel | PublishedElementResponseModel} data - The Element response from the server
+ * @returns {UmbElementDetailModel} The Element detail model
+ */
+export declare function umbMapElementResponseToDetailModel(data: ElementResponseModel | PublishedElementResponseModel): UmbElementDetailModel;

package/dist-cms/packages/elements/repository/detail/element-detail-response.mappers.js

@@ -0,0 +1,43 @@
+import { UMB_ELEMENT_ENTITY_TYPE } from '../../entity.js';
+/**
+ * Maps an Element response model to the Element detail model.
+ * Shared by the detail read endpoint and the publishing published endpoint.
+ * @param {ElementResponseModel | PublishedElementResponseModel} data - The Element response from the server
+ * @returns {UmbElementDetailModel} The Element detail model
+ */
+export function umbMapElementResponseToDetailModel(data) {
+    return {
+        entityType: UMB_ELEMENT_ENTITY_TYPE,
+        unique: data.id,
+        values: data.values.map((value) => {
+            return {
+                editorAlias: value.editorAlias,
+                culture: value.culture || null,
+                segment: value.segment || null,
+                alias: value.alias,
+                value: value.value,
+            };
+        }),
+        variants: data.variants.map((variant) => {
+            return {
+                culture: variant.culture || null,
+                segment: variant.segment || null,
+                state: variant.state,
+                name: variant.name,
+                publishDate: variant.publishDate || null,
+                createDate: variant.createDate,
+                updateDate: variant.updateDate,
+                scheduledPublishDate: variant.scheduledPublishDate || null,
+                scheduledUnpublishDate: variant.scheduledUnpublishDate || null,
+                flags: variant.flags,
+            };
+        }),
+        documentType: {
+            unique: data.documentType.id,
+            collection: null,
+            icon: data.documentType.icon,
+        },
+        isTrashed: data.isTrashed,
+        flags: data.flags,
+    };
+}