From 424828e8f6ffb844f0db0ddfe2f308cfd49700da Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 24 Sep 2024 21:47:53 +0200 Subject: [PATCH] don't hard code path checks --- .../workspace/language/language-workspace.context.ts | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace.context.ts index d6af0e37d1..d8a68d6ae6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace.context.ts @@ -33,7 +33,8 @@ export class UmbLanguageWorkspaceContext { path: 'create', component: UmbLanguageWorkspaceEditorElement, - setup: async () => { + setup: async (_component, info) => { + this._setActivePathSegment(info.match.fragments.consumed); this.create({ parent: { entityType: UMB_LANGUAGE_ROOT_ENTITY_TYPE, unique: null } }); new UmbWorkspaceIsNewRedirectController( @@ -49,19 +50,12 @@ export class UmbLanguageWorkspaceContext setup: (_component, info) => { this.removeUmbControllerByAlias('isNewRedirectController'); this.load(info.match.params.unique); + this._setActivePathSegment(info.match.fragments.consumed); }, }, ]); } - protected override _checkWillNavigateAway(newUrl: string): boolean { - if (this.getIsNew()) { - return !newUrl.includes(`/create`) || super._checkWillNavigateAway(newUrl); - } else { - return !newUrl.includes(`/edit/${this.getUnique()}`) || super._checkWillNavigateAway(newUrl); - } - } - setName(name: string) { this._data.updateCurrentData({ name }); }