@umbraco-cms/backoffice 14.0.0-b0704cee → 14.0.0-c26a40c4

package/dist-cms/packages/core/workspace/index.js

@@ -1,10 +1,12 @@
-export * from './workspace-action/index.js';
 export * from './workspace-action-menu/index.js';
+export * from './workspace-action/index.js';
+export * from './workspace-context/index.js';
 export * from './workspace-editor/index.js';
 export * from './workspace-footer/index.js';
+export * from './workspace-is-new-redirect-controller/index.js';
 export * from './workspace-modal/index.js';
-export * from './workspace-context/index.js';
-export * from './workspace-variant/index.js';
-export * from './workspace-split-view-manager.class.js';
-export * from './workspace-property/index.js';
 export * from './workspace-property-layout/workspace-property-layout.element.js';
+export * from './workspace-property/index.js';
+export * from './workspace-split-view-manager.class.js';
+export * from './workspace-variant/index.js';
+export * from './workspace-alias.condition.js';

package/dist-cms/packages/core/workspace/manifests.d.ts

@@ -1 +1 @@
-export declare const manifests: import("../index.js").ManifestModal[];
+export declare const manifests: (import("../../../libs/extension-api/types.js").ManifestCondition | import("../index.js").ManifestModal)[];

package/dist-cms/packages/core/workspace/manifests.js

@@ -1,2 +1,3 @@
 import { manifests as workspaceModals } from './workspace-modal/manifests.js';
-export const manifests = [...workspaceModals];
+import { manifest as workspaceCondition } from './workspace-alias.condition.js';
+export const manifests = [...workspaceModals, workspaceCondition];

package/dist-cms/packages/core/workspace/workspace-action/workspace-action-base.js

