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

fix member type editor

Browse Source
This commit is contained in:
Niels Lyngsø
2024-03-15 08:11:05 +01:00
parent 7d40d63817
commit 3c033bc1a4
4 changed files with 106 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,9 +6,11 @@ import type {
import { UmbSaveWorkspaceAction } from '@umbraco-cms/backoffice/workspace';
export const UMB_MEDIA_TYPE_WORKSPACE_ALIAS = 'Umb.Workspace.MediaType';
const workspace: ManifestWorkspace = {
type: 'workspace',
alias: 'Umb.Workspace.MediaType',
alias: UMB_MEDIA_TYPE_WORKSPACE_ALIAS,
name: 'Media Type Workspace',
js: () => import('./media-type-workspace.element.js'),
meta: {

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

@@ -5,7 +5,7 @@ import type { UmbSaveableWorkspaceContextInterface } from '@umbraco-cms/backoffi
import { UmbEditableWorkspaceContextBase } from '@umbraco-cms/backoffice/workspace';
import { UmbContentTypeStructureManager } from '@umbraco-cms/backoffice/content-type';
import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
import { UmbBooleanState, UmbObjectState } from '@umbraco-cms/backoffice/observable-api';
import { UmbObjectState } from '@umbraco-cms/backoffice/observable-api';
import type {
UmbContentTypeCompositionModel,
UmbContentTypeSortModel,
@@ -46,9 +46,6 @@ export class UmbMediaTypeWorkspaceContext
readonly structure = new UmbContentTypeStructureManager<EntityType>(this, this.repository);
#isSorting = new UmbBooleanState(undefined);
isSorting = this.#isSorting.asObservable();
constructor(host: UmbControllerHost) {
super(host, 'Umb.Workspace.MediaType');
@@ -66,17 +63,9 @@ export class UmbMediaTypeWorkspaceContext
this.collection = this.structure.ownerContentTypeObservablePart((data) => data?.collection);
}
protected resetState() {
this.#persistedData.setValue(undefined);
protected resetState(): void {
super.resetState();
}
getIsSorting() {
return this.#isSorting.getValue();
}
setIsSorting(isSorting: boolean) {
this.#isSorting.setValue(isSorting);
this.#persistedData.setValue(undefined);
}
getData() {
@@ -112,6 +101,18 @@ export class UmbMediaTypeWorkspaceContext
this.structure.updateOwnerContentType({ allowedAtRoot });
}
setVariesByCulture(variesByCulture: boolean) {
this.structure.updateOwnerContentType({ variesByCulture });
}
setVariesBySegment(variesBySegment: boolean) {
this.structure.updateOwnerContentType({ variesBySegment });
}
setIsElement(isElement: boolean) {
this.structure.updateOwnerContentType({ isElement });
}
setAllowedContentTypes(allowedContentTypes: Array<UmbContentTypeSortModel>) {
this.structure.updateOwnerContentType({ allowedContentTypes });
}
@@ -131,7 +132,6 @@ export class UmbMediaTypeWorkspaceContext
if (!data) return undefined;
this.setIsNew(true);
this.setIsSorting(false);
this.#persistedData.setValue(data);
return data;
}
@@ -142,19 +142,18 @@ export class UmbMediaTypeWorkspaceContext
if (data) {
this.setIsNew(false);
this.setIsSorting(false);
this.#persistedData.update(data);
}
if (asObservable) {
this.observe(asObservable(), (entity) => this.#onStoreChange(entity), 'umbMediaTypeStoreObserver');
this.observe(asObservable(), (entity) => this.#onStoreChange(entity), 'umbDocumentTypeStoreObserver');
}
}
#onStoreChange(entity: EntityType | undefined) {
if (!entity) {
//TODO: This solution is alright for now. But reconsider when we introduce signal-r
history.pushState(null, '', 'section/settings/workspace/media-type-root');
history.pushState(null, '', 'section/settings/workspace/document-type-root');
}
}

2
src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/manifests.ts
View File

@@ -9,7 +9,7 @@ export const UMB_MEMBER_TYPE_WORKSPACE_ALIAS = 'Umb.Workspace.MemberType';
const workspace: ManifestWorkspace = {
type: 'workspace',
alias: 'Umb.Workspace.MemberType',
alias: UMB_MEMBER_TYPE_WORKSPACE_ALIAS,
name: 'Member Type Workspace',
js: () => import('./member-type-workspace.element.js'),
meta: {

136
src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/member-type-workspace.context.ts
View File

@@ -1,24 +1,30 @@
import { UmbMemberTypeDetailRepository } from '../repository/detail/index.js';
import type { UmbMemberTypeDetailModel } from '../types.js';
import { UMB_MEMBER_TYPE_ENTITY_TYPE } from '../index.js';
import {
type UmbSaveableWorkspaceContextInterface,
UmbEditableWorkspaceContextBase,
} from '@umbraco-cms/backoffice/workspace';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
import { UmbContentTypeStructureManager } from '@umbraco-cms/backoffice/content-type';
import {
type UmbContentTypeCompositionModel,
type UmbContentTypeSortModel,
UmbContentTypeStructureManager,
type UmbContentTypeWorkspaceContext,
} from '@umbraco-cms/backoffice/content-type';
import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
import { UmbReloadTreeItemChildrenRequestEntityActionEvent } from '@umbraco-cms/backoffice/tree';
import { UmbBooleanState, UmbObjectState } from '@umbraco-cms/backoffice/observable-api';
import { UmbObjectState } from '@umbraco-cms/backoffice/observable-api';
import { UmbRequestReloadStructureForEntityEvent } from '@umbraco-cms/backoffice/event';
import type { UmbReferenceByUnique } from '@umbraco-cms/backoffice/models';
type EntityType = UmbMemberTypeDetailModel;
export class UmbMemberTypeWorkspaceContext
extends UmbEditableWorkspaceContextBase<EntityType>
implements UmbSaveableWorkspaceContextInterface
implements UmbContentTypeWorkspaceContext<EntityType>
{
#isSorting = new UmbBooleanState(undefined);
isSorting = this.#isSorting.asObservable();
readonly IS_CONTENT_TYPE_WORKSPACE_CONTEXT = true;
public readonly repository = new UmbMemberTypeDetailRepository(this);
#parent?: { entityType: string; unique: string | null };
@@ -57,10 +63,6 @@ export class UmbMemberTypeWorkspaceContext
this.compositions = this.structure.ownerContentTypeObservablePart((data) => data?.compositions);
}
setIsSorting(isSorting: boolean) {
this.#isSorting.setValue(isSorting);
}
set<PropertyName extends keyof EntityType>(propertyName: PropertyName, value: EntityType[PropertyName]) {
this.structure.updateOwnerContentType({ [propertyName]: value });
}
@@ -68,29 +70,63 @@ export class UmbMemberTypeWorkspaceContext
protected resetState(): void {
super.resetState();
this.#persistedData.setValue(undefined);
this.#isSorting.setValue(false);
}
async load(unique: string) {
this.resetState();
const { data, asObservable } = await this.structure.loadType(unique);
if (data) {
this.setIsNew(false);
this.setIsSorting(false);
this.#persistedData.update(data);
}
if (asObservable) {
this.observe(asObservable(), (entity) => this.#onStoreChange(entity), 'umbMemberTypeStoreObserver');
}
getData() {
return this.structure.getOwnerContentType();
}
#onStoreChange(entity: EntityType | undefined) {
if (!entity) {
//TODO: This solution is alright for now. But reconsider when we introduce signal-r
history.pushState(null, '', 'section/settings/workspace/member-type-root');
}
getUnique() {
return this.getData()?.unique;
}
getEntityType() {
return UMB_MEMBER_TYPE_ENTITY_TYPE;
}
setName(name: string) {
this.structure.updateOwnerContentType({ name });
}
setAlias(alias: string) {
this.structure.updateOwnerContentType({ alias });
}
setDescription(description: string) {
this.structure.updateOwnerContentType({ description });
}
// TODO: manage setting icon color alias?
setIcon(icon: string) {
this.structure.updateOwnerContentType({ icon });
}
setAllowedAtRoot(allowedAtRoot: boolean) {
this.structure.updateOwnerContentType({ allowedAtRoot });
}
setVariesByCulture(variesByCulture: boolean) {
this.structure.updateOwnerContentType({ variesByCulture });
}
setVariesBySegment(variesBySegment: boolean) {
this.structure.updateOwnerContentType({ variesBySegment });
}
setIsElement(isElement: boolean) {
this.structure.updateOwnerContentType({ isElement });
}
setAllowedContentTypes(allowedContentTypes: Array<UmbContentTypeSortModel>) {
this.structure.updateOwnerContentType({ allowedContentTypes });
}
setCompositions(compositions: Array<UmbContentTypeCompositionModel>) {
this.structure.updateOwnerContentType({ compositions });
}
setCollection(collection: UmbReferenceByUnique) {
this.structure.updateOwnerContentType({ collection });
}
async create(parent: { entityType: string; unique: string | null }) {
@@ -100,11 +136,31 @@ export class UmbMemberTypeWorkspaceContext
if (!data) return undefined;
this.setIsNew(true);
this.setIsSorting(false);
this.#persistedData.setValue(data);
return data;
}
async load(unique: string) {
this.resetState();
const { data, asObservable } = await this.structure.loadType(unique);
if (data) {
this.setIsNew(false);
this.#persistedData.update(data);
}
if (asObservable) {
this.observe(asObservable(), (entity) => this.#onStoreChange(entity), 'umbDocumentTypeStoreObserver');
}
}
#onStoreChange(entity: EntityType | undefined) {
if (!entity) {
//TODO: This solution is alright for now. But reconsider when we introduce signal-r
history.pushState(null, '', 'section/settings/workspace/document-type-root');
}
}
async save() {
const data = this.getData();
if (data === undefined) throw new Error('Cannot save, no data');
@@ -140,28 +196,6 @@ export class UmbMemberTypeWorkspaceContext
this.structure.destroy();
super.destroy();
}
getData() {
return this.structure.getOwnerContentType();
}
getUnique() {
return this.getData()?.unique || '';
}
getEntityType() {
return 'member-type';
}
setName(name: string) {
this.structure.updateOwnerContentType({ name });
}
setAlias(alias: string) {
this.structure.updateOwnerContentType({ alias });
}
setDescription(description: string) {
this.structure.updateOwnerContentType({ description });
}
}
export const UMB_MEMBER_TYPE_WORKSPACE_CONTEXT = new UmbContextToken<