refactor isNew content-type implementations

Author: nielslyngsoe

src/packages/documents/document-types/workspace/document-type-workspace-editor.element.ts

@@ -15,6 +15,9 @@ export class UmbDocumentTypeWorkspaceEditorElement extends UmbLitElement {
 	@state()
 	private _icon?: string;
 
+	@state()
+	private _isNew?: string;
+
 	#workspaceContext?: typeof UMB_DOCUMENT_TYPE_WORKSPACE_CONTEXT.TYPE;
 
 	constructor() {
@@ -31,6 +34,7 @@ export class UmbDocumentTypeWorkspaceEditorElement extends UmbLitElement {
 		this.observe(this.#workspaceContext.name, (name) => (this._name = name), '_observeName');
 		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() {
@@ -70,6 +74,7 @@ export class UmbDocumentTypeWorkspaceEditorElement extends UmbLitElement {
 						label="name"
 						value=${this._name}
 						alias=${this._alias}
+						?auto-generate-alias=${this._isNew}
 						@change="${this.#onNameAndAliasChange}"
 						${umbFocus()}></umb-input-with-alias>
 				</div>

src/packages/documents/document-types/workspace/document-type-workspace.context.ts

@@ -287,18 +287,18 @@ export class UmbDocumentTypeWorkspaceContext
 				this.setDefaultTemplate(templateEntity);
 			}
 
-			if ((await this.structure.create(parent.unique)) === true) {
-				// TODO: this might not be the right place to alert the tree, but it works for now
-				const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
-				const event = new UmbRequestReloadTreeItemChildrenEvent({
-					entityType: parent.entityType,
-					unique: parent.unique,
-				});
-				eventContext.dispatchEvent(event);
-
-				this.setIsNew(false);
-				this.createTemplateMode = false;
-			}
+			await this.structure.create(parent.unique);
+
+			// TODO: this might not be the right place to alert the tree, but it works for now
+			const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
+			const event = new UmbRequestReloadTreeItemChildrenEvent({
+				entityType: parent.entityType,
+				unique: parent.unique,
+			});
+			eventContext.dispatchEvent(event);
+
+			this.setIsNew(false);
+			this.createTemplateMode = false;
 		} else {
 			await this.structure.save();
 

src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts

@@ -18,6 +18,9 @@ export class UmbMediaTypeWorkspaceEditorElement extends UmbLitElement {
 	@state()
 	private _icon?: string;
 
+	@state()
+	private _isNew?: string;
+
 	#workspaceContext?: UmbMediaTypeWorkspaceContext;
 
 	constructor() {
@@ -34,6 +37,7 @@ export class UmbMediaTypeWorkspaceEditorElement extends UmbLitElement {
 		this.observe(this.#workspaceContext.name, (name) => (this._name = name), '_observeName');
 		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() {
@@ -73,6 +77,7 @@ export class UmbMediaTypeWorkspaceEditorElement extends UmbLitElement {
 					label="name"
 					value=${this._name}
 					alias=${this._alias}
+					?auto-generate-alias=${this._isNew}
 					@change="${this.#onNameAndAliasChange}"
 					${umbFocus()}></umb-input-with-alias>
 			</div>

src/packages/media/media-types/workspace/media-type-workspace.context.ts

@@ -208,17 +208,15 @@ export class UmbMediaTypeWorkspaceContext
 			const parent = this.#parent.getValue();
 			if (!parent) throw new Error('Parent is not set');
 
-			if ((await this.structure.create(parent.unique)) === true) {
-				if (!parent) throw new Error('Parent is not set');
-
-				const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
-				const event = new UmbRequestReloadTreeItemChildrenEvent({
-					entityType: parent.entityType,
-					unique: parent.unique,
-				});
-				eventContext.dispatchEvent(event);
-				this.setIsNew(false);
-			}
+			await this.structure.create(parent.unique);
+
+			const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
+			const event = new UmbRequestReloadTreeItemChildrenEvent({
+				entityType: parent.entityType,
+				unique: parent.unique,
+			});
+			eventContext.dispatchEvent(event);
+			this.setIsNew(false);
 		} else {
 			await this.structure.save();
 

src/packages/members/member-type/workspace/member-type-workspace-editor.element.ts

@@ -14,6 +14,9 @@ export class UmbMemberTypeWorkspaceEditorElement extends UmbLitElement {
 	@state()
 	private _icon?: string;
 
+	@state()
+	private _isNew?: string;
+
 	@state()
 	private _iconColorAlias?: string;
 	// TODO: Color should be using an alias, and look up in some dictionary/key/value) of project-colors.
@@ -34,18 +37,7 @@ export class UmbMemberTypeWorkspaceEditorElement extends UmbLitElement {
 		this.observe(this.#workspaceContext.name, (name) => (this._name = name), '_observeName');
 		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) => {
-				if (isNew) {
-					// TODO: Would be good with a more general way to bring focus to the name input.
-					(this.shadowRoot?.querySelector('#name') as HTMLElement)?.focus();
-				}
-				this.removeUmbControllerByAlias('_observeIsNew');
-			},
-			'_observeIsNew',
-		);
+		this.observe(this.#workspaceContext.isNew, (isNew) => (this._isNew = isNew), '_observeIsNew');
 	}
 
 	private async _handleIconClick() {
@@ -85,6 +77,7 @@ export class UmbMemberTypeWorkspaceEditorElement extends UmbLitElement {
 						label="name"
 						value=${this._name}
 						alias=${this._alias}
+						?auto-generate-alias=${this._isNew}
 						@change="${this.#onNameAndAliasChange}"
 						${umbFocus()}></umb-input-with-alias>
 				</div>

src/packages/members/member-type/workspace/member-type-workspace.context.ts

@@ -173,31 +173,30 @@ export class UmbMemberTypeWorkspaceContext
 		}
 	}
 
+	/**
+	 * Save or creates the member type, based on wether its a new one or existing.
+	 */
 	async submit() {
 		const data = this.getData();
-		if (data === undefined) throw new Error('Cannot save, no data');
+		if (!data) {
+			throw new Error('Something went wrong, there is no data for media type you want to save...');
+		}
 
 		if (this.getIsNew()) {
 			const parent = this.#parent.getValue();
 			if (!parent) throw new Error('Parent is not set');
-			const { error } = await this.repository.create(data, parent.unique);
-			if (error) {
-				throw new Error(error.message);
-			}
-			this.setIsNew(false);
 
-			// TODO: this might not be the right place to alert the tree, but it works for now
+			await this.structure.create(parent.unique);
+
 			const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
 			const event = new UmbRequestReloadTreeItemChildrenEvent({
 				entityType: parent.entityType,
 				unique: parent.unique,
 			});
 			eventContext.dispatchEvent(event);
+			this.setIsNew(false);
 		} else {
-			const { error } = await this.structure.save();
-			if (error) {
-				throw new Error(error.message);
-			}
+			await this.structure.save();
 
 			const actionEventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
 			const event = new UmbRequestReloadStructureForEntityEvent({