diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entries.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entries.context.ts
index bb1fe4cc37..e410f894d0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entries.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entries.context.ts
@@ -14,6 +14,7 @@ import type {
UmbBlockGridValueModel,
} from '../types.js';
import { forEachBlockLayoutEntryOf } from '../utils/index.js';
+import type { UmbBlockGridPropertyEditorConfig } from '../property-editors/block-grid-editor/types.js';
import { UMB_BLOCK_GRID_MANAGER_CONTEXT } from './block-grid-manager.context-token.js';
import type { UmbBlockGridScalableContainerContext } from './block-grid-scale-manager/block-grid-scale-manager.controller.js';
import {
@@ -170,7 +171,7 @@ export class UmbBlockGridEntriesContext
// TODO: consider moving some of this logic to the clipboard property context
const propertyContext = await this.getContext(UMB_PROPERTY_CONTEXT);
- const config = propertyContext.getConfig();
+ const config = propertyContext.getConfig() as UmbBlockGridPropertyEditorConfig;
const valueResolver = new UmbClipboardPastePropertyValueTranslatorValueResolver(this);
return {
@@ -198,7 +199,8 @@ export class UmbBlockGridEntriesContext
clipboardEntryDetail.values,
UMB_BLOCK_GRID_PROPERTY_EDITOR_UI_ALIAS,
);
- return pasteTranslator.isCompatibleValue(value, config);
+
+ return pasteTranslator.isCompatibleValue(value, config, (value) => this.#clipboardEntriesFilter(value));
}
return true;
@@ -269,6 +271,21 @@ export class UmbBlockGridEntriesContext
});
}
+ async #clipboardEntriesFilter(propertyValue: UmbBlockGridValueModel) {
+ const allowedElementTypeKeys = this.#retrieveAllowedElementTypes().map((x) => x.contentElementTypeKey);
+
+ const rootContentKeys = propertyValue.layout['Umbraco.BlockGrid']?.map((block) => block.contentKey) ?? [];
+ const rootContentTypeKeys = propertyValue.contentData
+ .filter((content) => rootContentKeys.includes(content.key))
+ .map((content) => content.contentTypeKey);
+
+ const allContentTypesAllowed = rootContentTypeKeys.every((contentKey) =>
+ allowedElementTypeKeys.includes(contentKey),
+ );
+
+ return allContentTypesAllowed;
+ }
+
protected _gotBlockManager() {
if (!this._manager) return;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/manifests.ts
index 209e3eef67..5b760bd190 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/manifests.ts
@@ -3,8 +3,9 @@ import { manifests as componentManifests } from './components/manifests.js';
import { manifests as propertyEditorManifests } from './property-editors/manifests.js';
import { manifests as propertyValueClonerManifests } from './property-value-cloner/manifests.js';
import { manifests as workspaceManifests } from './workspace/manifests.js';
+import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
-export const manifests: Array = [
+export const manifests: Array = [
...clipboardManifests,
...componentManifests,
...propertyEditorManifests,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/manifests.ts
index c6cc6a7dcd..c575670a46 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/manifests.ts
@@ -1,8 +1,10 @@
import { manifest as blockGridSchemaManifest } from './Umbraco.BlockGrid.js';
import { UMB_BLOCK_GRID_PROPERTY_EDITOR_SCHEMA_ALIAS, UMB_BLOCK_GRID_PROPERTY_EDITOR_UI_ALIAS } from './constants.js';
+import { manifests as propertyActionManifests } from './property-actions/manifests.js';
+import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
import { UmbStandardBlockValueResolver } from '@umbraco-cms/backoffice/block';
-export const manifests: Array = [
+export const manifests: Array = [
{
type: 'propertyEditorUi',
alias: UMB_BLOCK_GRID_PROPERTY_EDITOR_UI_ALIAS,
@@ -66,7 +68,6 @@ export const manifests: Array = [
},
},
},
- blockGridSchemaManifest,
{
type: 'propertyValueResolver',
alias: 'Umb.PropertyValueResolver.BlockGrid',
@@ -76,4 +77,6 @@ export const manifests: Array = [
editorAlias: UMB_BLOCK_GRID_PROPERTY_EDITOR_SCHEMA_ALIAS,
},
},
+ blockGridSchemaManifest,
+ ...propertyActionManifests,
];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-actions/block-grid-paste-from-clipboard.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-actions/block-grid-paste-from-clipboard.ts
new file mode 100644
index 0000000000..1480e09dcf
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-actions/block-grid-paste-from-clipboard.ts
@@ -0,0 +1,52 @@
+import type { UmbBlockGridValueModel } from '../../../types.js';
+import type { UmbBlockGridPropertyEditorConfig } from '../types.js';
+import { UmbPasteFromClipboardPropertyAction } from '@umbraco-cms/backoffice/clipboard';
+
+/**
+ * The Block Grid Paste From Clipboard Property Action.
+ * @exports
+ * @class UmbBlockGridPasteFromClipboardPropertyAction
+ * @augments UmbPasteFromClipboardPropertyAction
+ */
+export class UmbBlockGridPasteFromClipboardPropertyAction extends UmbPasteFromClipboardPropertyAction {
+ /**
+ * Filters the picker based on the block grid property editor config.
+ * @param {UmbBlockGridValueModel} propertyValue The property editor value.
+ * @param {UmbBlockGridPropertyEditorConfig} config The property editor config.
+ * @override
+ * @protected
+ * @memberof UmbBlockGridPasteFromClipboardPropertyAction
+ */
+ protected override async _pickerFilter(
+ propertyValue: UmbBlockGridValueModel,
+ config: UmbBlockGridPropertyEditorConfig,
+ ) {
+ // The property action always paste in the root of the grid so
+ // we need to check if the content types are allowed at the root
+ const blocksConfig = config.find((configValue) => configValue.alias === 'blocks');
+
+ const allowedRootContentTypeKeys =
+ blocksConfig?.value
+ .map((blockConfig) => {
+ if (blockConfig.allowAtRoot) {
+ return blockConfig.contentElementTypeKey;
+ } else {
+ return undefined;
+ }
+ })
+ .filter((contentTypeKey) => contentTypeKey !== undefined) ?? [];
+
+ const rootContentKeys = propertyValue.layout['Umbraco.BlockGrid']?.map((block) => block.contentKey) ?? [];
+ const rootContentTypeKeys = propertyValue.contentData
+ .filter((content) => rootContentKeys.includes(content.key))
+ .map((content) => content.contentTypeKey);
+
+ // ensure all content types in the paste value are allowed in the grid root
+ const allContentTypesAllowedAtRoot = rootContentTypeKeys.every((contentKey) =>
+ allowedRootContentTypeKeys.includes(contentKey),
+ );
+
+ return allContentTypesAllowedAtRoot;
+ }
+}
+export { UmbBlockGridPasteFromClipboardPropertyAction as api };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-actions/manifests.ts
new file mode 100644
index 0000000000..8b2befb3a1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-actions/manifests.ts
@@ -0,0 +1,20 @@
+import { UMB_BLOCK_GRID_PROPERTY_EDITOR_UI_ALIAS } from '../constants.js';
+import { UMB_WRITABLE_PROPERTY_CONDITION_ALIAS } from '@umbraco-cms/backoffice/property';
+import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
+import { UMB_PROPERTY_ACTION_PASTE_FROM_CLIPBOARD_KIND_MANIFEST } from '@umbraco-cms/backoffice/clipboard';
+
+export const manifests: Array = [
+ {
+ ...UMB_PROPERTY_ACTION_PASTE_FROM_CLIPBOARD_KIND_MANIFEST.manifest,
+ type: 'propertyAction',
+ alias: 'Umb.PropertyAction.BlockGrid.Clipboard.Paste',
+ name: 'Block Grid Paste From Clipboard Property Action',
+ api: () => import('./block-grid-paste-from-clipboard.js'),
+ forPropertyEditorUis: [UMB_BLOCK_GRID_PROPERTY_EDITOR_UI_ALIAS],
+ conditions: [
+ {
+ alias: UMB_WRITABLE_PROPERTY_CONDITION_ALIAS,
+ },
+ ],
+ },
+];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/types.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/types.ts
new file mode 100644
index 0000000000..99e701404c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/types.ts
@@ -0,0 +1,9 @@
+// TODO: add the missing fields to the type
+export type UmbBlockGridPropertyEditorConfig = Array<{
+ alias: 'blocks';
+ value: Array<{
+ allowAtRoot: boolean;
+ allowInAreas: boolean;
+ contentElementTypeKey: string;
+ }>;
+}>;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/manifests.ts
index 8a797e8068..37621422be 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/manifests.ts
@@ -5,8 +5,9 @@ import { manifests as blockGridEditorManifests } from './block-grid-editor/manif
import { manifest as blockGridGroupConfiguration } from './block-grid-group-configuration/manifests.js';
import { manifest as blockGridLayoutStylesheet } from './block-grid-layout-stylesheet/manifests.js';
import { manifest as blockGridTypeConfiguration } from './block-grid-type-configuration/manifests.js';
+import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
-export const manifests: Array = [
+export const manifests: Array = [
blockGridAreaTypePermission,
blockGridAreasConfigEditor,
blockGridColumnSpan,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/clipboard/block/paste/block-to-block-list-paste-translator.test.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/clipboard/block/paste/block-to-block-list-paste-translator.test.ts
index a54f811c9c..56fb74df42 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/clipboard/block/paste/block-to-block-list-paste-translator.test.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/clipboard/block/paste/block-to-block-list-paste-translator.test.ts
@@ -98,12 +98,12 @@ describe('UmbBlockToBlockListClipboardPastePropertyValueTranslator', () => {
describe('isCompatibleValue', () => {
it('should return true if the content types are allowed', async () => {
- const result = await pasteTranslator.isCompatibleValue(blockClipboardEntryValue, config);
+ const result = await pasteTranslator.isCompatibleValue(blockListPropertyValue, config);
expect(result).to.be.true;
});
it('should return false if the content types are not allowed', async () => {
- const result = await pasteTranslator.isCompatibleValue(blockClipboardEntryValue, config2);
+ const result = await pasteTranslator.isCompatibleValue(blockListPropertyValue, config2);
expect(result).to.be.false;
});
});
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/clipboard/block/paste/block-to-block-list-paste-translator.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/clipboard/block/paste/block-to-block-list-paste-translator.ts
index 9493c4ef61..32fe61adef 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/clipboard/block/paste/block-to-block-list-paste-translator.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/clipboard/block/paste/block-to-block-list-paste-translator.ts
@@ -35,19 +35,19 @@ export class UmbBlockToBlockListClipboardPastePropertyValueTranslator
/**
* Checks if the clipboard entry value is compatible with the config.
- * @param {UmbBlockClipboardEntryValueModel} value - The block clipboard entry value.
+ * @param {UmbBlockListValueModel} propertyValue - The property value
* @param {*} config - The Property Editor config.
* @returns {Promise} - Whether the clipboard entry value is compatible with the config.
* @memberof UmbBlockToBlockListClipboardPastePropertyValueTranslator
*/
async isCompatibleValue(
- value: UmbBlockClipboardEntryValueModel,
+ propertyValue: UmbBlockListValueModel,
// TODO: Replace any with the correct type.
config: Array<{ alias: string; value: [{ contentElementTypeKey: string }] }>,
): Promise {
const allowedBlockContentTypes =
config.find((c) => c.alias === 'blocks')?.value.map((b) => b.contentElementTypeKey) ?? [];
- const blockContentTypes = value.contentData.map((c) => c.contentTypeKey);
+ const blockContentTypes = propertyValue.contentData.map((c) => c.contentTypeKey);
return blockContentTypes?.every((b) => allowedBlockContentTypes.includes(b)) ?? false;
}
}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts
index 48624dad3f..af584330ef 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts
@@ -395,7 +395,7 @@ export class UmbBlockListEntryElement extends UmbLitElement implements UmbProper
}
#renderBlock() {
- return this.contentKey
+ return this.contentKey && (this._contentTypeAlias || this._unsupported)
? html`
{
- this._contentElementTypeAlias = alias;
+ this._contentTypeAlias = alias;
},
null,
);
@@ -230,7 +230,7 @@ export class UmbBlockRteEntryElement extends UmbLitElement implements UmbPropert
}
readonly #filterBlockCustomViews = (manifest: ManifestBlockEditorCustomView) => {
- const elementTypeAlias = this._contentElementTypeAlias ?? '';
+ const elementTypeAlias = this._contentTypeAlias ?? '';
const isForBlockEditor =
!manifest.forBlockEditor || stringOrStringArrayContains(manifest.forBlockEditor, UMB_BLOCK_RTE);
const isForContentTypeAlias =
@@ -256,23 +256,25 @@ export class UmbBlockRteEntryElement extends UmbLitElement implements UmbPropert
};
#renderBlock() {
- return html`
- = [
- {
- type: 'kind',
- alias: 'Umb.Kind.PropertyAction.pasteFromClipboard',
- matchKind: 'pasteFromClipboard',
- matchType: 'propertyAction',
- manifest: {
- ...UMB_PROPERTY_ACTION_DEFAULT_KIND_MANIFEST.manifest,
- type: 'propertyAction',
- kind: 'pasteFromClipboard',
- api: () => import('./paste-from-clipboard.property-action.js'),
- weight: 1190,
- meta: {
- icon: 'icon-clipboard-paste',
- label: 'Replace',
- },
+export const UMB_PROPERTY_ACTION_PASTE_FROM_CLIPBOARD_KIND_MANIFEST: UmbExtensionManifestKind = {
+ type: 'kind',
+ alias: 'Umb.Kind.PropertyAction.pasteFromClipboard',
+ matchKind: 'pasteFromClipboard',
+ matchType: 'propertyAction',
+ manifest: {
+ ...UMB_PROPERTY_ACTION_DEFAULT_KIND_MANIFEST.manifest,
+ type: 'propertyAction',
+ kind: 'pasteFromClipboard',
+ api: () => import('./paste-from-clipboard.property-action.js'),
+ weight: 1190,
+ meta: {
+ icon: 'icon-clipboard-paste',
+ label: 'Replace',
},
},
+};
+
+export const manifests: Array = [
+ UMB_PROPERTY_ACTION_PASTE_FROM_CLIPBOARD_KIND_MANIFEST,
];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/paste/paste-from-clipboard.property-action.ts b/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/paste/paste-from-clipboard.property-action.ts
index 869b3ad05b..e4c54117e8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/paste/paste-from-clipboard.property-action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/paste/paste-from-clipboard.property-action.ts
@@ -25,6 +25,11 @@ export class UmbPasteFromClipboardPropertyAction extends UmbPropertyActionBase Promise} args.filter - A filter function to filter clipboard entries
* @returns { Promise<{ selection: Array; propertyValues: Array }> }
*/
async pick(args: {
multiple: boolean;
propertyEditorUiAlias: string;
+ filter?: (value: any, config: any) => Promise;
}): Promise<{ selection: Array; propertyValues: Array }> {
await this.#init;
@@ -149,8 +151,12 @@ export class UmbClipboardPropertyContext extends UmbContextBase extends UmbApi {
- translate: (value: ClipboardEntryValueType) => Promise;
- isCompatibleValue?: (value: ClipboardEntryValueType, config: ConfigType) => Promise;
+ translate: (clipboardEntryValue: ClipboardEntryValueType) => Promise;
+ isCompatibleValue?: (
+ propertyValue: PropertyValueType,
+ config: ConfigType,
+ filter?: (propertyValue: PropertyValueType, config: ConfigType) => Promise,
+ ) => Promise;
}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-date/input-date.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-date/input-date.element.ts
index 8d68d78068..b78188b73b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-date/input-date.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-date/input-date.element.ts
@@ -1,4 +1,4 @@
-import { customElement } from '@umbraco-cms/backoffice/external/lit';
+import { customElement, css } from '@umbraco-cms/backoffice/external/lit';
import { UUIInputElement } from '@umbraco-cms/backoffice/external/uui';
export type InputDateType = 'date' | 'time' | 'datetime-local';
@@ -28,6 +28,16 @@ export class UmbInputDateElement extends UUIInputElement {
super();
this.type = 'date'; // Default to 'date'
}
+
+ // Adding styles override to add a darkmode version.
+ static override styles = [
+ ...UUIInputElement.styles,
+ css`
+ input {
+ color-scheme: var(--uui-color-scheme, normal);
+ }
+ `,
+ ];
}
export default UmbInputDateElement;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/global-components/content-type-workspace-editor-header.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/global-components/content-type-workspace-editor-header.element.ts
new file mode 100644
index 0000000000..fc3180ee1d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/global-components/content-type-workspace-editor-header.element.ts
@@ -0,0 +1,156 @@
+import { UMB_CONTENT_TYPE_WORKSPACE_CONTEXT } from '../workspace/content-type-workspace.context-token.js';
+import type { UmbInputWithAliasElement } from '@umbraco-cms/backoffice/components';
+import { umbFocus, UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/icon';
+import type { UUITextareaElement } from '@umbraco-cms/backoffice/external/uui';
+import { umbBindToValidation } from '@umbraco-cms/backoffice/validation';
+
+@customElement('umb-content-type-workspace-editor-header')
+export class UmbContentTypeWorkspaceEditorHeaderElement extends UmbLitElement {
+ @state()
+ private _name?: string;
+
+ @state()
+ private _alias?: string;
+
+ @state()
+ private _description?: string;
+
+ @state()
+ private _icon?: string;
+
+ @state()
+ private _isNew?: boolean;
+
+ #workspaceContext?: typeof UMB_CONTENT_TYPE_WORKSPACE_CONTEXT.TYPE;
+
+ constructor() {
+ super();
+
+ this.consumeContext(UMB_CONTENT_TYPE_WORKSPACE_CONTEXT, (instance) => {
+ this.#workspaceContext = instance;
+ this.#observeContentType();
+ });
+ }
+
+ #observeContentType() {
+ if (!this.#workspaceContext) return;
+ this.observe(this.#workspaceContext.name, (name) => (this._name = name), '_observeName');
+ this.observe(this.#workspaceContext.alias, (alias) => (this._alias = alias), '_observeAlias');
+ this.observe(
+ this.#workspaceContext.description,
+ (description) => (this._description = description),
+ '_observeDescription',
+ );
+ this.observe(this.#workspaceContext.icon, (icon) => (this._icon = icon), '_observeIcon');
+ this.observe(this.#workspaceContext.isNew, (isNew) => (this._isNew = isNew), '_observeIsNew');
+ }
+
+ private async _handleIconClick() {
+ const [alias, color] = this._icon?.replace('color-', '')?.split(' ') ?? [];
+ const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
+ const modalContext = modalManager.open(this, UMB_ICON_PICKER_MODAL, {
+ value: {
+ icon: alias,
+ color: color,
+ },
+ });
+
+ modalContext?.onSubmit().then((saved) => {
+ if (saved.icon && saved.color) {
+ this.#workspaceContext?.setIcon(`${saved.icon} color-${saved.color}`);
+ } else if (saved.icon) {
+ this.#workspaceContext?.setIcon(saved.icon);
+ }
+ });
+ }
+
+ #onNameAndAliasChange(event: InputEvent & { target: UmbInputWithAliasElement }) {
+ this.#workspaceContext?.setName(event.target.value ?? '');
+ this.#workspaceContext?.setAlias(event.target.alias ?? '');
+ }
+
+ #onDescriptionChange(event: InputEvent & { target: UUITextareaElement }) {
+ this.#workspaceContext?.setDescription(event.target.value.toString() ?? '');
+ }
+
+ override render() {
+ return html`
+ {
}
export interface UmbContentTypeStructureDataSource {
- getAllowedChildrenOf(unique: string | null): Promise>>;
+ getAllowedChildrenOf(unique: string | null, parentContentUnique: string | null): Promise>>;
}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/repository/structure/content-type-structure-repository-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/repository/structure/content-type-structure-repository-base.ts
index 91cddbe518..4d51925ed8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/repository/structure/content-type-structure-repository-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/repository/structure/content-type-structure-repository-base.ts
@@ -23,7 +23,7 @@ export abstract class UmbContentTypeStructureRepositoryBase
* @returns {*}
* @memberof UmbContentTypeStructureRepositoryBase
*/
- requestAllowedChildrenOf(unique: string | null) {
- return this.#structureSource.getAllowedChildrenOf(unique);
+ requestAllowedChildrenOf(unique: string | null, parentContentUnique: string | null) {
+ return this.#structureSource.getAllowedChildrenOf(unique, parentContentUnique);
}
}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/repository/structure/content-type-structure-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/repository/structure/content-type-structure-repository.interface.ts
index 7691800e44..1f74549895 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/repository/structure/content-type-structure-repository.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/repository/structure/content-type-structure-repository.interface.ts
@@ -1,5 +1,5 @@
import type { UmbDataSourceResponse, UmbPagedModel } from '@umbraco-cms/backoffice/repository';
export interface UmbContentTypeStructureRepository {
- requestAllowedChildrenOf(unique: string): Promise>>;
+ requestAllowedChildrenOf(unique: string, parentContentUnique: string | null): Promise>>;
}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/repository/structure/content-type-structure-server-data-source-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/repository/structure/content-type-structure-server-data-source-base.ts
index e3294c5283..3ce3d6ae67 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/repository/structure/content-type-structure-server-data-source-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/repository/structure/content-type-structure-server-data-source-base.ts
@@ -16,7 +16,7 @@ export interface UmbContentTypeStructureServerDataSourceBaseArgs<
ServerItemType extends AllowedContentTypeBaseModel,
ClientItemType extends UmbEntityModel,
> {
- getAllowedChildrenOf: (unique: string | null) => Promise>;
+ getAllowedChildrenOf: (unique: string | null, parentContentUnique: string | null) => Promise>;
mapper: (item: ServerItemType) => ClientItemType;
}
@@ -50,8 +50,8 @@ export abstract class UmbContentTypeStructureServerDataSourceBase<
* @returns {*}
* @memberof UmbContentTypeStructureServerDataSourceBase
*/
- async getAllowedChildrenOf(unique: string | null) {
- const { data, error } = await tryExecuteAndNotify(this.#host, this.#getAllowedChildrenOf(unique));
+ async getAllowedChildrenOf(unique: string | null, parentContentUnique: string | null) {
+ const { data, error } = await tryExecuteAndNotify(this.#host, this.#getAllowedChildrenOf(unique, parentContentUnique));
if (data) {
const items = data.items.map((item) => this.#mapper(item));
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/content-type-workspace-context-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/content-type-workspace-context-base.ts
index 74c3f510d1..42fd994550 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/content-type-workspace-context-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/content-type-workspace-context-base.ts
@@ -252,6 +252,14 @@ export abstract class UmbContentTypeWorkspaceContextBase<
this.structure.updateOwnerContentType({ compositions } as Partial);
}
+ /**
+ * Gets the icon of the content type
+ * @returns { string | undefined } The icon of the content type
+ */
+ public getIcon(): string | undefined {
+ return this.structure.getOwnerContentType()?.icon;
+ }
+
// TODO: manage setting icon color alias?
public setIcon(icon: string) {
this.structure.updateOwnerContentType({ icon } as Partial);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/content-type-workspace-context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/content-type-workspace-context.interface.ts
index 1405ff101c..dc529f7980 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/content-type-workspace-context.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/content-type-workspace-context.interface.ts
@@ -8,7 +8,6 @@ export interface UmbContentTypeWorkspaceContext;
- getName(): string | undefined;
readonly alias: Observable;
readonly description: Observable;
readonly icon: Observable;
@@ -22,7 +21,18 @@ export interface UmbContentTypeWorkspaceContext;
+ getAlias(): string | undefined;
setAlias(alias: string): void;
+ getCompositions(): Array | undefined;
setCompositions(compositions: Array): void;
+
+ getDescription(): string | undefined;
+ setDescription(description: string): void;
+
+ getIcon(): string | undefined;
+ setIcon(icon: string): void;
+
+ getName(): string | undefined;
+ setName(name: string): void;
}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/constants.ts
index d60c068006..c6a840d160 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/constants.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/constants.ts
@@ -1 +1,2 @@
export * from './common/constants.js';
+export * from './has-children/constants.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/condition/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/condition/constants.ts
new file mode 100644
index 0000000000..cdfbe5b0b3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/condition/constants.ts
@@ -0,0 +1 @@
+export const UMB_ENTITY_HAS_CHILDREN_CONDITION_ALIAS = 'Umb.Condition.EntityHasChildren';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/condition/entity-has-children.condition-config.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/condition/entity-has-children.condition-config.ts
new file mode 100644
index 0000000000..2c08118a07
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/condition/entity-has-children.condition-config.ts
@@ -0,0 +1,12 @@
+import type { UMB_ENTITY_HAS_CHILDREN_CONDITION_ALIAS } from './constants.js';
+import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api';
+
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
+export interface UmbEntityHasChildrenConditionConfig
+ extends UmbConditionConfigBase {}
+
+declare global {
+ interface UmbExtensionConditionConfigMap {
+ UmbEntityHasChildrenConditionConfig: UmbEntityHasChildrenConditionConfig;
+ }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/condition/entity-has-children.condition.manifest.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/condition/entity-has-children.condition.manifest.ts
new file mode 100644
index 0000000000..ddfde4f2a9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/condition/entity-has-children.condition.manifest.ts
@@ -0,0 +1,9 @@
+import { UMB_ENTITY_HAS_CHILDREN_CONDITION_ALIAS } from './constants.js';
+import type { ManifestCondition } from '@umbraco-cms/backoffice/extension-api';
+
+export const manifest: ManifestCondition = {
+ type: 'condition',
+ name: 'Entity Has Children Condition',
+ alias: UMB_ENTITY_HAS_CHILDREN_CONDITION_ALIAS,
+ api: () => import('./entity-has-children.condition.js'),
+};
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/condition/entity-has-children.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/condition/entity-has-children.condition.ts
new file mode 100644
index 0000000000..cc930c4cf8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/condition/entity-has-children.condition.ts
@@ -0,0 +1,25 @@
+import { UMB_HAS_CHILDREN_ENTITY_CONTEXT } from '../context/has-children.context-token.js';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import type {
+ UmbConditionConfigBase,
+ UmbConditionControllerArguments,
+ UmbExtensionCondition,
+} from '@umbraco-cms/backoffice/extension-api';
+import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry';
+
+export class UmbEntityHasChildrenCondition
+ extends UmbConditionBase
+ implements UmbExtensionCondition
+{
+ constructor(host: UmbControllerHost, args: UmbConditionControllerArguments) {
+ super(host, args);
+
+ this.consumeContext(UMB_HAS_CHILDREN_ENTITY_CONTEXT, (context) => {
+ this.observe(context.hasChildren, (hasChildren) => {
+ this.permitted = hasChildren === true;
+ });
+ });
+ }
+}
+
+export { UmbEntityHasChildrenCondition as api };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/constants.ts
new file mode 100644
index 0000000000..853290d6b2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/constants.ts
@@ -0,0 +1,2 @@
+export * from './condition/constants.js';
+export * from './context/constants.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/context/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/context/constants.ts
new file mode 100644
index 0000000000..137e79f843
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/context/constants.ts
@@ -0,0 +1 @@
+export * from './has-children.context-token.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/context/has-children.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/context/has-children.context-token.ts
new file mode 100644
index 0000000000..a2bb77d5e2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/context/has-children.context-token.ts
@@ -0,0 +1,6 @@
+import type { UmbHasChildrenEntityContext } from './has-children.entity-context.js';
+import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+
+export const UMB_HAS_CHILDREN_ENTITY_CONTEXT = new UmbContextToken(
+ 'UmbHasChildrenEntityContext',
+);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/context/has-children.entity-context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/context/has-children.entity-context.ts
new file mode 100644
index 0000000000..ed8d1c0de9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/context/has-children.entity-context.ts
@@ -0,0 +1,31 @@
+import { UMB_HAS_CHILDREN_ENTITY_CONTEXT } from './has-children.context-token.js';
+import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api';
+
+export class UmbHasChildrenEntityContext extends UmbContextBase {
+ #hasChildren = new UmbBooleanState(undefined);
+ public readonly hasChildren = this.#hasChildren.asObservable();
+
+ constructor(host: UmbControllerHost) {
+ super(host, UMB_HAS_CHILDREN_ENTITY_CONTEXT);
+ }
+
+ /**
+ * Gets the hasChildren state
+ * @returns {boolean} - The hasChildren state
+ * @memberof UmbHasChildrenEntityContext
+ */
+ public getHasChildren(): boolean | undefined {
+ return this.#hasChildren.getValue();
+ }
+
+ /**
+ * Sets the hasChildren state
+ * @param {boolean} hasChildren - The hasChildren state
+ * @memberof UmbHasChildrenEntityContext
+ */
+ public setHasChildren(hasChildren: boolean) {
+ this.#hasChildren.setValue(hasChildren);
+ }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/context/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/context/index.ts
new file mode 100644
index 0000000000..0b119e565c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/context/index.ts
@@ -0,0 +1 @@
+export * from './has-children.entity-context.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/index.ts
new file mode 100644
index 0000000000..00c55032bc
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/index.ts
@@ -0,0 +1 @@
+export * from './context/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/manifests.ts
new file mode 100644
index 0000000000..e3b60432b4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/manifests.ts
@@ -0,0 +1,4 @@
+import { manifest as conditionManifest } from './condition/entity-has-children.condition.manifest.js';
+import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
+
+export const manifests: Array = [conditionManifest];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/index.ts
index 886f167a42..2104b5fe36 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/index.ts
@@ -5,8 +5,10 @@ export * from './constants.js';
export * from './entity-action-base.js';
export * from './entity-action-list.element.js';
export * from './entity-action.event.js';
+export * from './has-children/index.js';
export * from './entity-updated.event.js';
export * from './entity-deleted.event.js';
+
export type * from './types.js';
export { UmbRequestReloadStructureForEntityEvent } from './request-reload-structure-for-entity.event.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/manifests.ts
index 7d6813e49a..66347b90e6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/manifests.ts
@@ -2,6 +2,7 @@ import { manifests as createEntityActionManifests } from './common/create/manife
import { manifests as defaultEntityActionManifests } from './default/manifests.js';
import { manifests as deleteEntityActionManifests } from './common/delete/manifests.js';
import { manifests as duplicateEntityActionManifests } from './common/duplicate/manifests.js';
+import { manifests as hasChildrenManifests } from './has-children/manifests.js';
import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
@@ -10,4 +11,5 @@ export const manifests: Array =
...defaultEntityActionManifests,
...deleteEntityActionManifests,
...duplicateEntityActionManifests,
+ ...hasChildrenManifests,
];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/tree/tree-item/recycle-bin-tree-item.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/tree/tree-item/recycle-bin-tree-item.context.ts
index ff1156ed0b..c0091158e8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/tree/tree-item/recycle-bin-tree-item.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/tree/tree-item/recycle-bin-tree-item.context.ts
@@ -35,7 +35,7 @@ export class UmbRecycleBinTreeItemContext<
const supportedEntityTypes = this.getManifest()?.meta.supportedEntityTypes;
if (!supportedEntityTypes) {
- throw new Error('Supported entity types are missing from the manifest. (manifest.meta.supportedEntityTypes)');
+ throw new Error('Entity types are missing from the manifest (manifest.meta.supportedEntityTypes).');
}
if (supportedEntityTypes.includes(entityType)) {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/delete-folder/delete-folder.action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/delete-folder/delete-folder.action.ts
index f076800505..4947ccee23 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/delete-folder/delete-folder.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/delete-folder/delete-folder.action.ts
@@ -40,7 +40,7 @@ export class UmbDeleteFolderEntityAction extends UmbEntityActionBase 0);
+ const hasChildren = data.total > 0;
+ this.#hasChildren.setValue(hasChildren);
+ this.#hasChildrenContext.setHasChildren(hasChildren);
+
this.pagination.setTotalItems(data.total);
}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/workspace-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/workspace-action-menu.element.ts
index 9f1e456f55..5085ef7a3c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/workspace-action-menu.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/workspace-action-menu.element.ts
@@ -27,34 +27,32 @@ export class UmbWorkspaceActionMenuElement extends UmbLitElement {
}
override render() {
- return this.items?.length
- ? html`
-
-
-
-
-
- ${repeat(
- this.items,
- (ext) => ext.alias,
- (ext) => ext.component,
- )}
-
-
-
- `
- : nothing;
+ if (!this.items?.length) return nothing;
+
+ return html`
+
+
+
+
+ ${repeat(
+ this.items,
+ (ext) => ext.alias,
+ (ext) => ext.component,
+ )}
+
+
+ `;
}
static override styles = [
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/workspace-action-default-kind.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/workspace-action-default-kind.element.ts
index 166a57e22f..54b4a164dd 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/workspace-action-default-kind.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/workspace-action-default-kind.element.ts
@@ -13,6 +13,7 @@ import {
type UmbExtensionElementAndApiInitializer,
UmbExtensionsElementAndApiInitializer,
} from '@umbraco-cms/backoffice/extension-api';
+import { stringOrStringArrayIntersects } from '@umbraco-cms/backoffice/utils';
import '../../workspace-action-menu/index.js';
@@ -38,7 +39,6 @@ export class UmbWorkspaceActionElement<
this._href = value?.meta.href;
this._additionalOptions = value?.meta.additionalOptions;
this.#createAliases();
- this.requestUpdate('manifest', oldValue);
}
}
public get manifest() {
@@ -90,7 +90,10 @@ export class UmbWorkspaceActionElement<
// TODO: This works on one level for now, which will be enough for the current use case. However, you can overwrite the overwrites, so we need to make this recursive. Perhaps we could move this to the extensions initializer.
// Add overwrites so that we can show any previously registered actions on the original workspace action
if (this.#manifest.overwrites) {
- for (const alias of this.#manifest.overwrites) {
+ const overwrites = Array.isArray(this.#manifest.overwrites)
+ ? this.#manifest.overwrites
+ : [this.#manifest.overwrites];
+ for (const alias of overwrites) {
aliases.add(alias);
}
}
@@ -145,11 +148,7 @@ export class UmbWorkspaceActionElement<
umbExtensionsRegistry,
'workspaceActionMenuItem',
ExtensionApiArgsMethod,
- (action) => {
- return Array.isArray(action.forWorkspaceActions)
- ? action.forWorkspaceActions.some((alias) => aliases.includes(alias))
- : aliases.includes(action.forWorkspaceActions);
- },
+ (action) => stringOrStringArrayIntersects(action.forWorkspaceActions, aliases),
(extensionControllers) => {
this._items = extensionControllers;
},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts
index 33e757f4b9..993986e58e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts
@@ -227,14 +227,35 @@ export class UmbDataTypeWorkspaceContext
const data = this._data.getCurrent();
if (!data) return;
+ // We are going to transfer the default data from the schema and the UI (the UI can override the schema data).
+ // Let us figure out which editors are alike from the inherited data, so we can keep that data around and only transfer the data that is not
+ // inherited from the previous data type.
this.#settingsDefaultData = [
...this.#propertyEditorSchemaSettingsDefaultData,
...this.#propertyEditorUISettingsDefaultData,
] satisfies Array;
- // We check for satisfied type, because we will be directly transferring them to become value. Future note, if they are not satisfied, we need to transfer alias and value. [NL]
- this._data.updatePersisted({ values: this.#settingsDefaultData });
- this._data.updateCurrent({ values: this.#settingsDefaultData });
+ const values: Array = [];
+
+ // We want to keep the existing data, if it is not in the default data, and if it is in the default data, then we want to keep the default data.
+ for (const defaultDataItem of this.#properties.getValue()) {
+ // We are matching on the alias, as we assume that the alias is unique for the data type.
+ // TODO: Consider if we should also match on the editorAlias just to be on the safe side [JOV]
+ const existingData = data.values?.find((x) => x.alias === defaultDataItem.alias);
+ if (existingData) {
+ values.push(existingData);
+ continue;
+ }
+
+ // If the data is not in the existing data, then we want to add the default data if it exists.
+ const existingDefaultData = this.#settingsDefaultData.find((x) => x.alias === defaultDataItem.alias);
+ if (existingDefaultData) {
+ values.push(existingDefaultData);
+ }
+ }
+
+ this._data.updatePersisted({ values });
+ this._data.updateCurrent({ values });
}
public getPropertyDefaultValue(alias: string) {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/import/import-dictionary-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/import/import-dictionary-modal.element.ts
index 9e4f850bb3..cb8b9f1186 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/import/import-dictionary-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/import/import-dictionary-modal.element.ts
@@ -175,14 +175,14 @@ export class UmbImportDictionaryModalLayout extends UmbModalBaseElement<
`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/structure/document-type-structure.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/structure/document-type-structure.server.data-source.ts
index 808fd08c6b..7fe5488195 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/structure/document-type-structure.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/structure/document-type-structure.server.data-source.ts
@@ -7,7 +7,7 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
/**
*
-
+
* @class UmbDocumentTypeStructureServerDataSource
* @augments {UmbContentTypeStructureServerDataSourceBase}
*/
@@ -20,10 +20,10 @@ export class UmbDocumentTypeStructureServerDataSource extends UmbContentTypeStru
}
}
-const getAllowedChildrenOf = (unique: string | null) => {
+const getAllowedChildrenOf = (unique: string | null, parentContentUnique: string | null) => {
if (unique) {
// eslint-disable-next-line local-rules/no-direct-api-import
- return DocumentTypeService.getDocumentTypeByIdAllowedChildren({ id: unique });
+ return DocumentTypeService.getDocumentTypeByIdAllowedChildren({ id: unique, parentContentKey: parentContentUnique ?? undefined });
} else {
// eslint-disable-next-line local-rules/no-direct-api-import
return DocumentTypeService.getDocumentTypeAllowedAtRoot({});
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type/document-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type/document-type-workspace-editor.element.ts
index be615b0227..64fa61eb29 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type/document-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type/document-type-workspace-editor.element.ts
@@ -1,110 +1,12 @@
-import { UMB_DOCUMENT_TYPE_WORKSPACE_CONTEXT } from './document-type-workspace.context-token.js';
-import type { UmbInputWithAliasElement } from '@umbraco-cms/backoffice/components';
-import { umbFocus, UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
-import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
-import { UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/icon';
-import type { UUITextareaElement } from '@umbraco-cms/backoffice/external/uui';
-import { umbBindToValidation } from '@umbraco-cms/backoffice/validation';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit';
@customElement('umb-document-type-workspace-editor')
export class UmbDocumentTypeWorkspaceEditorElement extends UmbLitElement {
- @state()
- private _name?: string;
-
- @state()
- private _alias?: string;
-
- @state()
- private _description?: string;
-
- @state()
- private _icon?: string;
-
- @state()
- private _isNew?: boolean;
-
- #workspaceContext?: typeof UMB_DOCUMENT_TYPE_WORKSPACE_CONTEXT.TYPE;
-
- constructor() {
- super();
-
- this.consumeContext(UMB_DOCUMENT_TYPE_WORKSPACE_CONTEXT, (instance) => {
- this.#workspaceContext = instance;
- this.#observeDocumentType();
- });
- }
-
- #observeDocumentType() {
- if (!this.#workspaceContext) return;
- this.observe(this.#workspaceContext.name, (name) => (this._name = name), '_observeName');
- this.observe(this.#workspaceContext.alias, (alias) => (this._alias = alias), '_observeAlias');
- this.observe(
- this.#workspaceContext.description,
- (description) => (this._description = description),
- '_observeDescription',
- );
- this.observe(this.#workspaceContext.icon, (icon) => (this._icon = icon), '_observeIcon');
- this.observe(this.#workspaceContext.isNew, (isNew) => (this._isNew = isNew), '_observeIsNew');
- }
-
- private async _handleIconClick() {
- const [alias, color] = this._icon?.replace('color-', '')?.split(' ') ?? [];
- const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
- const modalContext = modalManager.open(this, UMB_ICON_PICKER_MODAL, {
- value: {
- icon: alias,
- color: color,
- },
- });
-
- modalContext?.onSubmit().then((saved) => {
- if (saved.icon && saved.color) {
- this.#workspaceContext?.setIcon(`${saved.icon} color-${saved.color}`);
- } else if (saved.icon) {
- this.#workspaceContext?.setIcon(saved.icon);
- }
- });
- }
-
- #onNameAndAliasChange(event: InputEvent & { target: UmbInputWithAliasElement }) {
- this.#workspaceContext?.setName(event.target.value ?? '');
- this.#workspaceContext?.setAlias(event.target.alias ?? '');
- }
-
- #onDescriptionChange(event: InputEvent & { target: UUITextareaElement }) {
- this.#workspaceContext?.setDescription(event.target.value.toString() ?? '');
- }
-
override render() {
return html`
-
`;
}
@@ -116,39 +18,6 @@ export class UmbDocumentTypeWorkspaceEditorElement extends UmbLitElement {
width: 100%;
height: 100%;
}
-
- #header {
- display: flex;
- flex: 1 1 auto;
- gap: var(--uui-size-space-2);
- }
-
- #editors {
- display: flex;
- flex: 1 1 auto;
- flex-direction: column;
- gap: var(--uui-size-space-1);
- }
-
- #name {
- width: 100%;
- }
-
- #description {
- width: 100%;
- --uui-input-height: var(--uui-size-8);
- --uui-input-border-color: transparent;
- }
-
- #description:hover {
- --uui-input-border-color: var(--uui-color-border);
- }
-
- #icon {
- font-size: var(--uui-size-8);
- height: 60px;
- width: 60px;
- }
`,
];
}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/create-document-collection-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/create-document-collection-action.element.ts
index 25b50fd7d8..b3cf273c8f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/create-document-collection-action.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/create-document-collection-action.element.ts
@@ -56,12 +56,12 @@ export class UmbCreateDocumentCollectionActionElement extends UmbLitElement {
override async firstUpdated() {
if (this._documentTypeUnique) {
- this.#retrieveAllowedDocumentTypesOf(this._documentTypeUnique);
+ this.#retrieveAllowedDocumentTypesOf(this._documentTypeUnique, this._documentUnique || null);
}
}
- async #retrieveAllowedDocumentTypesOf(unique: string | null) {
- const { data } = await this.#documentTypeStructureRepository.requestAllowedChildrenOf(unique);
+ async #retrieveAllowedDocumentTypesOf(unique: string | null, parentContentUnique: string | null) {
+ const { data } = await this.#documentTypeStructureRepository.requestAllowedChildrenOf(unique, parentContentUnique);
if (data && data.items) {
this._allowedDocumentTypes = data.items;
@@ -69,7 +69,7 @@ export class UmbCreateDocumentCollectionActionElement extends UmbLitElement {
}
#onPopoverToggle(event: ToggleEvent) {
- // TODO: This ignorer is just neede for JSON SCHEMA TO WORK, As its not updated with latest TS jet.
+ // TODO: This ignorer is just needed for JSON SCHEMA TO WORK, As its not updated with latest TS jet.
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
this._popoverOpen = event.newState === 'open';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/document-create-options-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/document-create-options-modal.element.ts
index 1dbf684c99..7418d23371 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/document-create-options-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/document-create-options-modal.element.ts
@@ -47,15 +47,15 @@ export class UmbDocumentCreateOptionsModalElement extends UmbModalBaseElement<
const parentUnique = this.data?.parent.unique;
const documentTypeUnique = this.data?.documentType?.unique || null;
- this.#retrieveAllowedDocumentTypesOf(documentTypeUnique);
+ this.#retrieveAllowedDocumentTypesOf(documentTypeUnique, parentUnique || null);
if (parentUnique) {
this.#retrieveHeadline(parentUnique);
}
}
- async #retrieveAllowedDocumentTypesOf(unique: string | null) {
- const { data } = await this.#documentTypeStructureRepository.requestAllowedChildrenOf(unique);
+ async #retrieveAllowedDocumentTypesOf(unique: string | null, parentContentUnique: string | null) {
+ const { data } = await this.#documentTypeStructureRepository.requestAllowedChildrenOf(unique, parentContentUnique);
if (data) {
// TODO: implement pagination, or get 1000?
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/manifests.ts
index 6c4cf7b4b2..cc11edeb22 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/manifests.ts
@@ -12,6 +12,7 @@ import {
UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS,
UMB_ENTITY_IS_TRASHED_CONDITION_ALIAS,
} from '@umbraco-cms/backoffice/recycle-bin';
+import { UMB_ENTITY_HAS_CHILDREN_CONDITION_ALIAS } from '@umbraco-cms/backoffice/entity-action';
export const manifests: Array = [
{
@@ -70,6 +71,9 @@ export const manifests: Array = [
alias: 'Umb.Condition.UserPermission.Document',
allOf: [UMB_USER_PERMISSION_DOCUMENT_DELETE],
},
+ {
+ alias: UMB_ENTITY_HAS_CHILDREN_CONDITION_ALIAS,
+ },
],
},
...bulkTrashManifests,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/rollback/entity-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/rollback/entity-action/manifests.ts
index 2f736381e6..24b0612e07 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/rollback/entity-action/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/rollback/entity-action/manifests.ts
@@ -13,6 +13,7 @@ export const manifests: Array = [
meta: {
icon: 'icon-history',
label: '#actions_rollback',
+ additionalOptions: true,
},
conditions: [
{
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
index 547247c7b7..2134817942 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
@@ -35,7 +35,7 @@ import {
import type { UmbDocumentTypeDetailModel } from '@umbraco-cms/backoffice/document-type';
import { UmbIsTrashedEntityContext } from '@umbraco-cms/backoffice/recycle-bin';
import { UMB_APP_CONTEXT } from '@umbraco-cms/backoffice/app';
-import { UmbDeprecation } from '@umbraco-cms/backoffice/utils';
+import { ensurePathEndsWithSlash, UmbDeprecation } from '@umbraco-cms/backoffice/utils';
import { createExtensionApiByAlias } from '@umbraco-cms/backoffice/extension-registry';
type ContentModel = UmbDocumentDetailModel;
@@ -289,7 +289,8 @@ export class UmbDocumentWorkspaceContext
const appContext = await this.getContext(UMB_APP_CONTEXT);
- const previewUrl = new URL(appContext.getBackofficePath() + '/preview', appContext.getServerUrl());
+ const backofficePath = appContext.getBackofficePath();
+ const previewUrl = new URL(ensurePathEndsWithSlash(backofficePath) + 'preview', appContext.getServerUrl());
previewUrl.searchParams.set('id', unique);
if (culture && culture !== UMB_INVARIANT_CULTURE) {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts
index b6d36b6003..54bc10cf90 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts
@@ -70,7 +70,7 @@ export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement {
return html`
From:
- {
(e.target as HTMLInputElement).showPicker();
}}
@@ -78,11 +78,11 @@ export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement {
type="date"
label="From"
.max=${this.#logViewerContext?.today ?? ''}
- .value=${this._startDate} />
+ .value=${this._startDate}>
To:
- {
(e.target as HTMLInputElement).showPicker();
}}
@@ -91,7 +91,7 @@ export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement {
label="To"
.min=${this._startDate}
.max=${this.#logViewerContext?.today ?? ''}
- .value=${this._endDate} />
+ .value=${this._endDate}>
`;
}
@@ -104,30 +104,14 @@ export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement {
flex-direction: column;
gap: var(--uui-size-space-3);
}
-
- input {
- font-family: inherit;
- padding: var(--uui-size-1) var(--uui-size-space-3);
- font-size: inherit;
- color: inherit;
- border-radius: 0;
- box-sizing: border-box;
- border: none;
- background: none;
+ umb-input-date {
width: 100%;
- outline: none;
- position: relative;
- border-bottom: 2px solid transparent;
- }
-
- /* find out better validation for that */
- input:out-of-range {
- border-color: var(--uui-color-danger);
}
:host([horizontal]) .input-container {
display: flex;
align-items: baseline;
+ gap: var(--uui-size-space-3);
}
`,
];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-level-tag.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-level-tag.element.ts
index c360fa7b2e..8b84e93388 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-level-tag.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-level-tag.element.ts
@@ -24,7 +24,7 @@ export class UmbLogViewerLevelTagElement extends LitElement {
Error: { look: 'primary', color: 'danger' },
Fatal: {
look: 'primary',
- style: 'background-color: var(--umb-log-viewer-fatal-color); color: var(--uui-color-surface)',
+ style: 'background-color: var(--umb-log-viewer-fatal-color)',
},
};
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/structure/media-type-structure.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/structure/media-type-structure.server.data-source.ts
index c3c2f927f6..d2384cdde3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/structure/media-type-structure.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/structure/media-type-structure.server.data-source.ts
@@ -26,10 +26,10 @@ export class UmbMediaTypeStructureServerDataSource extends UmbContentTypeStructu
}
}
-const getAllowedChildrenOf = (unique: string | null) => {
+const getAllowedChildrenOf = (unique: string | null, parentContentUnique: string | null) => {
if (unique) {
// eslint-disable-next-line local-rules/no-direct-api-import
- return MediaTypeService.getMediaTypeByIdAllowedChildren({ id: unique });
+ return MediaTypeService.getMediaTypeByIdAllowedChildren({ id: unique, parentContentKey: parentContentUnique ?? undefined });
} else {
// eslint-disable-next-line local-rules/no-direct-api-import
return MediaTypeService.getMediaTypeAllowedAtRoot({});
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts
index 10c68fbe84..8a9fe04b18 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts
@@ -1,112 +1,12 @@
-import type { UmbMediaTypeWorkspaceContext } from './media-type-workspace.context.js';
-import { UMB_MEDIA_TYPE_WORKSPACE_CONTEXT } from './media-type-workspace.context-token.js';
-import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
-import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
-import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
-import { UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/icon';
-import type { UmbInputWithAliasElement } from '@umbraco-cms/backoffice/components';
-import type { UUITextareaElement } from '@umbraco-cms/backoffice/external/uui';
+import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
@customElement('umb-media-type-workspace-editor')
export class UmbMediaTypeWorkspaceEditorElement extends UmbLitElement {
- @state()
- private _name?: string;
-
- @state()
- private _description?: string;
-
- @state()
- private _alias?: string;
-
- @state()
- private _aliasLocked = true;
-
- @state()
- private _icon?: string;
-
- @state()
- private _isNew?: boolean;
-
- #workspaceContext?: UmbMediaTypeWorkspaceContext;
-
- constructor() {
- super();
-
- this.consumeContext(UMB_MEDIA_TYPE_WORKSPACE_CONTEXT, (context) => {
- this.#workspaceContext = context;
- this.#observeMediaType();
- });
- }
-
- #observeMediaType() {
- if (!this.#workspaceContext) return;
- this.observe(this.#workspaceContext.name, (name) => (this._name = name), '_observeName');
- this.observe(
- this.#workspaceContext.description,
- (description) => (this._description = description),
- '_observeDescription',
- );
- this.observe(this.#workspaceContext.alias, (alias) => (this._alias = alias), '_observeAlias');
- this.observe(this.#workspaceContext.icon, (icon) => (this._icon = icon), '_observeIcon');
- this.observe(this.#workspaceContext.isNew, (isNew) => (this._isNew = isNew), '_observeIsNew');
- }
-
- private async _handleIconClick() {
- const [alias, color] = this._icon?.replace('color-', '')?.split(' ') ?? [];
-
- const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
- const modalContext = modalManager.open(this, UMB_ICON_PICKER_MODAL, {
- value: {
- icon: alias,
- color: color,
- },
- });
-
- modalContext?.onSubmit().then((saved) => {
- if (saved.icon && saved.color) {
- this.#workspaceContext?.setIcon(`${saved.icon} color-${saved.color}`);
- } else if (saved.icon) {
- this.#workspaceContext?.setIcon(saved.icon);
- }
- });
- }
-
- #onNameAndAliasChange(event: InputEvent & { target: UmbInputWithAliasElement }) {
- this.#workspaceContext?.setName(event.target.value ?? '');
- this.#workspaceContext?.setAlias(event.target.alias ?? '');
- }
-
- #onDescriptionChange(event: InputEvent & { target: UUITextareaElement }) {
- this.#workspaceContext?.setDescription(event.target.value.toString() ?? '');
- }
-
override render() {
return html`
-
`;
}
@@ -118,39 +18,6 @@ export class UmbMediaTypeWorkspaceEditorElement extends UmbLitElement {
width: 100%;
height: 100%;
}
-
- #header {
- display: flex;
- flex: 1 1 auto;
- gap: var(--uui-size-space-2);
- }
-
- #editors {
- display: flex;
- flex: 1 1 auto;
- flex-direction: column;
- gap: var(--uui-size-space-1);
- }
-
- #name {
- width: 100%;
- }
-
- #description {
- width: 100%;
- --uui-input-height: var(--uui-size-8);
- --uui-input-border-color: transparent;
- }
-
- #description:hover {
- --uui-input-border-color: var(--uui-color-border);
- }
-
- #icon {
- font-size: var(--uui-size-8);
- height: 60px;
- width: 60px;
- }
`,
];
}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/action/create-media-collection-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/action/create-media-collection-action.element.ts
index 1272eb50e1..0e05d732fc 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/action/create-media-collection-action.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/action/create-media-collection-action.element.ts
@@ -53,11 +53,11 @@ export class UmbCreateMediaCollectionActionElement extends UmbLitElement {
}
override async firstUpdated() {
- this.#retrieveAllowedMediaTypesOf(this._mediaTypeUnique ?? '');
+ this.#retrieveAllowedMediaTypesOf(this._mediaTypeUnique ?? '', this._mediaUnique || null);
}
- async #retrieveAllowedMediaTypesOf(unique: string | null) {
- const { data } = await this.#mediaTypeStructureRepository.requestAllowedChildrenOf(unique);
+ async #retrieveAllowedMediaTypesOf(unique: string | null, parentContentUnique: string | null) {
+ const { data } = await this.#mediaTypeStructureRepository.requestAllowedChildrenOf(unique, parentContentUnique);
if (data && data.items) {
this._allowedMediaTypes = data.items;
}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/dropzone/dropzone-manager.class.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/dropzone/dropzone-manager.class.ts
index 4a1bc9e3c6..b58069b537 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/dropzone/dropzone-manager.class.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/dropzone/dropzone-manager.class.ts
@@ -226,7 +226,7 @@ export class UmbDropzoneManager extends UmbControllerBase {
async #getMediaTypeOptions(item: UmbUploadableItem): Promise> {
// Check the parent which children media types are allowed
const parent = item.parentUnique ? await this.#mediaDetailRepository.requestByUnique(item.parentUnique) : null;
- const allowedChildren = await this.#getAllowedChildrenOf(parent?.data?.mediaType.unique ?? null);
+ const allowedChildren = await this.#getAllowedChildrenOf(parent?.data?.mediaType.unique ?? null, item.parentUnique);
const extension = item.temporaryFile?.file.name.split('.').pop() ?? null;
@@ -255,7 +255,7 @@ export class UmbDropzoneManager extends UmbControllerBase {
return availableMediaTypes;
}
- async #getAllowedChildrenOf(mediaTypeUnique: string | null) {
+ async #getAllowedChildrenOf(mediaTypeUnique: string | null, parentUnique: string | null) {
//Check if we already got information on this media type.
const allowed = this.#allowedChildrenOf
.getValue()
@@ -263,7 +263,7 @@ export class UmbDropzoneManager extends UmbControllerBase {
if (allowed) return allowed;
// Request information on this media type.
- const { data } = await this.#mediaTypeStructure.requestAllowedChildrenOf(mediaTypeUnique);
+ const { data } = await this.#mediaTypeStructure.requestAllowedChildrenOf(mediaTypeUnique, parentUnique);
if (!data) throw new Error('Parent media type does not exists');
this.#allowedChildrenOf.appendOne({ mediaTypeUnique, allowedChildren: data.items });
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/media-create-options-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/media-create-options-modal.element.ts
index f25c1b5759..a7e3fd544f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/media-create-options-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/media-create-options-modal.element.ts
@@ -26,15 +26,15 @@ export class UmbMediaCreateOptionsModalElement extends UmbModalBaseElement<
const mediaUnique = this.data?.parent.unique;
const mediaTypeUnique = this.data?.mediaType?.unique || null;
- this.#retrieveAllowedMediaTypesOf(mediaTypeUnique);
+ this.#retrieveAllowedMediaTypesOf(mediaTypeUnique, mediaUnique || null);
if (mediaUnique) {
this.#retrieveHeadline(mediaUnique);
}
}
- async #retrieveAllowedMediaTypesOf(unique: string | null) {
- const { data } = await this.#mediaTypeStructureRepository.requestAllowedChildrenOf(unique);
+ async #retrieveAllowedMediaTypesOf(unique: string | null, parentContentUnique: string | null) {
+ const { data } = await this.#mediaTypeStructureRepository.requestAllowedChildrenOf(unique, parentContentUnique);
if (data) {
// TODO: implement pagination, or get 1000?
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/components/media-picker-create-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/components/media-picker-create-item.element.ts
index 0b45165f4c..4c5d7cce3b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/components/media-picker-create-item.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/components/media-picker-create-item.element.ts
@@ -36,7 +36,7 @@ export class UmbMediaPickerCreateItemElement extends UmbLitElement {
async #getAllowedMediaTypes() {
const mediaType = await this.#getNodeMediaType();
- const { data: allowedMediaTypes } = await this.#mediaTypeStructure.requestAllowedChildrenOf(mediaType);
+ const { data: allowedMediaTypes } = await this.#mediaTypeStructure.requestAllowedChildrenOf(mediaType, this._node);
this._allowedMediaTypes = allowedMediaTypes?.items ?? [];
}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/recycle-bin/entity-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/recycle-bin/entity-action/manifests.ts
index 65b3693975..144684b99c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/recycle-bin/entity-action/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/recycle-bin/entity-action/manifests.ts
@@ -6,6 +6,7 @@ import {
import { UMB_MEDIA_RECYCLE_BIN_ROOT_ENTITY_TYPE, UMB_MEDIA_RECYCLE_BIN_REPOSITORY_ALIAS } from '../constants.js';
import { UMB_MEDIA_REFERENCE_REPOSITORY_ALIAS } from '../../reference/constants.js';
import { manifests as bulkTrashManifests } from './bulk-trash/manifests.js';
+import { UMB_ENTITY_HAS_CHILDREN_CONDITION_ALIAS } from '@umbraco-cms/backoffice/entity-action';
import {
UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS,
UMB_ENTITY_IS_TRASHED_CONDITION_ALIAS,
@@ -55,6 +56,11 @@ export const manifests: Array = [
meta: {
recycleBinRepositoryAlias: UMB_MEDIA_RECYCLE_BIN_REPOSITORY_ALIAS,
},
+ conditions: [
+ {
+ alias: UMB_ENTITY_HAS_CHILDREN_CONDITION_ALIAS,
+ },
+ ],
},
...bulkTrashManifests,
];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/member-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/member-type-workspace-editor.element.ts
index 521a3a54c5..af1dc269e9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/member-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/member-type-workspace-editor.element.ts
@@ -1,107 +1,12 @@
-import { UMB_MEMBER_TYPE_WORKSPACE_CONTEXT } from './member-type-workspace.context-token.js';
-import type { UmbInputWithAliasElement } from '@umbraco-cms/backoffice/components';
-import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
-import type { UUITextareaElement } from '@umbraco-cms/backoffice/external/uui';
-import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
-import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
-import { UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/icon';
+import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
@customElement('umb-member-type-workspace-editor')
export class UmbMemberTypeWorkspaceEditorElement extends UmbLitElement {
- @state()
- private _name?: string;
-
- @state()
- private _description?: string;
-
- @state()
- private _alias?: string;
-
- @state()
- private _icon?: string;
-
- @state()
- private _isNew?: boolean;
-
- #workspaceContext?: typeof UMB_MEMBER_TYPE_WORKSPACE_CONTEXT.TYPE;
-
- constructor() {
- super();
-
- this.consumeContext(UMB_MEMBER_TYPE_WORKSPACE_CONTEXT, (instance) => {
- this.#workspaceContext = instance;
- this.#observeMemberType();
- });
- }
-
- #observeMemberType() {
- if (!this.#workspaceContext) return;
- this.observe(this.#workspaceContext.name, (name) => (this._name = name), '_observeName');
- this.observe(
- this.#workspaceContext.description,
- (description) => (this._description = description),
- '_observeDescription',
- );
- this.observe(this.#workspaceContext.alias, (alias) => (this._alias = alias), '_observeAlias');
- this.observe(this.#workspaceContext.icon, (icon) => (this._icon = icon), '_observeIcon');
- this.observe(this.#workspaceContext.isNew, (isNew) => (this._isNew = isNew), '_observeIsNew');
- }
-
- private async _handleIconClick() {
- const [alias, color] = this._icon?.replace('color-', '')?.split(' ') ?? [];
- const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
- const modalContext = modalManager.open(this, UMB_ICON_PICKER_MODAL, {
- value: {
- icon: alias,
- color: color,
- },
- });
-
- modalContext?.onSubmit().then((saved) => {
- if (saved.icon && saved.color) {
- this.#workspaceContext?.set('icon', `${saved.icon} color-${saved.color}`);
- } else if (saved.icon) {
- this.#workspaceContext?.set('icon', saved.icon);
- }
- });
- }
-
- #onNameAndAliasChange(event: InputEvent & { target: UmbInputWithAliasElement }) {
- this.#workspaceContext?.setName(event.target.value ?? '');
- this.#workspaceContext?.setAlias(event.target.alias ?? '');
- }
-
- #onDescriptionChange(event: InputEvent & { target: UUITextareaElement }) {
- this.#workspaceContext?.setDescription(event.target.value.toString() ?? '');
- }
-
override render() {
return html`
-
`;
}
@@ -113,51 +18,6 @@ export class UmbMemberTypeWorkspaceEditorElement extends UmbLitElement {
width: 100%;
height: 100%;
}
-
- #header {
- display: flex;
- flex: 1 1 auto;
- gap: var(--uui-size-space-2);
- }
-
- #editors {
- display: flex;
- flex: 1 1 auto;
- flex-direction: column;
- gap: var(--uui-size-space-1);
- }
-
- #name {
- width: 100%;
- flex: 1 1 auto;
- align-items: center;
- }
-
- #description {
- width: 100%;
- --uui-input-height: var(--uui-size-8);
- --uui-input-border-color: transparent;
- }
-
- #description:hover {
- --uui-input-border-color: var(--uui-color-border);
- }
-
- #alias-lock {
- display: flex;
- align-items: center;
- justify-content: center;
- cursor: pointer;
- }
- #alias-lock uui-icon {
- margin-bottom: 2px;
- }
-
- #icon {
- font-size: var(--uui-size-8);
- height: 60px;
- width: 60px;
- }
`,
];
}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/link-picker-modal/link-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/link-picker-modal/link-picker-modal.element.ts
index 2ef18e11f1..f47fe571ae 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/link-picker-modal/link-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/link-picker-modal/link-picker-modal.element.ts
@@ -69,7 +69,7 @@ export class UmbLinkPickerModalElement extends UmbModalBaseElement x.unique).filter((x) => x && !isUmbracoFolder(x)) as Array) ?? [];
}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/publish-cache/dashboard-published-status.element.ts b/src/Umbraco.Web.UI.Client/src/packages/publish-cache/dashboard-published-status.element.ts
index eeead01e78..f05a6bf488 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/publish-cache/dashboard-published-status.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/publish-cache/dashboard-published-status.element.ts
@@ -14,6 +14,8 @@ export class UmbDashboardPublishedStatusElement extends UmbLitElement {
@state()
private _buttonStateRebuild: UUIButtonState = undefined;
+ #isFirstRebuildStatusPoll: boolean = true;
+
//Reload
private async _reloadMemoryCache() {
this._buttonStateReload = 'waiting';
@@ -37,12 +39,31 @@ export class UmbDashboardPublishedStatusElement extends UmbLitElement {
// Rebuild
private async _rebuildDatabaseCache() {
+
this._buttonStateRebuild = 'waiting';
const { error } = await tryExecuteAndNotify(this, PublishedCacheService.postPublishedCacheRebuild());
if (error) {
this._buttonStateRebuild = 'failed';
} else {
- this._buttonStateRebuild = 'success';
+ this.#isFirstRebuildStatusPoll = true;
+ this._pollForRebuildDatabaseCacheStatus();
+ }
+ }
+
+ private async _pollForRebuildDatabaseCacheStatus() {
+ //Checking the server after 1 second and then every 5 seconds to see if the database cache is still rebuilding.
+ while (this._buttonStateRebuild === 'waiting') {
+ await new Promise((resolve) => setTimeout(resolve, this.#isFirstRebuildStatusPoll ? 1000 : 5000));
+ this.#isFirstRebuildStatusPoll = false;
+ const { data, error } = await tryExecuteAndNotify(this, PublishedCacheService.getPublishedCacheRebuildStatus());
+ if (error || !data) {
+ this._buttonStateRebuild = 'failed';
+ return;
+ }
+
+ if (!data.isRebuilding) {
+ this._buttonStateRebuild = 'success';
+ }
}
}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/toolbar/tiptap-toolbar-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/toolbar/tiptap-toolbar-menu.element.ts
index e30cc9aefc..089ac20ade 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/toolbar/tiptap-toolbar-menu.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/toolbar/tiptap-toolbar-menu.element.ts
@@ -129,7 +129,7 @@ export class UmbTiptapToolbarMenuElement extends UmbLitElement {
`,
() => html`
-
+
${label}
@@ -146,11 +146,12 @@ export class UmbTiptapToolbarMenuElement extends UmbLitElement {
--uui-button-font-weight: normal;
--uui-menu-item-flat-structure: 1;
- margin-inline-start: var(--uui-size-space-1);
+ margin-left: var(--uui-size-space-1);
+ margin-bottom: var(--uui-size-space-1);
}
uui-button > uui-symbol-expand {
- margin-left: var(--uui-size-space-4);
+ margin-left: var(--uui-size-space-2);
}
`,
];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/toolbar/embedded-media.tiptap-toolbar-api.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/toolbar/embedded-media.tiptap-toolbar-api.ts
index 0a91f0801b..b691bb7c7a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/toolbar/embedded-media.tiptap-toolbar-api.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/toolbar/embedded-media.tiptap-toolbar-api.ts
@@ -5,8 +5,6 @@ import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
import type { Editor } from '@umbraco-cms/backoffice/external/tiptap';
export default class UmbTiptapToolbarEmbeddedMediaExtensionApi extends UmbTiptapToolbarElementApiBase {
- override isActive = (editor: Editor) => editor.isActive(umbEmbeddedMedia.name) === true;
-
override async execute(editor?: Editor) {
const data = {
constrain: false,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-extensions-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-extensions-configuration.element.ts
index 5f9756f9af..43267a31c9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-extensions-configuration.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-extensions-configuration.element.ts
@@ -87,6 +87,8 @@ export class UmbPropertyEditorUiTiptapExtensionsConfigurationElement
this.#setValue(tmpValue);
this.#syncViewModel();
}
+
+ this.requestUpdate('_extensions');
},
'_observeBlocks',
);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-toolbar-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-toolbar-configuration.element.ts
index 1ce96bb9ff..46525299dc 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-toolbar-configuration.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-toolbar-configuration.element.ts
@@ -141,16 +141,18 @@ export class UmbPropertyEditorUiTiptapToolbarConfigurationElement
-
-
- ${this.#renderRefBlock()}
-
- ${this.#renderEditAction()} ${this.#renderEditSettingsAction()}
- ${!this._showContentEdit && this._contentInvalid
- ? html`! `
- : nothing}
-
- `;
+ return this.contentKey && this._contentTypeAlias
+ ? html`
+
+
+ ${this.#renderRefBlock()}
+
+ ${this.#renderEditAction()} ${this.#renderEditSettingsAction()}
+ ${!this._showContentEdit && this._contentInvalid
+ ? html`! `
+ : nothing}
+
+ `
+ : nothing;
}
#renderRefBlock() {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/clipboard/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/clipboard/constants.ts
index adfc175c42..607c1a68da 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/clipboard/constants.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/clipboard/constants.ts
@@ -1,4 +1,4 @@
export * from './clipboard-entry/constants.js';
export * from './clipboard-root/constants.js';
export * from './collection/constants.js';
-export * from './property/context/constants.js';
+export * from './property/constants.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/constants.ts
new file mode 100644
index 0000000000..93931d5045
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/constants.ts
@@ -0,0 +1 @@
+export * from './paste/constants.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/index.ts
new file mode 100644
index 0000000000..50023908eb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/index.ts
@@ -0,0 +1 @@
+export * from './paste/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/paste/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/paste/constants.ts
new file mode 100644
index 0000000000..b7fe0395d4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/paste/constants.ts
@@ -0,0 +1 @@
+export { UMB_PROPERTY_ACTION_PASTE_FROM_CLIPBOARD_KIND_MANIFEST } from './manifests.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/paste/index.ts b/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/paste/index.ts
new file mode 100644
index 0000000000..8150ab49c4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/paste/index.ts
@@ -0,0 +1 @@
+export { UmbPasteFromClipboardPropertyAction } from './paste-from-clipboard.property-action.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/paste/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/paste/manifests.ts
index 3c0ac1d980..44989826c0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/paste/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/clipboard/property/actions/paste/manifests.ts
@@ -1,22 +1,24 @@
import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
import { UMB_PROPERTY_ACTION_DEFAULT_KIND_MANIFEST } from '@umbraco-cms/backoffice/property-action';
-export const manifests: Array
+
+
+
+
+ `;
+ }
+
+ static override styles = [
+ css`
+ :host {
+ display: contents;
+ }
+
+ #header {
+ display: flex;
+ flex: 1 1 auto;
+ gap: var(--uui-size-space-2);
+ }
+
+ #editors {
+ display: flex;
+ flex: 1 1 auto;
+ flex-direction: column;
+ gap: var(--uui-size-space-1);
+ }
+
+ #name {
+ width: 100%;
+ }
+
+ #description {
+ width: 100%;
+ --uui-input-height: var(--uui-size-8);
+ --uui-input-border-color: transparent;
+ }
+
+ #description:hover {
+ --uui-input-border-color: var(--uui-color-border);
+ }
+
+ #icon {
+ font-size: var(--uui-size-8);
+ height: 60px;
+ width: 60px;
+ }
+ `,
+ ];
+}
+
+declare global {
+ interface HTMLElementTagNameMap {
+ 'umb-content-type-workspace-editor-header': UmbContentTypeWorkspaceEditorHeaderElement;
+ }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/global-components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/global-components/index.ts
new file mode 100644
index 0000000000..e9575c6d1b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/global-components/index.ts
@@ -0,0 +1,3 @@
+import './content-type-workspace-editor-header.element.js';
+
+export * from './content-type-workspace-editor-header.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/index.ts
index 3bedcf0cc9..a43707b91e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/index.ts
@@ -1,4 +1,5 @@
export * from './constants.js';
+export * from './global-components/index.js';
export * from './repository/index.js';
export * from './structure/index.js';
export * from './workspace/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/repository/structure/content-type-structure-data-source.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/repository/structure/content-type-structure-data-source.interface.ts
index dde79453a2..49d31fe5be 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/repository/structure/content-type-structure-data-source.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/repository/structure/content-type-structure-data-source.interface.ts
@@ -6,5 +6,5 @@ export interface UmbContentTypeStructureDataSourceConstructor
+
+
+
+
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
- ${when(
- this._availableExtensions.length === 0,
- () =>
- html`There are no toolbar extensions to show `,
- () => repeat(this._availableExtensions, (item) => this.#renderAvailableItem(item)),
- )}
-
+
+ ${when(
+ this._availableExtensions.length === 0,
+ () =>
+ html`There are no toolbar extensions to show `,
+ () => repeat(this._availableExtensions, (item) => this.#renderAvailableItem(item)),
+ )}
+
+
- ${when(item.icon, () => html`
-
+ ${when(item.icon, () => html`
+
- ${when(
- item.icon,
- () => html`
-
+ ${this.localize.string(item.label)}
+
+
+ ${when(
+ item.icon,
+ () => html`
+
-
+ `;
+ }
- #renderContent() {
- return html`
-
-
-
+ return html`
+
+
+
- `;
- }
+ ${when(
+ this.logoImage,
+ (logoImage) => html``
+ )}
+
+
+
- ${when(
- this.logoImage,
- () => html``
- )}
-
-
-
- `;
- }
+ #renderContent() {
+ return html`
+
-
-
+
+ `;
+ }
- render() {
- return html`
-
+
+
- ${this.#renderImageContainer()} ${this.#renderContent()}
-
- ${when(
- this.logoImageAlternative,
- () => html``
- )}
- `;
- }
+ render() {
+ return html`
+
+ ${this.#renderImageContainer()} ${this.#renderContent()}
+
+ ${when(
+ this.logoImageAlternative,
+ (logoImageAlternative) =>
+ html``
+ )}
+ `;
+ }
- static styles: CSSResultGroup = [
- css`
- :host {
- --uui-color-interactive: var(--umb-login-primary-color, #283a97);
- --uui-button-border-radius: var(--umb-login-button-border-radius, 45px);
- --uui-color-default: var(--uui-color-interactive);
- --uui-button-height: 42px;
- --uui-select-height: 38px;
+ static styles: CSSResultGroup = [
+ css`
+ :host {
+ --uui-color-interactive: var(--umb-login-primary-color, #283a97);
+ --uui-button-border-radius: var(--umb-login-button-border-radius, 45px);
+ --uui-color-default: var(--uui-color-interactive);
+ --uui-button-height: 42px;
+ --uui-select-height: 38px;
- --input-height: 40px;
- --header-font-size: var(--umb-login-header-font-size, 3rem);
- --header-secondary-font-size: var(--umb-login-header-secondary-font-size, 2.4rem);
- --curves-color: var(--umb-login-curves-color, #f5c1bc);
- --curves-display: var(--umb-login-curves-display, inline);
+ --input-height: 40px;
+ --header-font-size: var(--umb-login-header-font-size, 3rem);
+ --header-secondary-font-size: var(--umb-login-header-secondary-font-size, 2.4rem);
+ --curves-color: var(--umb-login-curves-color, #f5c1bc);
+ --curves-display: var(--umb-login-curves-display, inline);
- display: block;
- background: var(--umb-login-background, #f4f4f4);
- color: var(--umb-login-text-color, #000);
- }
+ display: block;
+ background: var(--umb-login-background, #f4f4f4);
+ color: var(--umb-login-text-color, #000);
+ }
- #main-no-image,
- #main {
- max-width: 1920px;
- display: flex;
- justify-content: center;
- height: 100vh;
- padding: 8px;
- box-sizing: border-box;
- margin: 0 auto;
- }
+ #main-no-image,
+ #main {
+ max-width: 1920px;
+ display: flex;
+ justify-content: center;
+ height: 100vh;
+ padding: 8px;
+ box-sizing: border-box;
+ margin: 0 auto;
+ }
- #image-container {
- display: var(--umb-login-image-display, none);
- width: 100%;
- }
+ #image-container {
+ display: var(--umb-login-image-display, none);
+ width: 100%;
+ }
- #content-container {
- background: var(--umb-login-content-background, none);
- display: var(--umb-login-content-display, flex);
- width: var(--umb-login-content-width, 100%);
- height: var(--umb-login-content-height, 100%);
- box-sizing: border-box;
- overflow: auto;
- border-radius: var(--umb-login-content-border-radius, 0);
- }
+ #content-container {
+ background: var(--umb-login-content-background, none);
+ display: var(--umb-login-content-display, flex);
+ width: var(--umb-login-content-width, 100%);
+ height: var(--umb-login-content-height, 100%);
+ box-sizing: border-box;
+ overflow: auto;
+ border-radius: var(--umb-login-content-border-radius, 0);
+ }
- #content {
- max-width: 360px;
- margin: auto;
- width: 100%;
- }
+ #content {
+ max-width: 360px;
+ margin: auto;
+ width: 100%;
+ }
- #image {
- background: var(--umb-login-image, var(--image));
- width: 100%;
- height: 100%;
- border-radius: var(--umb-login-image-border-radius, 38px);
- position: relative;
- overflow: hidden;
- color: var(--curves-color);
- }
+ #image {
+ background: var(--umb-login-image, var(--image));
+ width: 100%;
+ height: 100%;
+ border-radius: var(--umb-login-image-border-radius, 38px);
+ position: relative;
+ overflow: hidden;
+ color: var(--curves-color);
+ }
- #image svg {
- position: absolute;
- width: 45%;
- height: fit-content;
- display: var(--curves-display);
- }
+ #image svg {
+ position: absolute;
+ width: 45%;
+ height: fit-content;
+ display: var(--curves-display);
+ }
- #curve-top {
- top: 0;
- right: 0;
- }
+ #curve-top {
+ top: 0;
+ right: 0;
+ }
- #curve-bottom {
- bottom: 0;
- left: 0;
- }
+ #curve-bottom {
+ bottom: 0;
+ left: 0;
+ }
- #logo-on-image,
- #logo-on-background {
- position: absolute;
- top: 24px;
- left: 24px;
- height: 55px;
- }
+ #logo-on-image,
+ #logo-on-background {
+ position: absolute;
+ display: var(--umb-logo-display, block);
+ top: var(--umb-logo-top, 24px);
+ left: var(--umb-logo-left, 24px);
+ width: var(--umb-logo-width, auto);
+ height: var(--umb-logo-height, 55px);
+ }
- @media only screen and (min-width: 900px) {
- :host {
- --header-font-size: var(--umb-login-header-font-size-large, 4rem);
- }
+ @media only screen and (min-width: 900px) {
+ :host {
+ --header-font-size: var(--umb-login-header-font-size-large, 4rem);
+ }
- #main {
- padding: 32px;
- padding-right: 0;
- align-items: var(--umb-login-align-items, unset);
- }
+ #main {
+ padding: 32px;
+ padding-right: 0;
+ align-items: var(--umb-login-align-items, unset);
+ }
- #image-container {
- display: var(--umb-login-image-display, block);
- }
+ #image-container {
+ display: var(--umb-login-image-display, block);
+ }
- #content-container {
- display: var(--umb-login-content-display, flex);
- padding: 16px;
- }
+ #content-container {
+ display: var(--umb-login-content-display, flex);
+ padding: 16px;
+ }
- #logo-on-background {
- display: var(--logo-alternative-display);
- }
- }
- `,
- ];
+ #logo-on-background {
+ display: var(--logo-alternative-display);
+ }
+ }
+ `,
+ ];
}
declare global {
- interface HTMLElementTagNameMap {
- 'umb-auth-layout': UmbAuthLayoutElement;
- }
+ interface HTMLElementTagNameMap {
+ 'umb-auth-layout': UmbAuthLayoutElement;
+ }
}
diff --git a/src/Umbraco.Web.UI.Login/src/mocks/handlers/backoffice.handlers.ts b/src/Umbraco.Web.UI.Login/src/mocks/handlers/backoffice.handlers.ts
index 434d225705..bce35fedf3 100644
--- a/src/Umbraco.Web.UI.Login/src/mocks/handlers/backoffice.handlers.ts
+++ b/src/Umbraco.Web.UI.Login/src/mocks/handlers/backoffice.handlers.ts
@@ -1,6 +1,7 @@
import { HttpHandler, http, HttpResponse } from "msw";
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
import logoUrl from '../../../../Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/logo.svg';
+import logoAlternativeUrl from '../../../../Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/logo_blue.svg';
import loginLogoUrl from '../../../../Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/logo_light.svg';
import loginLogoAlternativeUrl from '../../../../Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/logo_dark.svg';
import loginBackgroundUrl from '../../../../Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/login.jpg';
@@ -10,6 +11,17 @@ export const handlers: HttpHandler[] = [
const imageBuffer = await fetch(logoUrl)
.then((res) => res.arrayBuffer());
+ return HttpResponse.arrayBuffer(imageBuffer, {
+ headers: {
+ 'Content-Length': imageBuffer.byteLength.toString(),
+ 'Content-Type': 'image/svg+xml'
+ }
+ });
+ }),
+ http.get(umbracoPath('/security/back-office/graphics/logo-alternative'), async () => {
+ const imageBuffer = await fetch(logoAlternativeUrl)
+ .then((res) => res.arrayBuffer());
+
return HttpResponse.arrayBuffer(imageBuffer, {
headers: {
'Content-Length': imageBuffer.byteLength.toString(),
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
index 8ea239c327..4bc42e2d78 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
@@ -8,7 +8,7 @@
"hasInstallScript": true,
"dependencies": {
"@umbraco/json-models-builders": "^2.0.29",
- "@umbraco/playwright-testhelpers": "^15.0.24",
+ "@umbraco/playwright-testhelpers": "^15.0.32",
"camelize": "^1.0.0",
"dotenv": "^16.3.1",
"node-fetch": "^2.6.7"
@@ -67,9 +67,9 @@
}
},
"node_modules/@umbraco/playwright-testhelpers": {
- "version": "15.0.24",
- "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-15.0.24.tgz",
- "integrity": "sha512-cv7sr3e1vhOoqAKOgj82kKgWY9dCQCnQdP+4rGllM/Dhvup+nSs93XKOAnTc2Fn3ZqhpwA8PDL8Pg9riUpt5JQ==",
+ "version": "15.0.32",
+ "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-15.0.32.tgz",
+ "integrity": "sha512-4wzLTtqbzIc0TokP+/nC/vbKfcboYQFGam6eLzZj4oMQmkBExxv5EBhI06qrpst8/rQc5OK4TTwJAGL3GCuKew==",
"dependencies": {
"@umbraco/json-models-builders": "2.0.30",
"node-fetch": "^2.6.7"
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json
index 9c542f9bf0..71dd1e16d3 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package.json
@@ -21,7 +21,7 @@
},
"dependencies": {
"@umbraco/json-models-builders": "^2.0.29",
- "@umbraco/playwright-testhelpers": "^15.0.24",
+ "@umbraco/playwright-testhelpers": "^15.0.32",
"camelize": "^1.0.0",
"dotenv": "^16.3.1",
"node-fetch": "^2.6.7"
diff --git a/tests/Umbraco.Tests.AcceptanceTest/playwright.config.ts b/tests/Umbraco.Tests.AcceptanceTest/playwright.config.ts
index 00483cdc83..5a784172c2 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/playwright.config.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/playwright.config.ts
@@ -23,7 +23,8 @@ export default defineConfig({
// We don't want to run parallel, as tests might differ in state
workers: 1,
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
- reporter: process.env.CI ? 'line' : 'html',
+ //reporter: process.env.CI ? 'line' : 'html',
+ reporter: process.env.CI ? [['line'], ['junit', {outputFile: 'results/results.xml'}]] : 'html',
outputDir: "./results",
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
use: {
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ChildrenContent.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ChildrenContent.spec.ts
index f36fb09883..78cc3db04d 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ChildrenContent.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ChildrenContent.spec.ts
@@ -43,7 +43,7 @@ test('can create child node', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) =
expect(childData[0].variants[0].name).toBe(childContentName);
// verify that the child content displays in the tree after reloading children
await umbracoUi.content.clickActionsMenuForContent(contentName);
- await umbracoUi.content.clickReloadButton();
+ await umbracoUi.content.clickReloadChildrenButton();
await umbracoUi.content.clickCaretButtonForContentName(contentName);
await umbracoUi.content.doesContentTreeHaveName(childContentName);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCustomDataType.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCustomDataType.spec.ts
index c13538b73f..d605cb1936 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCustomDataType.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCustomDataType.spec.ts
@@ -244,8 +244,8 @@ test('can add string to the multiple text string in the content section', async
test('can create content with the custom data type with slider property editor', async ({umbracoApi, umbracoUi}) => {
// Arrange
- customDataTypeName = 'Slider';
- const customDataTypeId = await umbracoApi.dataType.createSliderDataTyper(customDataTypeName);
+ customDataTypeName = 'Custom Slider';
+ const customDataTypeId = await umbracoApi.dataType.createSliderDataType(customDataTypeName);
const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, customDataTypeId);
await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
await umbracoUi.goToBackOffice();
@@ -273,7 +273,7 @@ test('can change slider value in the content section', async ({umbracoApi, umbra
"from": sliderValue,
"to": sliderValue
}
- const customDataTypeId = await umbracoApi.dataType.createSliderDataTyper(customDataTypeName);
+ const customDataTypeId = await umbracoApi.dataType.createSliderDataType(customDataTypeName);
const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, customDataTypeId);
await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
await umbracoUi.goToBackOffice();
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowedChildNodes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowedChildNodes.spec.ts
index 766b26cdf1..d567a0984f 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowedChildNodes.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowedChildNodes.spec.ts
@@ -83,7 +83,7 @@ test('can create multiple child nodes with different document types', async ({um
expect(childData[1].variants[0].name).toBe(secondChildContentName);
// verify that the child content displays in the tree after reloading children
await umbracoUi.content.clickActionsMenuForContent(contentName);
- await umbracoUi.content.clickReloadButton();
+ await umbracoUi.content.clickReloadChildrenButton();
await umbracoUi.content.clickCaretButtonForContentName(contentName);
await umbracoUi.content.doesContentTreeHaveName(firstChildContentName);
await umbracoUi.content.doesContentTreeHaveName(secondChildContentName);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithCollections.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithCollections.spec.ts
index 17f17d6dab..98868fc1c1 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithCollections.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithCollections.spec.ts
@@ -62,7 +62,7 @@ test('can create child content in a collection', async ({umbracoApi, umbracoUi})
expect(childData[0].variants[0].name).toBe(firstChildContentName);
// verify that the child content displays in collection list after reloading tree
await umbracoUi.content.clickActionsMenuForContent(contentName);
- await umbracoUi.content.clickReloadButton();
+ await umbracoUi.content.clickReloadChildrenButton();
await umbracoUi.content.goToContentWithName(contentName);
await umbracoUi.content.doesDocumentTableColumnNameValuesMatch(expectedNames);
@@ -95,7 +95,7 @@ test('can create multiple child nodes in a collection', async ({umbracoApi, umbr
expect(childData[1].variants[0].name).toBe(secondChildContentName);
// verify that the child content displays in collection list after reloading tree
await umbracoUi.content.clickActionsMenuForContent(contentName);
- await umbracoUi.content.clickReloadButton();
+ await umbracoUi.content.clickReloadChildrenButton();
await umbracoUi.content.goToContentWithName(contentName);
await umbracoUi.content.doesDocumentTableColumnNameValuesMatch(expectedNames);
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTiptap.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTiptap.spec.ts
index b1097e3c2e..cbac5c752e 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTiptap.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTiptap.spec.ts
@@ -86,9 +86,9 @@ test('can publish content with RTE Tiptap property editor', async ({umbracoApi,
expect(contentData.values[0].value.markup).toEqual('' + inputText + '
'); }); -test('can add a media in RTE Tiptap property editor', async ({umbracoApi, umbracoUi}) => { +test.fixme('can add a media in RTE Tiptap property editor', async ({umbracoApi, umbracoUi}) => { // Arrange - const iconTitle = 'Media picker'; + const iconTitle = 'Media Picker'; const imageName = 'Test Image For Content'; await umbracoApi.media.ensureNameNotExists(imageName); await umbracoApi.media.createDefaultMediaWithImage(imageName); @@ -100,6 +100,7 @@ test('can add a media in RTE Tiptap property editor', async ({umbracoApi, umbrac // Act await umbracoUi.content.goToContentWithName(contentName); await umbracoUi.content.clickTipTapToolbarIconWithTitle(iconTitle); + // fix this await umbracoUi.content.selectMediaWithName(imageName); await umbracoUi.content.clickChooseModalButton(); await umbracoUi.content.clickMediaCaptionAltTextModalSubmitButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts index 479176b401..e015ea6115 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts @@ -84,13 +84,15 @@ test('can toggle the true/false value in the content ', async ({umbracoApi, umbr test('can toggle the true/false value with the initial state enabled', async ({umbracoApi, umbracoUi}) => { // Arrange const dataTypeId = await umbracoApi.dataType.createTrueFalseDataTypeWithInitialState(customDataTypeName); - const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, dataTypeId); - await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, dataTypeId); await umbracoUi.goToBackOffice(); await umbracoUi.content.goToSection(ConstantHelper.sections.content); // Act - await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickActionsMenuAtRoot(); + await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.chooseDocumentType(documentTypeName); + await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickToggleButton(); await umbracoUi.content.clickSaveButton(); @@ -100,6 +102,9 @@ test('can toggle the true/false value with the initial state enabled', async ({u const contentData = await umbracoApi.document.getByName(contentName); expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(customDataTypeName)); expect(contentData.values[0].value).toEqual(false); + + // Clean + await umbracoApi.dataType.ensureNameNotExists(customDataTypeName); }); test('can show the label on for the true/false in the content ', async ({umbracoApi, umbracoUi}) => { diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/IssueWithScheduledPublishing.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/IssueWithScheduledPublishing.spec.ts new file mode 100644 index 0000000000..c2845760e5 --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/IssueWithScheduledPublishing.spec.ts @@ -0,0 +1,42 @@ +import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; + +const documentTypeName = "DocumentType"; +const contentName = "Content"; +const languageName = 'Danish'; +let documentTypeId = null; + +test.beforeEach(async ({umbracoApi}) => { + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); + documentTypeId = await umbracoApi.documentType.createDocumentTypeWithAllowVaryByCulture(documentTypeName); + await umbracoApi.document.createDefaultDocumentWithEnglishCulture(contentName, documentTypeId); + await umbracoApi.language.ensureNameNotExists(languageName); + await umbracoApi.language.createDanishLanguage(); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); + await umbracoApi.language.ensureNameNotExists(languageName); +}); + +// https://github.com/umbraco/Umbraco-CMS/issues/18555 +test.skip('Can schedule publish after unselecting all languages', async ({umbracoUi}) => { + // Arrange + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + // Open schedule modal and click schedule + await umbracoUi.content.changeDocumentSectionLanguage(languageName); + await umbracoUi.content.goToContentWithName('(' + contentName + ')'); + await umbracoUi.content.enterContentName('Tester'); + await umbracoUi.content.clickViewMoreOptionsButton(); + await umbracoUi.content.clickScheduleButton(); + await umbracoUi.waitForTimeout(500); + await umbracoUi.content.clickSelectAllCheckbox(); + await umbracoUi.waitForTimeout(500); + await umbracoUi.content.clickSelectAllCheckbox(); + await umbracoUi.content.clickButtonWithName(contentName); + + // Assert + await umbracoUi.content.doesSchedulePublishModalButtonContainDisabledTag(false); +}); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ApprovedColor.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ApprovedColor.spec.ts index 61b8fbf225..e853b2afa8 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ApprovedColor.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ApprovedColor.spec.ts @@ -34,7 +34,7 @@ test('can include label', async ({umbracoApi, umbracoUi}) => { await umbracoUi.dataType.goToDataType(dataTypeName); // Act - await umbracoUi.dataType.clickIncludeLabelsSlider(); + await umbracoUi.dataType.clickIncludeLabelsToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ContentPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ContentPicker.spec.ts index 9cf26d793c..8330c7136a 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ContentPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ContentPicker.spec.ts @@ -26,7 +26,7 @@ test('can show open button', async ({umbracoApi, umbracoUi}) => { await umbracoUi.dataType.goToDataType(dataTypeName); // Act - await umbracoUi.dataType.clickShowOpenButtonSlider(); + await umbracoUi.dataType.clickShowOpenButtonToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert @@ -43,7 +43,7 @@ test('can ignore user start nodes', async ({umbracoApi, umbracoUi}) => { await umbracoUi.dataType.goToDataType(dataTypeName); // Act - await umbracoUi.dataType.clickIgnoreUserStartNodesSlider(); + await umbracoUi.dataType.clickIgnoreUserStartNodesToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataType.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataType.spec.ts index 82c0d392e7..f32dd850bf 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataType.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataType.spec.ts @@ -65,8 +65,9 @@ test('can change property editor in a data type', {tag: '@smoke'}, async ({umbra const updatedEditorName = 'Text Area'; const updatedEditorAlias = 'Umbraco.TextArea'; const updatedEditorUiAlias = 'Umb.PropertyEditorUi.TextArea'; + const maxChars = 999; - await umbracoApi.dataType.createTextstringDataType(dataTypeName); + await umbracoApi.dataType.createTextstringDataType(dataTypeName, maxChars); expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy(); // Act @@ -81,6 +82,9 @@ test('can change property editor in a data type', {tag: '@smoke'}, async ({umbra const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); expect(dataTypeData.editorAlias).toBe(updatedEditorAlias); expect(dataTypeData.editorUiAlias).toBe(updatedEditorUiAlias); + + const maxCharsSetting = dataTypeData.values.find((x: {alias: string, value: unknown}) => x.alias === 'maxChars'); + expect(maxCharsSetting.value, 'Stored configuration should be transferred').toBe(maxChars); }); test('cannot create a data type without selecting the property editor', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts index 1454cb6f34..ba07bf8123 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts @@ -37,9 +37,9 @@ test('can rename a data type folder', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.dataType.clickRootFolderCaretButton(); await umbracoUi.dataType.clickActionsMenuForDataType(wrongDataTypeFolderName); - await umbracoUi.dataType.clickRenameFolderThreeDotsButton(); + await umbracoUi.dataType.clickRenameFolderButton(); await umbracoUi.dataType.enterFolderName(dataTypeFolderName); - await umbracoUi.dataType.clickConfirmRenameFolderButton(); + await umbracoUi.dataType.clickConfirmRenameButton(); // Assert await umbracoUi.dataType.doesSuccessNotificationHaveText(NotificationConstantHelper.success.saved); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DatePicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DatePicker.spec.ts index 1eb2d0a512..3e71aa59c9 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DatePicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DatePicker.spec.ts @@ -47,7 +47,7 @@ for (const datePickerType of datePickerTypes) { ]; // Act - await umbracoUi.dataType.clickOffsetTimeSlider(); + await umbracoUi.dataType.clickOffsetTimeToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Dropdown.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Dropdown.spec.ts index 2c63e953b7..5e7f3586f7 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Dropdown.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Dropdown.spec.ts @@ -2,7 +2,7 @@ import {expect} from "@playwright/test"; const dataTypeName = 'Dropdown'; -let dataTypeDefaultData = null; +let dataTypeDefaultData = null; let dataTypeData = null; test.beforeEach(async ({umbracoUi, umbracoApi}) => { @@ -13,8 +13,8 @@ test.beforeEach(async ({umbracoUi, umbracoApi}) => { test.afterEach(async ({umbracoApi}) => { if (dataTypeDefaultData !== null) { - await umbracoApi.dataType.update(dataTypeDefaultData.id, dataTypeDefaultData); - } + await umbracoApi.dataType.update(dataTypeDefaultData.id, dataTypeDefaultData); + } }); test('can enable multiple choice', async ({umbracoApi, umbracoUi}) => { @@ -26,11 +26,11 @@ test('can enable multiple choice', async ({umbracoApi, umbracoUi}) => { // Remove all existing options dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); dataTypeData.values = []; - await umbracoApi.dataType.update(dataTypeData.id, dataTypeData); + await umbracoApi.dataType.update(dataTypeData.id, dataTypeData); await umbracoUi.dataType.goToDataType(dataTypeName); // Act - await umbracoUi.dataType.clickEnableMultipleChoiceSlider(); + await umbracoUi.dataType.clickEnableMultipleChoiceToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert @@ -50,7 +50,7 @@ test('can add option', async ({umbracoApi, umbracoUi}) => { // Remove all existing options dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); dataTypeData.values = []; - await umbracoApi.dataType.update(dataTypeData.id, dataTypeData); + await umbracoApi.dataType.update(dataTypeData.id, dataTypeData); await umbracoUi.dataType.goToDataType(dataTypeName); // Act @@ -75,7 +75,7 @@ test('can remove option', async ({umbracoApi, umbracoUi}) => { // Remove all existing options and add an option to remove dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); dataTypeData.values = removedOptionValues; - await umbracoApi.dataType.update(dataTypeData.id, dataTypeData); + await umbracoApi.dataType.update(dataTypeData.id, dataTypeData); await umbracoUi.dataType.goToDataType(dataTypeName); // Act diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ListView.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ListView.spec.ts index 6b0c4e2edd..41d7af774e 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ListView.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ListView.spec.ts @@ -208,7 +208,7 @@ for (const listViewType of listViewTypes) { // Act await umbracoUi.dataType.goToDataType(listViewType); - await umbracoUi.dataType.clickBulkActionPermissionsSliderByValue(bulkActionPermissionValue); + await umbracoUi.dataType.clickBulkActionPermissionsToggleByValue(bulkActionPermissionValue); await umbracoUi.dataType.clickSaveButton(); // Assert @@ -262,7 +262,7 @@ for (const listViewType of listViewTypes) { // Act await umbracoUi.dataType.goToDataType(listViewType); - await umbracoUi.dataType.clickShowContentWorkspaceViewFirstSlider(); + await umbracoUi.dataType.clickShowContentWorkspaceViewFirstToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert @@ -280,7 +280,7 @@ for (const listViewType of listViewTypes) { // Act await umbracoUi.dataType.goToDataType(listViewType); - await umbracoUi.dataType.clickEditInInfiniteEditorSlider(); + await umbracoUi.dataType.clickEditInInfiniteEditorToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/MediaPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/MediaPicker.spec.ts index e29b1d2e96..d4945b1cb1 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/MediaPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/MediaPicker.spec.ts @@ -28,7 +28,7 @@ for (const dataTypeName of dataTypes) { // Act await umbracoUi.dataType.goToDataType(dataTypeName); - await umbracoUi.dataType.clickPickMultipleItemsSlider(); + await umbracoUi.dataType.clickPickMultipleItemsToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert @@ -67,7 +67,7 @@ for (const dataTypeName of dataTypes) { // Act await umbracoUi.dataType.goToDataType(dataTypeName); - await umbracoUi.dataType.clickEnableFocalPointSlider(); + await umbracoUi.dataType.clickEnableFocalPointToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert @@ -118,7 +118,7 @@ for (const dataTypeName of dataTypes) { // Act await umbracoUi.dataType.goToDataType(dataTypeName); - await umbracoUi.dataType.clickIgnoreUserStartNodesSlider(); + await umbracoUi.dataType.clickIgnoreUserStartNodesToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/MultiUrlPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/MultiUrlPicker.spec.ts index 96ab56d73b..1cb557aba1 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/MultiUrlPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/MultiUrlPicker.spec.ts @@ -14,8 +14,8 @@ test.beforeEach(async ({umbracoUi, umbracoApi}) => { test.afterEach(async ({umbracoApi}) => { if (dataTypeDefaultData !== null) { - await umbracoApi.dataType.update(dataTypeDefaultData.id, dataTypeDefaultData); - } + await umbracoApi.dataType.update(dataTypeDefaultData.id, dataTypeDefaultData); + } }); test('can update minimum number of items value', async ({umbracoApi, umbracoUi}) => { @@ -60,7 +60,7 @@ test('can enable ignore user start nodes', async ({umbracoApi, umbracoUi}) => { }; // Act - await umbracoUi.dataType.clickIgnoreUserStartNodesSlider(); + await umbracoUi.dataType.clickIgnoreUserStartNodesToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert @@ -93,7 +93,7 @@ test('can update hide anchor/query string input', async ({umbracoApi, umbracoUi} }; // Act - await umbracoUi.dataType.clickHideAnchorQueryStringInputSlider(); + await umbracoUi.dataType.clickHideAnchorQueryStringInputToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Numeric.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Numeric.spec.ts index 77201cabd5..2bd0da1404 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Numeric.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Numeric.spec.ts @@ -77,7 +77,7 @@ test.skip('can allow decimals', async ({umbracoApi, umbracoUi}) => { }; // Act - await umbracoUi.dataType.clickAllowDecimalsSlider(); + await umbracoUi.dataType.clickAllowDecimalsToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/TinyMCE.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/TinyMCE.spec.ts index edc15196e7..590df30a44 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/TinyMCE.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/TinyMCE.spec.ts @@ -234,7 +234,7 @@ test('can enable hide label', async ({umbracoApi, umbracoUi}) => { await umbracoUi.dataType.goToDataType(tinyMCEName); // Act - await umbracoUi.dataType.clickHideLabelSlider(); + await umbracoUi.dataType.clickHideLabelToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert @@ -278,7 +278,7 @@ test('can enable ignore user start nodes', async ({umbracoApi, umbracoUi}) => { await umbracoUi.dataType.goToDataType(tinyMCEName); // Act - await umbracoUi.dataType.clickIgnoreUserStartNodesSlider(); + await umbracoUi.dataType.clickIgnoreUserStartNodesToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Tiptap.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Tiptap.spec.ts index 2144d848d5..d999675f0e 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Tiptap.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Tiptap.spec.ts @@ -195,7 +195,7 @@ test('can enable ignore user start nodes', async ({umbracoApi, umbracoUi}) => { await umbracoUi.dataType.goToDataType(tipTapName); // Act - await umbracoUi.dataType.clickIgnoreUserStartNodesSlider(); + await umbracoUi.dataType.clickIgnoreUserStartNodesToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/TrueFalse.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/TrueFalse.spec.ts index b465fb6ef8..3c8abcf0f2 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/TrueFalse.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/TrueFalse.spec.ts @@ -26,7 +26,7 @@ test('can update preset value state', async ({umbracoApi, umbracoUi}) => { }; // Act - await umbracoUi.dataType.clickPresetValueSlider(); + await umbracoUi.dataType.clickPresetValueToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert @@ -42,7 +42,7 @@ test('can update show toggle labels', async ({umbracoApi, umbracoUi}) => { }; // Act - await umbracoUi.dataType.clickShowToggleLabelsSlider(); + await umbracoUi.dataType.clickShowToggleLabelsToggle(); await umbracoUi.dataType.clickSaveButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts index ae338730d3..a5ad42852d 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts @@ -39,7 +39,7 @@ test('can rename a media file', async ({umbracoApi, umbracoUi}) => { await umbracoUi.media.goToSection(ConstantHelper.sections.media); // Arrange - await umbracoUi.media.clickLabelWithName(wrongMediaFileName, true); + await umbracoUi.media.goToMediaWithName(wrongMediaFileName); await umbracoUi.media.enterMediaItemName(mediaFileName); await umbracoUi.media.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts index 61f30db521..1555986b1c 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts @@ -192,7 +192,7 @@ test('can enable approved', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.member.clickMemberLinkByName(memberName); - await umbracoUi.member.clickApprovedSlider(); + await umbracoUi.member.clickApprovedToggle(); await umbracoUi.member.clickSaveButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RelationTypes/RelationTypes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RelationTypes/RelationTypes.spec.ts index 41e8b043eb..cd0fd93eb7 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RelationTypes/RelationTypes.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RelationTypes/RelationTypes.spec.ts @@ -73,7 +73,7 @@ test.skip('can update isDependency value of a relation type', async ({umbracoApi // Act await umbracoUi.relationType.openRelationTypeByNameAtRoot(relationTypeName); - await umbracoUi.relationType.clickIsDependencySlider(); + await umbracoUi.relationType.clickIsDependencyToggle(); await umbracoUi.relationType.clickSaveButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithMultipleMediaPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithMultipleMediaPicker.spec.ts index 24776ed65b..0f0416066f 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithMultipleMediaPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithMultipleMediaPicker.spec.ts @@ -41,7 +41,8 @@ test('can render content with multiple media picker value', async ({umbracoApi, await umbracoUi.contentRender.doesContentRenderValueContainText(secondMediaFileName); }); -test('can render content with multiple image media picker value', async ({umbracoApi, umbracoUi}) => { +// Remove .fixme when the issue is fixed: https://github.com/umbraco/Umbraco-CMS/issues/18531 +test.fixme('can render content with multiple image media picker value', async ({umbracoApi, umbracoUi}) => { // Arrange const dataTypeName = 'Multiple Image Media Picker'; const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/Profiling.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/Profiling.spec.ts index 61b9935557..a0d1c5e80d 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/Profiling.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/Profiling.spec.ts @@ -8,9 +8,9 @@ test.beforeEach(async ({umbracoUi}) => { test('can update value of activate the profiler by default', async ({umbracoUi}) => { // Act - await umbracoUi.profiling.clickActivateProfilerByDefaultSlider(); + await umbracoUi.profiling.clickActivateProfilerByDefaultToggle(); await umbracoUi.reloadPage(); // Assert - await umbracoUi.profiling.isActivateProfilerByDefaultSliderChecked(true); + await umbracoUi.profiling.isActivateProfilerByDefaultToggleChecked(true); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeDesignTab.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeDesignTab.spec.ts index ff24ed2416..e04ed42622 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeDesignTab.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeDesignTab.spec.ts @@ -360,7 +360,7 @@ test('can set is mandatory for a property in a document type', {tag: '@smoke'}, // Act await umbracoUi.documentType.goToDocumentType(documentTypeName); await umbracoUi.documentType.clickEditorSettingsButton(); - await umbracoUi.documentType.clickMandatorySlider(); + await umbracoUi.documentType.clickMandatoryToggle(); await umbracoUi.documentType.clickSubmitButton(); await umbracoUi.documentType.clickSaveButton(); @@ -403,7 +403,7 @@ test('can allow vary by culture for a property in a document type', {tag: '@smok // Act await umbracoUi.documentType.goToDocumentType(documentTypeName); await umbracoUi.documentType.clickEditorSettingsButton(); - await umbracoUi.documentType.clickVaryByCultureSlider(); + await umbracoUi.documentType.clickVaryByCultureToggle(); await umbracoUi.documentType.clickSubmitButton(); await umbracoUi.documentType.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts index dacd51f82a..2ea441b0fd 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts @@ -58,7 +58,7 @@ test('can rename a document type folder', async ({umbracoApi, umbracoUi}) => { await umbracoUi.documentType.clickActionsMenuForName(oldFolderName); await umbracoUi.documentType.clickRenameFolderButton(); await umbracoUi.documentType.enterFolderName(documentFolderName); - await umbracoUi.documentType.clickConfirmRenameFolderButton(); + await umbracoUi.documentType.clickConfirmRenameButton(); // Assert await umbracoUi.documentType.doesSuccessNotificationHaveText(NotificationConstantHelper.success.saved); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeStructureTab.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeStructureTab.spec.ts index 1a82360e12..2c307a7c2d 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeStructureTab.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeStructureTab.spec.ts @@ -83,7 +83,7 @@ test('can configure a collection for a document type', async ({umbracoApi, umbra // Act await umbracoUi.documentType.goToDocumentType(documentTypeName); await umbracoUi.documentType.clickStructureTab(); - await umbracoUi.documentType.clickConfigureAsACollectionButton(); + await umbracoUi.documentType.clickAddCollectionButton(); await umbracoUi.documentType.clickTextButtonWithName(collectionDataTypeName); await umbracoUi.documentType.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeDesignTab.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeDesignTab.spec.ts index 3a07a0d3dd..d5bf9e3d52 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeDesignTab.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeDesignTab.spec.ts @@ -117,7 +117,7 @@ test('can set a property as mandatory in a media type', {tag: '@smoke'}, async ( // Act await umbracoUi.mediaType.goToMediaType(mediaTypeName); await umbracoUi.mediaType.clickEditorSettingsButton(); - await umbracoUi.mediaType.clickMandatorySlider(); + await umbracoUi.mediaType.clickMandatoryToggle(); await umbracoUi.mediaType.clickSubmitButton(); await umbracoUi.mediaType.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts index b78d27f596..f318fd732f 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts @@ -55,7 +55,7 @@ test('can rename a media type folder', async ({umbracoApi, umbracoUi}) => { await umbracoUi.mediaType.clickActionsMenuForName(oldFolderName); await umbracoUi.mediaType.clickRenameFolderButton(); await umbracoUi.mediaType.enterFolderName(mediaTypeFolderName); - await umbracoUi.mediaType.clickConfirmRenameFolderButton(); + await umbracoUi.mediaType.clickConfirmRenameButton(); // Assert await umbracoUi.mediaType.doesSuccessNotificationHaveText(NotificationConstantHelper.success.saved); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeStructureTab.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeStructureTab.spec.ts index 3ed918f9cf..920ba4f3d9 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeStructureTab.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeStructureTab.spec.ts @@ -104,7 +104,7 @@ test('can configure a collection for a media type', async ({umbracoApi, umbracoU // Act await umbracoUi.mediaType.goToMediaType(mediaTypeName); await umbracoUi.mediaType.clickStructureTab(); - await umbracoUi.mediaType.clickConfigureAsACollectionButton(); + await umbracoUi.mediaType.clickAddCollectionButton(); await umbracoUi.mediaType.clickTextButtonWithName(collectionDataTypeName); await umbracoUi.mediaType.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialView.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialView.spec.ts index 6edddfed07..ff81a98994 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialView.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialView.spec.ts @@ -111,7 +111,8 @@ test('can update a partial view content', {tag: '@smoke'}, async ({umbracoApi, u expect(updatedPartialView.content).toBe(updatedPartialViewContent); }); -test('can use query builder with Order By statement for a partial view', async ({umbracoApi, umbracoUi}) => { +// Remove .fixme when the issue is fixed: https://github.com/umbraco/Umbraco-CMS/issues/18536 +test.fixme('can use query builder with Order By statement for a partial view', async ({umbracoApi, umbracoUi}) => { //Arrange const propertyAliasValue = 'UpdateDate'; const isAscending = true; @@ -150,7 +151,8 @@ test('can use query builder with Order By statement for a partial view', async ( expect(updatedPartialView.content).toBe(expectedTemplateContent); }); -test('can use query builder with Where statement for a partial view', async ({umbracoApi, umbracoUi}) => { +// Remove .fixme when the issue is fixed: https://github.com/umbraco/Umbraco-CMS/issues/18536 +test.fixme('can use query builder with Where statement for a partial view', async ({umbracoApi, umbracoUi}) => { //Arrange const propertyAliasValue = 'Name'; const operatorValue = 'is'; diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Template/Templates.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Template/Templates.spec.ts index cfd34fa291..0a19f29864 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Template/Templates.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Template/Templates.spec.ts @@ -175,7 +175,8 @@ test.skip('can use query builder with Order By statement for a template', async expect(templateData.content).toBe(expectedTemplateContent); }); -test('can use query builder with Where statement for a template', async ({umbracoApi, umbracoUi}) => { +// Remove .fixme when the issue is fixed: https://github.com/umbraco/Umbraco-CMS/issues/18536 +test.fixme('can use query builder with Where statement for a template', async ({umbracoApi, umbracoUi}) => { // Arrange const propertyAliasValue = 'Name'; const operatorValue = 'is'; diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/ContentStartNodes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/ContentStartNodes.spec.ts index f59ae83870..70bd76fcca 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/ContentStartNodes.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/ContentStartNodes.spec.ts @@ -69,7 +69,9 @@ test('can see parent of start node but not access it', async ({umbracoApi, umbra // Assert await umbracoUi.content.isContentInTreeVisible(rootDocumentName); await umbracoUi.content.goToContentWithName(rootDocumentName); - await umbracoUi.content.doesErrorNotificationHaveText(NotificationConstantHelper.error.noAccessToResource); + await umbracoUi.content.isErrorNotificationVisible(); + // TODO: Uncomment this when this issue is fixed https://github.com/umbraco/Umbraco-CMS/issues/18533 + //await umbracoUi.content.doesErrorNotificationHaveText(NotificationConstantHelper.error.noAccessToResource); await umbracoUi.content.clickCaretButtonForContentName(rootDocumentName); await umbracoUi.content.isChildContentInTreeVisible(rootDocumentName, childDocumentOneName); await umbracoUi.content.isChildContentInTreeVisible(rootDocumentName, childDocumentTwoName, false); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/MediaStartNodes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/MediaStartNodes.spec.ts index 81cdeb84ed..bc9637b05a 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/MediaStartNodes.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/MediaStartNodes.spec.ts @@ -63,7 +63,9 @@ test('can see parent of start node but not access it', async ({umbracoApi, umbra await umbracoUi.media.isMediaTreeItemVisible(rootFolderName); await umbracoUi.waitForTimeout(500); await umbracoUi.media.goToMediaWithName(rootFolderName); - await umbracoUi.media.doesErrorNotificationHaveText(NotificationConstantHelper.error.noAccessToResource); + await umbracoUi.content.isErrorNotificationVisible(); + // TODO: Uncomment this when this issue is fixed https://github.com/umbraco/Umbraco-CMS/issues/18533 + //await umbracoUi.content.doesErrorNotificationHaveText(NotificationConstantHelper.error.noAccessToResource); await umbracoUi.media.clickCaretButtonForMediaName(rootFolderName); await umbracoUi.media.isChildMediaVisible(rootFolderName, childFolderOneName); await umbracoUi.media.isChildMediaVisible(rootFolderName, childFolderTwoName, false); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/ContentStartNodes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/ContentStartNodes.spec.ts index 7c7c48d186..09c8ed8e39 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/ContentStartNodes.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/ContentStartNodes.spec.ts @@ -71,7 +71,9 @@ test('can see parent of start node but not access it', async ({umbracoApi, umbra // Assert await umbracoUi.content.isContentInTreeVisible(rootDocumentName); await umbracoUi.content.goToContentWithName(rootDocumentName); - await umbracoUi.content.doesErrorNotificationHaveText(NotificationConstantHelper.error.noAccessToResource); + await umbracoUi.content.isErrorNotificationVisible(); + // TODO: Uncomment this when this issue is fixed https://github.com/umbraco/Umbraco-CMS/issues/18533 + //await umbracoUi.content.doesErrorNotificationHaveText(NotificationConstantHelper.error.noAccessToResource); await umbracoUi.content.clickCaretButtonForContentName(rootDocumentName); await umbracoUi.content.isChildContentInTreeVisible(rootDocumentName, childDocumentOneName); await umbracoUi.content.isChildContentInTreeVisible(rootDocumentName, childDocumentTwoName, false); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DefaultPermissionsInContent.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DefaultPermissionsInContent.spec.ts index 12f167ec02..d3ac9aeadb 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DefaultPermissionsInContent.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DefaultPermissionsInContent.spec.ts @@ -76,7 +76,9 @@ test('can not browse content node with permission disabled', async ({umbracoApi, await umbracoUi.content.goToContentWithName(rootDocumentName); // Assert - await umbracoUi.content.doesErrorNotificationHaveText(NotificationConstantHelper.error.noAccessToResource); + await umbracoUi.content.isErrorNotificationVisible(); + // TODO: Uncomment this when this issue is fixed https://github.com/umbraco/Umbraco-CMS/issues/18533 + //await umbracoUi.content.doesErrorNotificationHaveText(NotificationConstantHelper.error.noAccessToResource); }); test('can create document blueprint with permission enabled', async ({umbracoApi, umbracoUi}) => { @@ -613,6 +615,6 @@ test('can not see delete button in content for userGroup with delete permission await umbracoUi.content.clickActionsMenuForContent(rootDocumentName); // Assert - await umbracoUi.content.isPermissionInActionsMenuVisible('Delete...', false); - await umbracoUi.content.isPermissionInActionsMenuVisible('Create...', true); + await umbracoUi.content.isPermissionInActionsMenuVisible('Delete…', false); + await umbracoUi.content.isPermissionInActionsMenuVisible('Create…', true); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/Languages.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/Languages.spec.ts index 7b535fb067..34966f2466 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/Languages.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/Languages.spec.ts @@ -62,7 +62,7 @@ test.afterEach(async ({umbracoApi}) => { await umbracoApi.documentType.ensureNameNotExists(documentTypeName); }); -test('can rename content with language set in userGroup', async ({umbracoApi, umbracoUi}) => { +test.fixme('can rename content with language set in userGroup', async ({umbracoApi, umbracoUi}) => { // Arrange const updatedContentName = 'UpdatedContentName'; userGroupId = await umbracoApi.userGroup.createUserGroupWithLanguageAndContentSection(userGroupName, englishIsoCode); @@ -75,6 +75,7 @@ test('can rename content with language set in userGroup', async ({umbracoApi, um // Act await umbracoUi.content.isDocumentReadOnly(false); await umbracoUi.content.enterContentName(updatedContentName); + // Fix this later. Currently the "Save" button changed to "Save..." button await umbracoUi.content.clickSaveButton(); await umbracoUi.content.clickSaveAndCloseButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/MediaStartNodes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/MediaStartNodes.spec.ts index b129c3979e..1a72772e3b 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/MediaStartNodes.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/MediaStartNodes.spec.ts @@ -64,7 +64,9 @@ test('can see parent of start node but not access it', async ({umbracoApi, umbra await umbracoUi.media.isMediaTreeItemVisible(rootFolderName); await umbracoUi.waitForTimeout(500); await umbracoUi.media.goToMediaWithName(rootFolderName); - await umbracoUi.media.doesErrorNotificationHaveText(NotificationConstantHelper.error.noAccessToResource); + await umbracoUi.content.isErrorNotificationVisible(); + // TODO: Uncomment this when this issue is fixed https://github.com/umbraco/Umbraco-CMS/issues/18533 + //await umbracoUi.content.doesErrorNotificationHaveText(NotificationConstantHelper.error.noAccessToResource); await umbracoUi.media.clickCaretButtonForMediaName(rootFolderName); await umbracoUi.media.isChildMediaVisible(rootFolderName, childFolderOneName); await umbracoUi.media.isChildMediaVisible(rootFolderName, childFolderTwoName, false); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/User.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/User.spec.ts index c385b95c8d..85b103634d 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/User.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/User.spec.ts @@ -319,7 +319,7 @@ test('can allow access to all documents for a user', async ({umbracoApi, umbraco // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); - await umbracoUi.user.clickAllowAccessToAllDocumentsSlider(); + await umbracoUi.user.clickAllowAccessToAllDocumentsToggle(); await umbracoUi.user.clickSaveButton(); // Assert @@ -336,7 +336,7 @@ test('can allow access to all media for a user', async ({umbracoApi, umbracoUi}) // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); - await umbracoUi.user.clickAllowAccessToAllMediaSlider(); + await umbracoUi.user.clickAllowAccessToAllMediaToggle(); await umbracoUi.user.clickSaveButton(); // Assert diff --git a/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs b/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs index 173f81e720..c03512b483 100644 --- a/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs @@ -21,6 +21,7 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Sync; using Umbraco.Cms.Infrastructure.Examine; using Umbraco.Cms.Infrastructure.HostedServices; +using Umbraco.Cms.Infrastructure.PublishedCache; using Umbraco.Cms.Persistence.EFCore.Locking; using Umbraco.Cms.Persistence.EFCore.Scoping; using Umbraco.Cms.Tests.Common.TestHelpers.Stubs; @@ -95,6 +96,8 @@ public static class UmbracoBuilderExtensions builder.Services.AddSingleton