From 858e6314f76ec8dc4dcded33a277c7687c09a3dc Mon Sep 17 00:00:00 2001
From: Julia Gru <56249914+julczka@users.noreply.github.com>
Date: Wed, 31 May 2023 15:29:06 +0200
Subject: [PATCH] add parent aliast to the content when creating the template

---
 .../workspace/template-workspace.context.ts          | 12 ++++++++++--
 .../workspace/template-workspace.element.ts          | 11 ++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
index 9d98a98682..906b484808 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
@@ -122,11 +122,19 @@ export class UmbTemplateWorkspaceContext extends UmbWorkspaceContext<UmbTemplate
 		}
 	}
 
-	async createScaffold() {
+	async createScaffold(parentId: string | null = null) {
 		const { data } = await this.repository.createScaffold();
 		if (!data) return;
 		this.setIsNew(true);
-		this.#data.next(data as any);
+		this.#data.next({ ...data, id: '', name: '', alias: '', $type: 'TemplateResponseModel' });
+		if (!parentId || parentId === 'root') return;
+		await this.setMasterTemplate(parentId);
+		const RegexString = /(@{[\s\S][^if]*?Layout\s*?=\s*?)("[^"]*?"|null)(;[\s\S]*?})/gi;
+		const content = this.#data.value?.content ?? '';
+		const masterTemplateName = this.#masterTemplate.value?.name ?? '';
+		const string = content.replace(RegexString, `$1"${masterTemplateName}.cshtml"$3`) ?? '';
+
+		this.setContent(string);
 	}
 
 	public destroy() {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.element.ts
index 5bdf5d098c..ce7a519936 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.element.ts
@@ -12,18 +12,11 @@ export class UmbTemplateWorkspaceElement extends UmbLitElement {
 		this.#templateWorkspaceContext.load(entityId);
 	}
 
-	@state()
-	private _name?: string | null = '';
-
-	@state()
-	private _content?: string | null = '';
-
 	#templateWorkspaceContext = new UmbTemplateWorkspaceContext(this);
 
 	#routerPath? = '';
 
 	#element = document.createElement('umb-template-workspace-edit');
-	#key = '';
 
 	@state()
 	_routes: UmbRoute[] = [
@@ -31,8 +24,8 @@ export class UmbTemplateWorkspaceElement extends UmbLitElement {
 			path: 'create/:parentKey',
 			component: () => this.#element,
 			setup: (component: PageComponent, info: IRoutingInfo) => {
-				// const parentKey = info.match.params.parentKey;
-				this.#templateWorkspaceContext.createScaffold();
+				const parentKey = info.match.params.parentKey;
+				this.#templateWorkspaceContext.createScaffold(parentKey);
 			},
 		},
 		{