yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1319 from umbraco/chore/content-type-allowed-at-root

Browse Source 
Chore: Content Type: Renamed `allowedAsRoot` to `allowedAtRoot`
This commit is contained in:
Lee Kelleher
2024-02-29 13:11:59 +00:00
committed by GitHub
parent cd1b941841 cbaeecaf6b
commit f57bc1326d
8 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/packages/core/content-type/types.ts
View File

@@ -17,7 +17,7 @@ export interface UmbContentTypeModel {
alias: string;
description: string | null;
icon: string;
allowedAsRoot: boolean;
allowedAtRoot: boolean;
variesByCulture: boolean;
variesBySegment: boolean;
isElement: boolean;

8
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/detail/document-type-detail.server.data-source.ts
View File

@@ -44,7 +44,7 @@ export class UmbDocumentTypeDetailServerDataSource implements UmbDetailDataSourc
alias: '',
description: '',
icon: 'icon-document',
allowedAsRoot: false,
allowedAtRoot: false,
variesByCulture: false,
variesBySegment: false,
isElement: false,
@@ -92,7 +92,7 @@ export class UmbDocumentTypeDetailServerDataSource implements UmbDetailDataSourc
alias: data.alias,
description: data.description || null,
icon: data.icon,
allowedAsRoot: data.allowedAsRoot,
allowedAtRoot: data.allowedAsRoot,
variesByCulture: data.variesByCulture,
variesBySegment: data.variesBySegment,
isElement: data.isElement,
@@ -150,7 +150,7 @@ export class UmbDocumentTypeDetailServerDataSource implements UmbDetailDataSourc
name: model.name,
description: model.description,
icon: model.icon,
allowedAsRoot: model.allowedAsRoot,
allowedAsRoot: model.allowedAtRoot,
variesByCulture: model.variesByCulture,
variesBySegment: model.variesBySegment,
isElement: model.isElement,
@@ -218,7 +218,7 @@ export class UmbDocumentTypeDetailServerDataSource implements UmbDetailDataSourc
name: model.name,
description: model.description,
icon: model.icon,
allowedAsRoot: model.allowedAsRoot,
allowedAsRoot: model.allowedAtRoot,
variesByCulture: model.variesByCulture,
variesBySegment: model.variesBySegment,
isElement: model.isElement,

8
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.context.ts
View File

@@ -26,7 +26,7 @@ export class UmbDocumentTypeWorkspaceContext
readonly description;
readonly icon;
readonly allowedAsRoot;
readonly allowedAtRoot;
readonly variesByCulture;
readonly variesBySegment;
readonly isElement;
@@ -53,7 +53,7 @@ export class UmbDocumentTypeWorkspaceContext
this.alias = this.structure.ownerContentTypeObservablePart((data) => data?.alias);
this.description = this.structure.ownerContentTypeObservablePart((data) => data?.description);
this.icon = this.structure.ownerContentTypeObservablePart((data) => data?.icon);
this.allowedAsRoot = this.structure.ownerContentTypeObservablePart((data) => data?.allowedAsRoot);
this.allowedAtRoot = this.structure.ownerContentTypeObservablePart((data) => data?.allowedAtRoot);
this.variesByCulture = this.structure.ownerContentTypeObservablePart((data) => data?.variesByCulture);
this.variesBySegment = this.structure.ownerContentTypeObservablePart((data) => data?.variesBySegment);
this.isElement = this.structure.ownerContentTypeObservablePart((data) => data?.isElement);
@@ -108,8 +108,8 @@ export class UmbDocumentTypeWorkspaceContext
this.structure.updateOwnerContentType({ icon });
}
setAllowedAsRoot(allowedAsRoot: boolean) {
this.structure.updateOwnerContentType({ allowedAsRoot });
setAllowedAtRoot(allowedAtRoot: boolean) {
this.structure.updateOwnerContentType({ allowedAtRoot });
}
setVariesByCulture(variesByCulture: boolean) {
this.structure.updateOwnerContentType({ variesByCulture });

8
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/structure/document-type-workspace-view-structure.element.ts
View File

@@ -36,9 +36,9 @@ export class UmbDocumentTypeWorkspaceViewStructureElement extends UmbLitElement
if (!this.#workspaceContext) return;
this.observe(
this.#workspaceContext.allowedAsRoot,
(allowedAsRoot) => (this._allowedAtRoot = allowedAsRoot),
'_allowedAsRootObserver',
this.#workspaceContext.allowedAtRoot,
(allowedAtRoot) => (this._allowedAtRoot = allowedAtRoot),
'_allowedAtRootObserver',
);
this.observe(
@@ -72,7 +72,7 @@ export class UmbDocumentTypeWorkspaceViewStructureElement extends UmbLitElement
label=${this.localize.term('contentTypeEditor_allowAtRootHeading')}
?checked=${this._allowedAtRoot}
@change=${(e: CustomEvent) => {
this.#workspaceContext?.setAllowedAsRoot((e.target as UUIToggleElement).checked);
this.#workspaceContext?.setAllowedAtRoot((e.target as UUIToggleElement).checked);
}}></uui-toggle>
</div>
</umb-property-layout>

8
src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts
View File

@@ -44,7 +44,7 @@ export class UmbMediaTypeServerDataSource implements UmbDetailDataSource<UmbMedi
alias: '',
description: '',
icon: '',
allowedAsRoot: false,
allowedAtRoot: false,
variesByCulture: false,
variesBySegment: false,
isElement: false,
@@ -82,7 +82,7 @@ export class UmbMediaTypeServerDataSource implements UmbDetailDataSource<UmbMedi
alias: data.alias,
description: data.description || null,
icon: data.icon,
allowedAsRoot: data.allowedAsRoot,
allowedAtRoot: data.allowedAsRoot,
variesByCulture: data.variesByCulture,
variesBySegment: data.variesBySegment,
isElement: data.isElement,
@@ -136,7 +136,7 @@ export class UmbMediaTypeServerDataSource implements UmbDetailDataSource<UmbMedi
name: model.name,
description: model.description,
icon: model.icon,
allowedAsRoot: model.allowedAsRoot,
allowedAsRoot: model.allowedAtRoot,
variesByCulture: model.variesByCulture,
variesBySegment: model.variesBySegment,
isElement: model.isElement,
@@ -201,7 +201,7 @@ export class UmbMediaTypeServerDataSource implements UmbDetailDataSource<UmbMedi
name: model.name,
description: model.description,
icon: model.icon,
allowedAsRoot: model.allowedAsRoot,
allowedAsRoot: model.allowedAtRoot,
variesByCulture: model.variesByCulture,
variesBySegment: model.variesBySegment,
isElement: model.isElement,

4
src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace.context.ts
View File

@@ -26,7 +26,7 @@ export class UmbMediaTypeWorkspaceContext
readonly description;
readonly icon;
readonly allowedAsRoot;
readonly allowedAtRoot;
readonly allowedContentTypes;
readonly compositions;
@@ -44,7 +44,7 @@ export class UmbMediaTypeWorkspaceContext
this.alias = this.structure.ownerContentTypeObservablePart((data) => data?.alias);
this.description = this.structure.ownerContentTypeObservablePart((data) => data?.description);
this.icon = this.structure.ownerContentTypeObservablePart((data) => data?.icon);
this.allowedAsRoot = this.structure.ownerContentTypeObservablePart((data) => data?.allowedAsRoot);
this.allowedAtRoot = this.structure.ownerContentTypeObservablePart((data) => data?.allowedAtRoot);
this.allowedContentTypes = this.structure.ownerContentTypeObservablePart((data) => data?.allowedContentTypes);
this.compositions = this.structure.ownerContentTypeObservablePart((data) => data?.compositions);
}

9
src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/structure/media-type-workspace-view-structure.element.ts
View File

@@ -13,7 +13,7 @@ export class UmbMediaTypeWorkspaceViewStructureElement extends UmbLitElement imp
#workspaceContext?: UmbMediaTypeWorkspaceContext;
@state()
private _allowedAsRoot?: boolean;
private _allowedAtRoot?: boolean;
@state()
private _allowedContentTypeIDs?: Array<string>;
@@ -30,7 +30,8 @@ export class UmbMediaTypeWorkspaceViewStructureElement extends UmbLitElement imp
private _observeMediaType() {
if (!this.#workspaceContext) return;
this.observe(this.#workspaceContext.allowedAsRoot, (allowedAsRoot) => (this._allowedAsRoot = allowedAsRoot));
this.observe(this.#workspaceContext.allowedAtRoot, (allowedAsRoot) => (this._allowedAtRoot = allowedAsRoot));
this.observe(this.#workspaceContext.allowedContentTypes, (allowedContentTypes) => {
const oldValue = this._allowedContentTypeIDs;
this._allowedContentTypeIDs = allowedContentTypes
@@ -48,9 +49,9 @@ export class UmbMediaTypeWorkspaceViewStructureElement extends UmbLitElement imp
<div slot="editor">
<uui-toggle
label=${this.localize.term('contentTypeEditor_allowAtRootHeading')}
?checked=${this._allowedAsRoot}
?checked=${this._allowedAtRoot}
@change=${(e: CustomEvent) => {
this.#workspaceContext?.updateProperty('allowedAsRoot', (e.target as UUIToggleElement).checked);
this.#workspaceContext?.updateProperty('allowedAtRoot', (e.target as UUIToggleElement).checked);
}}></uui-toggle>
</div>
</umb-property-layout>

8
src/Umbraco.Web.UI.Client/src/packages/members/member-type/repository/detail/member-type-detail.server.data-source.ts
View File

@@ -44,7 +44,7 @@ export class UmbMemberTypeServerDataSource implements UmbDetailDataSource<UmbMem
alias: '',
description: '',
icon: '',
allowedAsRoot: false,
allowedAtRoot: false,
variesByCulture: false,
variesBySegment: false,
isElement: false,
@@ -82,7 +82,7 @@ export class UmbMemberTypeServerDataSource implements UmbDetailDataSource<UmbMem
alias: data.alias,
description: data.description || null,
icon: data.icon,
allowedAsRoot: data.allowedAsRoot,
allowedAtRoot: data.allowedAsRoot,
variesByCulture: data.variesByCulture,
variesBySegment: data.variesBySegment,
isElement: data.isElement,
@@ -138,7 +138,7 @@ export class UmbMemberTypeServerDataSource implements UmbDetailDataSource<UmbMem
name: model.name,
description: model.description,
icon: model.icon,
allowedAsRoot: model.allowedAsRoot,
allowedAsRoot: model.allowedAtRoot,
variesByCulture: model.variesByCulture,
variesBySegment: model.variesBySegment,
isElement: model.isElement,
@@ -196,7 +196,7 @@ export class UmbMemberTypeServerDataSource implements UmbDetailDataSource<UmbMem
name: model.name,
description: model.description,
icon: model.icon,
allowedAsRoot: model.allowedAsRoot,
allowedAsRoot: model.allowedAtRoot,
variesByCulture: model.variesByCulture,
variesBySegment: model.variesBySegment,
isElement: model.isElement,