From 37c4ede0760b0e4340cfcbeaf51ffb4b02a5ef99 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 24 Sep 2024 19:18:39 +0200 Subject: [PATCH] simplify check --- .../data-type/workspace/data-type-workspace.context.ts | 8 ++------ .../workspace/language/language-workspace.context.ts | 8 ++------ .../user/user/workspace/user/user-workspace.context.ts | 8 ++------ 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts index 852c2c8290..1e1e462031 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts @@ -114,14 +114,10 @@ export class UmbDataTypeWorkspaceContext } protected override _checkWillNavigateAway(newUrl: string): boolean { - super._checkWillNavigateAway(newUrl); - - const workspacePathBase = UMB_WORKSPACE_PATH_PATTERN.generateLocal({ entityType: this.getEntityType() }); - if (this.getIsNew()) { - return !newUrl.includes(`${workspacePathBase}/create`); + return !newUrl.includes(`/create`) || super._checkWillNavigateAway(newUrl); } else { - return !newUrl.includes(`${workspacePathBase}/edit/${this.getUnique()}`); + return !newUrl.includes(`/edit/${this.getUnique()}`) || super._checkWillNavigateAway(newUrl); } } 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 a59c0ac6da..ed9e65e2e8 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 @@ -56,14 +56,10 @@ export class UmbLanguageWorkspaceContext } protected override _checkWillNavigateAway(newUrl: string): boolean { - super._checkWillNavigateAway(newUrl); - - const workspacePathBase = UMB_WORKSPACE_PATH_PATTERN.generateLocal({ entityType: this.getEntityType() }); - if (this.getIsNew()) { - return !newUrl.includes(`${workspacePathBase}/create`); + return !newUrl.includes(`/create`) || super._checkWillNavigateAway(newUrl); } else { - return !newUrl.includes(`${workspacePathBase}/edit/${this.getUnique()}`); + return !newUrl.includes(`/edit/${this.getUnique()}`) || super._checkWillNavigateAway(newUrl); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace.context.ts index 6fd21fdc65..7f14410c9d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace.context.ts @@ -56,14 +56,10 @@ export class UmbUserWorkspaceContext } protected override _checkWillNavigateAway(newUrl: string): boolean { - super._checkWillNavigateAway(newUrl); - - const workspacePathBase = UMB_WORKSPACE_PATH_PATTERN.generateLocal({ entityType: this.getEntityType() }); - if (this.getIsNew()) { - return !newUrl.includes(`${workspacePathBase}/create`); + return !newUrl.includes(`/create`) || super._checkWillNavigateAway(newUrl); } else { - return !newUrl.includes(`${workspacePathBase}/edit/${this.getUnique()}`); + return !newUrl.includes(`/edit/${this.getUnique()}`) || super._checkWillNavigateAway(newUrl); } }