Merge pull request #806 from umbraco/bug-fix/use-null-for-parentId

This commit is contained in:
Niels Lyngsø
2023-07-03 13:45:19 +02:00
committed by GitHub
3 changed files with 5 additions and 7 deletions

View File

@@ -9,7 +9,7 @@ export class UmbCreateEntityAction<T extends { copy(): Promise<void> }> extends
// TODO: can we make this a generic create action
async execute() {
// TODO: get entity type from repository?
const url = `section/settings/workspace/template/create/${this.unique || 'root'}`;
const url = `section/settings/workspace/template/create/${this.unique || 'null'}`;
// TODO: how do we handle this with a href?
history.pushState(null, '', url);
}

View File

@@ -149,7 +149,6 @@ ${currentContent}`;
alias: template.alias,
});
this.repository.requestTreeItemsOf(this.#masterTemplate.value?.id ?? null);
}
}
@@ -158,7 +157,7 @@ ${currentContent}`;
if (!data) return;
this.setIsNew(true);
this.#data.next({ ...data, id: '', name: '', alias: '', $type: 'TemplateResponseModel' });
if (!parentId || parentId === 'root') return;
if (!parentId) return;
await this.setMasterTemplate(parentId);
}

View File

@@ -21,12 +21,11 @@ export class UmbTemplateWorkspaceElement extends UmbLitElement {
@state()
_routes: UmbRoute[] = [
{
path: 'create/:parentKey',
path: 'create/:parentId',
component: () => this.#element,
setup: (component: PageComponent, info: IRoutingInfo) => {
const parentKey = info.match.params.parentKey;
this.#templateWorkspaceContext.create(parentKey === 'root' ? null : parentKey);
const parentId = info.match.params.parentId === 'null' ? null : info.match.params.parentId;
this.#templateWorkspaceContext.create(parentId);
},
},
{