@@ -1,9 +1,9 @@
-import { UMB_ENTITY_WORKSPACE_CONTEXT } from '../workspace-context/index.js';
+import { UMB_WORKSPACE_CONTEXT } from '../workspace-context/index.js';
 import { UmbContextConsumerController } from '../../../../libs/context-api/index.js';
 export class UmbWorkspaceActionBase {
     constructor(host) {
         this.host = host;
-        new UmbContextConsumerController(this.host, UMB_ENTITY_WORKSPACE_CONTEXT, (instance) => {
+        new UmbContextConsumerController(this.host, UMB_WORKSPACE_CONTEXT, (instance) => {
             // TODO: Be aware we are casting here. We should consider a better solution for typing the contexts. (But notice we still want to capture the first workspace...)
             this.workspaceContext = instance;
         });

package/dist-cms/packages/core/workspace/workspace-action/workspace-action.element.js

@@ -29,19 +29,27 @@ export let UmbWorkspaceActionElement = class UmbWorkspaceActionElement extends U
     }
     #api;
     async _onClick() {
-        if (!this.#api)
-            return;
-        await this.#api.execute();
+        this._buttonState = 'waiting';
+        try {
+            if (!this.#api)
+                throw new Error('No api defined');
+            await this.#api.execute();
+            this._buttonState = 'success';
+        }
+        catch (error) {
+            this._buttonState = 'failed';
+        }
         this.dispatchEvent(new UmbExecutedEvent());
     }
     render() {
         return html `
 			<uui-button
+				id="action-button"
 				@click=${this._onClick}
 				look=${this.manifest?.meta.look || 'default'}
 				color=${this.manifest?.meta.color || 'default'}
 				label=${this.manifest?.meta.label || ''}
-				.state="${this._buttonState}"></uui-button>
+				.state=${this._buttonState}></uui-button>
 		`;
     }
     static { this.styles = [UUITextStyles, css ``]; }

package/dist-cms/packages/core/workspace/workspace-action-menu/workspace-action-menu.element.js

@@ -7,12 +7,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { UUITextStyles } from '../../../../external/uui/index.js';
 import { css, html, customElement, state } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
-import { UMB_ENTITY_WORKSPACE_CONTEXT } from '../index.js';
+import { UMB_WORKSPACE_CONTEXT } from '../index.js';
 export let UmbWorkspaceActionMenuElement = class UmbWorkspaceActionMenuElement extends UmbLitElement {
     constructor() {
         super();
         this._actionMenuIsOpen = false;
-        this.consumeContext(UMB_ENTITY_WORKSPACE_CONTEXT, (context) => {
+        this.consumeContext(UMB_WORKSPACE_CONTEXT, (context) => {
             this._workspaceContext = context;
             this._observeInfo();
         });
@@ -37,13 +37,17 @@ export let UmbWorkspaceActionMenuElement = class UmbWorkspaceActionMenuElement e
         return html ` ${this.#renderActionsMenu()} `;
     }
     #renderActionsMenu() {
-        return this._entityId
+        return this._entityId && this._entityType
             ? html `
 			<uui-popover  id="action-menu-popover" .open=${this._actionMenuIsOpen} @close=${this.#close}>
 				<uui-button slot="trigger" label="Actions" @click=${this.#open}></uui-button>
 				<div id="action-menu-dropdown" slot="popover">
 					<uui-scroll-container>
-						<umb-entity-action-list @executed=${this.#onActionExecuted} entity-type=${this._entityType} unique=${this._entityId}></umb-entity-action-list>
+						<umb-entity-action-list
+							@executed=${this.#onActionExecuted}
+							.entityType=${this._entityType}
+							.unique=${this._entityId}>
+						</umb-entity-action-list>
 					</uui-scroll-container>
 				</div>
 			</uui-popover>

package/dist-cms/packages/core/workspace/workspace-alias.condition.d.ts

@@ -0,0 +1,18 @@
+import { UmbBaseController } from '../../../libs/controller-api/index.js';
+import { ManifestCondition, UmbConditionConfigBase, UmbConditionControllerArguments, UmbExtensionCondition } from '../../../libs/extension-api/index.js';
+export declare class UmbWorkspaceAliasCondition extends UmbBaseController implements UmbExtensionCondition {
+    #private;
+    config: WorkspaceAliasConditionConfig;
+    permitted: boolean;
+    constructor(args: UmbConditionControllerArguments<WorkspaceAliasConditionConfig>);
+}
+export type WorkspaceAliasConditionConfig = UmbConditionConfigBase<'Umb.Condition.WorkspaceAlias'> & {
+    /**
+     * Define the workspace that this extension should be available in
+     *
+     * @example
+     * "Umb.Workspace.Document"
+     */
+    match: string;
+};
+export declare const manifest: ManifestCondition;

package/dist-cms/packages/core/workspace/workspace-alias.condition.js

@@ -0,0 +1,21 @@
+import { UMB_WORKSPACE_CONTEXT } from './workspace-context/index.js';
+import { UmbBaseController } from '../../../libs/controller-api/index.js';
+export class UmbWorkspaceAliasCondition extends UmbBaseController {
+    #onChange;
+    constructor(args) {
+        super(args.host);
+        this.permitted = false;
+        this.config = args.config;
+        this.#onChange = args.onChange;
+        this.consumeContext(UMB_WORKSPACE_CONTEXT, (context) => {
+            this.permitted = context.workspaceAlias === this.config.match;
+            this.#onChange();
+        });
+    }
+}
+export const manifest = {
+    type: 'condition',
+    name: 'Workspace Alias Condition',
+    alias: 'Umb.Condition.WorkspaceAlias',
+    class: UmbWorkspaceAliasCondition,
+};

package/dist-cms/packages/core/workspace/workspace-content/views/collection/workspace-view-collection.element.js

@@ -8,12 +8,12 @@ import { css, html, customElement, ifDefined } from '../../../../../../external/
 import { UUITextStyles } from '../../../../../../external/uui/index.js';
 import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from '../../../../collection/index.js';
 import { UmbLitElement } from '../../../../../../shared/lit-element/index.js';
-import { UMB_ENTITY_WORKSPACE_CONTEXT } from '../../../index.js';
+import { UMB_WORKSPACE_CONTEXT } from '../../../index.js';
 import '../../../../collection/dashboards/dashboard-collection.element.js';
 export let UmbWorkspaceViewCollectionElement = class UmbWorkspaceViewCollectionElement extends UmbLitElement {
     constructor() {
         super();
-        this.consumeContext(UMB_ENTITY_WORKSPACE_CONTEXT, (nodeContext) => {
+        this.consumeContext(UMB_WORKSPACE_CONTEXT, (nodeContext) => {
             this._workspaceContext = nodeContext;
             this._provideWorkspace();
         });

package/dist-cms/packages/core/workspace/workspace-context/index.d.ts

@@ -4,4 +4,4 @@ export * from './workspace-context.interface.js';
 export * from './workspace-entity-context.interface.js';
 export * from './workspace-invariantable-entity-context.interface.js';
 export * from './workspace-variable-entity-context.interface.js';
-export * from './entity-workspace-context.token.js';
+export * from './workspace-context.token.js';

package/dist-cms/packages/core/workspace/workspace-context/index.js

@@ -4,4 +4,4 @@ export * from './workspace-context.interface.js';
 export * from './workspace-entity-context.interface.js';
 export * from './workspace-invariantable-entity-context.interface.js';
 export * from './workspace-variable-entity-context.interface.js';
-export * from './entity-workspace-context.token.js';
+export * from './workspace-context.token.js';

package/dist-cms/packages/core/workspace/workspace-context/workspace-context.d.ts

@@ -2,15 +2,16 @@ import { UmbEntityWorkspaceContextInterface } from './workspace-entity-context.i
 import { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
 import type { UmbEntityBase } from '../../../../shared/models/index.js';
 import { UmbModalContext } from '../../modal/index.js';
-export declare abstract class UmbWorkspaceContext<T, EntityType extends UmbEntityBase> implements UmbEntityWorkspaceContextInterface<EntityType> {
+export declare abstract class UmbWorkspaceContext<RepositoryType, EntityType extends UmbEntityBase> implements UmbEntityWorkspaceContextInterface<EntityType> {
     #private;
     readonly host: UmbControllerHostElement;
-    readonly repository: T;
+    readonly workspaceAlias: string;
+    readonly repository: RepositoryType;
     readonly modalContext?: UmbModalContext<{
         preset: object;
     }>;
     isNew: import("rxjs").Observable<boolean | undefined>;
-    constructor(host: UmbControllerHostElement, repository: T);
+    constructor(host: UmbControllerHostElement, workspaceAlias: string, repository: RepositoryType);
     getIsNew(): boolean | undefined;
     setIsNew(isNew: boolean): void;
     protected saveComplete(data: EntityType): void;

package/dist-cms/packages/core/workspace/workspace-context/workspace-context.interface.d.ts

@@ -1,11 +1,11 @@
 import { Observable } from '../../../../external/rxjs/index.js';
-import { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
 export interface UmbWorkspaceContextInterface<DataType = unknown> {
-    host: UmbControllerHostElement;
+    workspaceAlias: string;
     repository: any;
     isNew: Observable<boolean | undefined>;
     getIsNew(): boolean | undefined;
     setIsNew(value: boolean): void;
+    getEntityId(): string | undefined;
     getEntityType(): string;
     getData(): DataType | undefined;
     save(): Promise<void>;

package/dist-cms/packages/core/workspace/workspace-context/workspace-context.js

@@ -1,6 +1,6 @@
 import { UmbContextConsumerController, UmbContextProviderController } from '../../../../libs/context-api/index.js';
 import { UmbBooleanState } from '../../../../libs/observable-api/index.js';
-import { UMB_ENTITY_WORKSPACE_CONTEXT } from '../index.js';
+import { UMB_WORKSPACE_CONTEXT } from '../index.js';
 import { UMB_MODAL_CONTEXT_TOKEN } from '../../modal/index.js';
 /*
 
@@ -9,12 +9,13 @@ If so we need to align on a interface that all of these implements. otherwise co
 */
 export class UmbWorkspaceContext {
     #isNew;
-    constructor(host, repository) {
+    constructor(host, workspaceAlias, repository) {
         this.#isNew = new UmbBooleanState(undefined);
         this.isNew = this.#isNew.asObservable();
         this.host = host;
+        this.workspaceAlias = workspaceAlias;
         this.repository = repository;
-        new UmbContextProviderController(host, UMB_ENTITY_WORKSPACE_CONTEXT, this);
+        new UmbContextProviderController(host, UMB_WORKSPACE_CONTEXT, this);
         new UmbContextConsumerController(host, UMB_MODAL_CONTEXT_TOKEN, (context) => {
             this.modalContext = context;
         });

package/dist-cms/packages/core/workspace/workspace-context/workspace-context.token.d.ts

@@ -0,0 +1,4 @@
+import type { UmbWorkspaceContextInterface } from './workspace-context.interface.js';
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
+import type { UmbEntityBase } from '../../../../shared/models/index.js';
+export declare const UMB_WORKSPACE_CONTEXT: UmbContextToken<UmbWorkspaceContextInterface<UmbEntityBase>>;

package/dist-cms/packages/core/workspace/workspace-context/workspace-context.token.js

@@ -0,0 +1,2 @@
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
+export const UMB_WORKSPACE_CONTEXT = new UmbContextToken('UmbWorkspaceContext');

package/dist-cms/packages/core/workspace/workspace-context/workspace-entity-context.interface.d.ts

@@ -1,6 +1,5 @@
 import type { UmbWorkspaceContextInterface } from './workspace-context.interface.js';
 export interface UmbEntityWorkspaceContextInterface<EntityType = unknown> extends UmbWorkspaceContextInterface<EntityType> {
-    getEntityId(): string | undefined;
     getEntityType(): string;
     save(): Promise<void>;
 }

package/dist-cms/packages/core/workspace/workspace-editor/workspace-editor.element.d.ts

@@ -17,22 +17,18 @@ export declare class UmbWorkspaceEditorElement extends UmbLitElement {
     headline: string;
     hideNavigation: boolean;
     enforceNoFooter: boolean;
-    private _alias;
     /**
-     * Alias of the workspace. The Layout will render the workspace views that are registered for this workspace alias.
+     * Alias of the workspace. Currently not used for anything.
      * @public
-     * @type {string}
+     * @type {string | undefined}
      * @attr
-     * @default ''
      */
-    get alias(): string;
-    set alias(value: string);
+    alias?: string;
     private _workspaceViews;
     private _routes?;
     private _routerPath?;
     private _activePath?;
-    private _observeWorkspaceViews;
-    private componentHasManifest;
+    constructor();
     private _createRoutes;
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];

package/dist-cms/packages/core/workspace/workspace-editor/workspace-editor.element.js

@@ -6,10 +6,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { UUITextStyles } from '../../../../external/uui/index.js';
 import { css, html, nothing, customElement, property, state, repeat } from '../../../../external/lit/index.js';
-import { map } from '../../../../external/rxjs/index.js';
 import { umbExtensionsRegistry, } from '../../extension-registry/index.js';
-import { createExtensionElement } from '../../../../libs/extension-api/index.js';
+import { UmbExtensionsManifestController, createExtensionElement } from '../../../../libs/extension-api/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
+import { componentHasManifestProperty } from '../../../../shared/utils/index.js';
 /**
  * @element umb-workspace-editor
  * @description
@@ -26,42 +26,15 @@ import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 // TODO: stop naming this something with layout. as its not just an layout. it hooks up with extensions.
 export let UmbWorkspaceEditorElement = class UmbWorkspaceEditorElement extends UmbLitElement {
     constructor() {
-        super(...arguments);
+        super();
         this.headline = '';
         this.hideNavigation = false;
         this.enforceNoFooter = false;
-        this._alias = '';
         this._workspaceViews = [];
-    }
-    /**
-     * Alias of the workspace. The Layout will render the workspace views that are registered for this workspace alias.
-     * @public
-     * @type {string}
-     * @attr
-     * @default ''
-     */
-    get alias() {
-        return this._alias;
-    }
-    set alias(value) {
-        const oldValue = this._alias;
-        this._alias = value;
-        if (oldValue !== this._alias) {
-            this._observeWorkspaceViews();
-            this.requestUpdate('alias', oldValue);
-        }
-    }
-    _observeWorkspaceViews() {
-        this.observe(umbExtensionsRegistry
-            .extensionsOfTypes(['workspaceEditorView', 'workspaceViewCollection'])
-            .pipe(map((extensions) => extensions.filter((extension) => extension.conditions.workspaces.includes(this.alias)))), (workspaceViews) => {
-            this._workspaceViews = workspaceViews;
+        new UmbExtensionsManifestController(this, umbExtensionsRegistry, ['workspaceEditorView', 'workspaceViewCollection'], null, (workspaceViews) => {
+            this._workspaceViews = workspaceViews.map((view) => view.manifest);
             this._createRoutes();
-        }, '_observeWorkspaceViews');
-    }
-    // TODO: Move into a helper function:
-    componentHasManifest(component) {
-        return component ? 'manifest' in component : false;
+        });
     }
     _createRoutes() {
         this._routes = [];
@@ -76,8 +49,7 @@ export let UmbWorkspaceEditorElement = class UmbWorkspaceEditorElement extends U
                         return createExtensionElement(manifest);
                     },
                     setup: (component) => {
-                        // TODO: We could just always parse it on and instead we should make a element interface for the workspace views.
-                        if (this.componentHasManifest(component)) {
+                        if (component && componentHasManifestProperty(component)) {
                             component.manifest = manifest;
                         }
                     },
@@ -104,7 +76,7 @@ export let UmbWorkspaceEditorElement = class UmbWorkspaceEditorElement extends U
 				${this.enforceNoFooter
             ? ''
             : html `
-							<umb-workspace-footer slot="footer" alias=${this.alias}>
+							<umb-workspace-footer slot="footer">
 								<slot name="footer-info"></slot>
 								<slot name="actions" slot="actions"></slot>
 							</umb-workspace-footer>
@@ -184,14 +156,14 @@ __decorate([
     property()
 ], UmbWorkspaceEditorElement.prototype, "headline", void 0);
 __decorate([
-    property()
+    property({ type: Boolean })
 ], UmbWorkspaceEditorElement.prototype, "hideNavigation", void 0);
 __decorate([
-    property()
+    property({ type: Boolean })
 ], UmbWorkspaceEditorElement.prototype, "enforceNoFooter", void 0);
 __decorate([
     property()
-], UmbWorkspaceEditorElement.prototype, "alias", null);
+], UmbWorkspaceEditorElement.prototype, "alias", void 0);
 __decorate([
     state()
 ], UmbWorkspaceEditorElement.prototype, "_workspaceViews", void 0);

package/dist-cms/packages/core/workspace/workspace-footer/workspace-footer.element.d.ts

@@ -10,16 +10,6 @@ import { UmbModalContext } from '../../modal/index.js';
  * @extends {UmbLitElement}
  */
 export declare class UmbWorkspaceFooterLayoutElement extends UmbLitElement {
-    private _alias;
-    /**
-     * Alias of the workspace. The Layout will render the workspace actions that are registered for this workspace alias.
-     * @public
-     * @type {string}
-     * @attr
-     * @default ''
-     */
-    get alias(): string;
-    set alias(value: string);
     _withinModal: boolean;
     _modalContext?: UmbModalContext;
     constructor();

package/dist-cms/packages/core/workspace/workspace-footer/workspace-footer.element.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UUITextStyles } from '../../../../external/uui/index.js';
-import { css, html, customElement, property, state } from '../../../../external/lit/index.js';
+import { css, html, customElement, state } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 import { UMB_MODAL_CONTEXT_TOKEN } from '../../modal/index.js';
 /**
@@ -19,26 +19,8 @@ import { UMB_MODAL_CONTEXT_TOKEN } from '../../modal/index.js';
  */
 // TODO: stop naming this something with layout. as its not just an layout. it hooks up with extensions.
 export let UmbWorkspaceFooterLayoutElement = class UmbWorkspaceFooterLayoutElement extends UmbLitElement {
-    /**
-     * Alias of the workspace. The Layout will render the workspace actions that are registered for this workspace alias.
-     * @public
-     * @type {string}
-     * @attr
-     * @default ''
-     */
-    get alias() {
-        return this._alias;
-    }
-    set alias(value) {
-        const oldValue = this._alias;
-        this._alias = value;
-        if (oldValue !== this._alias) {
-            this.requestUpdate('alias', oldValue);
-        }
-    }
     constructor() {
         super();
-        this._alias = '';
         this._withinModal = false;
         this._onClose = () => {
             this._modalContext?.reject();
@@ -59,7 +41,6 @@ export let UmbWorkspaceFooterLayoutElement = class UmbWorkspaceFooterLayoutEleme
 				<umb-extension-slot
 					slot="actions"
 					type="workspaceAction"
-					.filter=${(extension) => extension.conditions.workspaces.includes(this.alias)}
 					default-element="umb-workspace-action"></umb-extension-slot>
 				<slot name="actions" slot="actions"></slot>
 			</umb-footer-layout>
@@ -80,9 +61,6 @@ export let UmbWorkspaceFooterLayoutElement = class UmbWorkspaceFooterLayoutEleme
 		`,
     ]; }
 };
-__decorate([
-    property()
-], UmbWorkspaceFooterLayoutElement.prototype, "alias", null);
 __decorate([
     state()
 ], UmbWorkspaceFooterLayoutElement.prototype, "_withinModal", void 0);

package/dist-cms/packages/core/workspace/workspace-is-new-redirect-controller/index.d.ts

@@ -0,0 +1 @@
+export * from './workspace-is-new-redirect-controller.js';

package/dist-cms/packages/core/workspace/workspace-is-new-redirect-controller/index.js

@@ -0,0 +1 @@
+export * from './workspace-is-new-redirect-controller.js';

package/dist-cms/packages/core/workspace/workspace-is-new-redirect-controller/workspace-is-new-redirect-controller.d.ts

@@ -0,0 +1,16 @@
+import { UmbWorkspaceContext } from '../workspace-context/index.js';
+import { UmbBaseController, type UmbControllerHost } from '../../../../libs/controller-api/index.js';
+import type { UmbEntityBase } from '../../../../shared/models/index.js';
+import { type UmbRouterSlotElement } from '../../../../shared/router/index.js';
+/**
+ * Observe the workspace context to see if the entity is new or not.
+ * If that changes redirect to the edit url.
+ *
+ * This requires that the edit URL, is edit/:id
+ * @param host
+ * @param workspaceContext
+ * @param router
+ */
+export declare class UmbWorkspaceIsNewRedirectController extends UmbBaseController {
+    constructor(host: UmbControllerHost, workspaceContext: UmbWorkspaceContext<unknown, UmbEntityBase>, router: UmbRouterSlotElement);
+}

package/dist-cms/packages/core/workspace/workspace-is-new-redirect-controller/workspace-is-new-redirect-controller.js

@@ -0,0 +1,31 @@
+import { UmbBaseController } from '../../../../libs/controller-api/index.js';
+import { createRoutePathBuilder } from '../../../../shared/router/index.js';
+import { ensurePathEndsWithSlash } from '../../../../shared/utils/index.js';
+/**
+ * Observe the workspace context to see if the entity is new or not.
+ * If that changes redirect to the edit url.
+ *
+ * This requires that the edit URL, is edit/:id
+ * @param host
+ * @param workspaceContext
+ * @param router
+ */
+export class UmbWorkspaceIsNewRedirectController extends UmbBaseController {
+    constructor(host, workspaceContext, router) {
+        super(host);
+        // Navigate to edit route when language is created:
+        this.observe(workspaceContext.isNew, (isNew) => {
+            if (isNew === false) {
+                const id = workspaceContext.getEntityId();
+                if (router && id) {
+                    const routerPath = router.absoluteRouterPath;
+                    if (routerPath) {
+                        const newPath = createRoutePathBuilder(ensurePathEndsWithSlash(routerPath) + 'edit/:id')({ id });
+                        window.history.pushState({}, '', newPath);
+                        this.destroy();
+                    }
+                }
+            }
+        }, '_observeIsNew');
+    }
+}

package/dist-cms/packages/core/workspace/workspace-property/workspace-property.context.js

@@ -1,4 +1,4 @@
-import { UMB_WORKSPACE_VARIANT_CONTEXT_TOKEN, UMB_ENTITY_WORKSPACE_CONTEXT } from '../index.js';
+import { UMB_WORKSPACE_VARIANT_CONTEXT_TOKEN, UMB_WORKSPACE_CONTEXT } from '../index.js';
 import { UmbClassState, UmbObjectState, UmbStringState, UmbObserverController, UmbBasicState, } from '../../../../libs/observable-api/index.js';
 import { UmbContextConsumerController, UmbContextProviderController, UmbContextToken, } from '../../../../libs/context-api/index.js';
 import { UmbDataTypeConfigCollection } from '../../components/index.js';
@@ -30,7 +30,7 @@ export class UmbWorkspacePropertyContext {
         this._variantDifference = new UmbStringState(undefined);
         this.variantDifference = this._variantDifference.asObservable();
         this.#host = host;
-        new UmbContextConsumerController(host, UMB_ENTITY_WORKSPACE_CONTEXT, (workspaceContext) => {
+        new UmbContextConsumerController(host, UMB_WORKSPACE_CONTEXT, (workspaceContext) => {
             this._workspaceContext = workspaceContext;
         });
         this._providerController = new UmbContextProviderController(host, UMB_WORKSPACE_PROPERTY_CONTEXT_TOKEN, this);

package/dist-cms/packages/core/workspace/workspace-property/workspace-property.element.js

@@ -194,6 +194,10 @@ export let UmbWorkspacePropertyElement = class UmbWorkspacePropertyElement exten
 			#property-action-menu[open] {
 				opacity: 1;
 			}
+
+			uui-tag {
+				margin-top: var(--uui-size-space-4);
+			}
 		`,
     ]; }
 };

package/dist-cms/packages/core/workspace/workspace-variant/workspace-variant.context.js

@@ -1,6 +1,6 @@
 import { UmbVariantId } from '../../variant/index.js';
 import { UmbContextConsumerController, UmbContextProviderController, UmbContextToken, } from '../../../../libs/context-api/index.js';
-import { UMB_ENTITY_WORKSPACE_CONTEXT } from '../index.js';
+import { UMB_WORKSPACE_CONTEXT } from '../index.js';
 import { UmbClassState, UmbNumberState, UmbObjectState, UmbObserverController, } from '../../../../libs/observable-api/index.js';
 //type EntityType = DocumentModel;
 export class UmbWorkspaceVariantContext {
@@ -26,7 +26,7 @@ export class UmbWorkspaceVariantContext {
         new UmbContextProviderController(host, UMB_WORKSPACE_VARIANT_CONTEXT_TOKEN.toString(), this);
         // How do we ensure this connects to a document workspace context? and not just any other context? (We could start providing workspace contexts twice, under the general name and under a specific name)
         // TODO: Figure out if this is the best way to consume the context or if it can be strongly typed with an UmbContextToken
-        new UmbContextConsumerController(host, UMB_ENTITY_WORKSPACE_CONTEXT, (context) => {
+        new UmbContextConsumerController(host, UMB_WORKSPACE_CONTEXT, (context) => {
             this.#workspaceContext = context;
             this._observeVariant();
         });

package/dist-cms/packages/core/workspace/workspace.element.d.ts

@@ -2,7 +2,7 @@ import { nothing } from '../../../external/lit/index.js';
 import { UmbLitElement } from '../../../shared/lit-element/index.js';
 export declare class UmbWorkspaceElement extends UmbLitElement {
     entityType: string;
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
     static styles: import("@lit/reactive-element/css-tag").CSSResult[];
 }
 export default UmbWorkspaceElement;

package/dist-cms/packages/{translation → dictionary}/dashboards/dictionary/dashboard-translation-dictionary.element.js

@@ -72,13 +72,12 @@ export let UmbDashboardTranslationDictionaryElement = class UmbDashboardTranslat
             // TODO: Generate URL for editing the dictionary item
             const tableItem = {
                 id: dictionary.name ?? '',
-                icon: 'umb:book-alt',
                 data: [
                     {
                         columnAlias: 'name',
                         value: html `<a
 							style="font-weight:bold"
-							href="/section/translation/workspace/dictionary-item/edit/${dictionary.id}">
+							href="/section/dictionary/workspace/dictionary-item/edit/${dictionary.id}">
 							${dictionary.name}</a
 						> `,
                     },
@@ -124,7 +123,7 @@ export let UmbDashboardTranslationDictionaryElement = class UmbDashboardTranslat
             return;
         //TODO: Why do we need to extract the id like this?
         const id = url.substring(url.lastIndexOf('/') + 1);
-        history.pushState({}, '', `/section/translation/workspace/dictionary-item/edit/${id}`);
+        history.pushState({}, '', `/section/dictionary/workspace/dictionary-item/edit/${id}`);
     }
     render() {
         return html `

package/dist-cms/packages/{translation → dictionary}/dictionary/entity-actions/create/create.action.js

@@ -36,6 +36,6 @@ export default class UmbCreateDictionaryEntityAction extends UmbEntityActionBase
             return;
         //TODO: Why do we need to extract the id like this?
         const id = url.substring(url.lastIndexOf('/') + 1);
-        history.pushState({}, '', `/section/translation/workspace/dictionary-item/edit/${id}`);
+        history.pushState({}, '', `/section/dictionary/workspace/dictionary-item/edit/${id}`);
     }
 }

package/dist-cms/packages/{translation → dictionary}/dictionary/entity-actions/export/export.action.d.ts

@@ -1,7 +1,6 @@
 import { UmbDictionaryRepository } from '../../repository/dictionary.repository.js';
 import { UmbEntityActionBase } from '../../../../core/entity-action/index.js';
 import { UmbControllerHostElement } from '../../../../../libs/controller-api/index.js';
-import './export-dictionary-modal.element.js';
 export default class UmbExportDictionaryEntityAction extends UmbEntityActionBase<UmbDictionaryRepository> {
     #private;
     static styles: import("lit").CSSResult[];

package/dist-cms/packages/{translation → dictionary}/dictionary/entity-actions/export/export.action.js

@@ -2,7 +2,6 @@ import { UUITextStyles } from '../../../../../external/uui/index.js';
 import { UmbEntityActionBase } from '../../../../core/entity-action/index.js';
 import { UmbContextConsumerController } from '../../../../../libs/context-api/index.js';
 import { UMB_MODAL_MANAGER_CONTEXT_TOKEN, UMB_EXPORT_DICTIONARY_MODAL, } from '../../../../core/modal/index.js';
-import './export-dictionary-modal.element.js';
 export default class UmbExportDictionaryEntityAction extends UmbEntityActionBase {
     static { this.styles = [UUITextStyles]; }
     #modalContext;