Merge pull request #2350 from umbraco/v15/bugfix/discard-changes-path-compare

Bugfix: Discard changes path compare

Author: madsrasmussen

src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts

@@ -1,6 +1,5 @@
 import { UmbSubmittableWorkspaceContextBase } from '../submittable/index.js';
 import { UmbEntityWorkspaceDataManager } from '../entity/entity-workspace-data-manager.js';
-import { UMB_WORKSPACE_PATH_PATTERN } from '../paths.js';
 import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import type { UmbEntityModel, UmbEntityUnique } from '@umbraco-cms/backoffice/entity';
@@ -153,9 +152,7 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	 * @memberof UmbEntityWorkspaceContextBase
 	 */
 	protected _checkWillNavigateAway(newUrl: string) {
-		const workspaceBasePath = UMB_WORKSPACE_PATH_PATTERN.generateLocal({ entityType: this.getEntityType() });
-		const currentWorkspacePathIdentifier = '/' + workspaceBasePath + '/' + this.routes.getActiveLocalPath();
-		return !newUrl.includes(currentWorkspacePathIdentifier);
+		return !newUrl.includes(this.routes.getActiveLocalPath());
 	}
 
 	async #create(currentData: DetailModelType) {

src/packages/data-type/index.ts

@@ -5,6 +5,7 @@ export * from './entity.js';
 export * from './repository/index.js';
 export * from './workspace/index.js';
 export * from './modals/index.js';
+export * from './paths.js';
 
 export { UmbMoveDataTypeRepository, UMB_MOVE_DATA_TYPE_REPOSITORY_ALIAS } from './entity-actions/move-to/index.js';
 

src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts

@@ -1,6 +1,8 @@
 import { UMB_DATATYPE_WORKSPACE_MODAL } from '../../workspace/data-type-workspace.modal-token.js';
-import { UMB_DATA_TYPE_ENTITY_TYPE } from '../../entity.js';
+import { UMB_DATA_TYPE_ENTITY_TYPE, UMB_DATA_TYPE_ROOT_ENTITY_TYPE } from '../../entity.js';
 import { UmbDataTypeCollectionRepository } from '../../collection/index.js';
+import type { UmbDataTypeItemModel } from '../../repository/index.js';
+import { UMB_CREATE_DATA_TYPE_WORKSPACE_PATH_PATTERN } from '../../paths.js';
 import { UMB_DATA_TYPE_PICKER_FLOW_DATA_TYPE_PICKER_MODAL } from './data-type-picker-flow-data-type-picker-modal.token.js';
 import type {
 	UmbDataTypePickerFlowModalData,
@@ -16,7 +18,6 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UMB_CONTENT_TYPE_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/content-type';
 import { UMB_PROPERTY_TYPE_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/property-type';
 import type { ManifestPropertyEditorUi } from '@umbraco-cms/backoffice/property-editor';
-import type { UmbDataTypeItemModel } from '@umbraco-cms/backoffice/data-type';
 import type { UmbModalRouteBuilder } from '@umbraco-cms/backoffice/router';
 import type { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
 
@@ -68,12 +69,14 @@ export class UmbDataTypePickerFlowModalElement extends UmbModalBaseElement<
 	}
 
 	#createDataType(propertyEditorUiAlias: string) {
+		const createPath = UMB_CREATE_DATA_TYPE_WORKSPACE_PATH_PATTERN.generateLocal({
+			parentEntityType: UMB_DATA_TYPE_ROOT_ENTITY_TYPE,
+			parentUnique: null,
+		});
+
 		// TODO: Could be nice with a more pretty way to prepend to the URL:
 		// Open create modal:
-		this.#createDataTypeModal.open(
-			{ uiAlias: propertyEditorUiAlias },
-			`create/parent/${UMB_DATA_TYPE_ENTITY_TYPE}/null`,
-		);
+		this.#createDataTypeModal.open({ uiAlias: propertyEditorUiAlias }, createPath);
 	}
 
 	async #init() {

src/packages/data-type/paths.ts

@@ -0,0 +1,20 @@
+import { UMB_DATA_TYPE_ENTITY_TYPE, UMB_DATA_TYPE_ROOT_ENTITY_TYPE } from './entity.js';
+import { UMB_WORKSPACE_PATH_PATTERN } from '@umbraco-cms/backoffice/workspace';
+import { UMB_SETTINGS_SECTION_PATHNAME } from '@umbraco-cms/backoffice/settings';
+import { UmbPathPattern } from '@umbraco-cms/backoffice/router';
+import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
+
+export const UMB_DATA_TYPE_WORKSPACE_PATH = UMB_WORKSPACE_PATH_PATTERN.generateAbsolute({
+	sectionName: UMB_SETTINGS_SECTION_PATHNAME,
+	entityType: UMB_DATA_TYPE_ENTITY_TYPE,
+});
+
+export const UMB_DATA_TYPE_ROOT_WORKSPACE_PATH = UMB_WORKSPACE_PATH_PATTERN.generateAbsolute({
+	sectionName: UMB_SETTINGS_SECTION_PATHNAME,
+	entityType: UMB_DATA_TYPE_ROOT_ENTITY_TYPE,
+});
+
+export const UMB_CREATE_DATA_TYPE_WORKSPACE_PATH_PATTERN = new UmbPathPattern<{
+	parentEntityType: UmbEntityModel['entityType'];
+	parentUnique: UmbEntityModel['unique'];
+}>('create/parent/:parentEntityType/:parentUnique', UMB_DATA_TYPE_WORKSPACE_PATH);