From a79d480df852c4d8097c2d39ae5270cc150e0571 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 5 Feb 2024 21:47:16 +0100 Subject: [PATCH] fix data type picker flow --- .../data-type-picker-flow-modal.element.ts | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts index dffe289872..c75eb16f3d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts @@ -1,4 +1,5 @@ import { UmbDataTypeTreeRepository } from '../../tree/data-type-tree.repository.js'; +import type { UmbDataTypeTreeItemModel } from '../../tree/types.js'; import { css, html, repeat, customElement, state, when, nothing } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; @@ -14,7 +15,6 @@ import { } from '@umbraco-cms/backoffice/modal'; import type { ManifestPropertyEditorUi } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; -import type { UmbEntityTreeItemModel } from '@umbraco-cms/backoffice/tree'; import { UMB_DATATYPE_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/data-type'; interface GroupedItems { @@ -31,7 +31,7 @@ export class UmbDataTypePickerFlowModalElement extends UmbModalBaseElement< } @state() - private _groupedDataTypes?: GroupedItems; + private _groupedDataTypes?: GroupedItems; @state() private _groupedPropertyEditorUIs: GroupedItems = {}; @@ -45,7 +45,7 @@ export class UmbDataTypePickerFlowModalElement extends UmbModalBaseElement< private _createDataTypeModal: UmbModalRouteRegistrationController; #treeRepository; - #dataTypes: Array = []; + #dataTypes: Array = []; #propertyEditorUIs: Array = []; #currentFilterQuery = ''; @@ -118,15 +118,15 @@ export class UmbDataTypePickerFlowModalElement extends UmbModalBaseElement< }); } - private _handleDataTypeClick(dataType: UmbEntityTreeItemModel) { - if (dataType.id) { - this._select(dataType.id); + private _handleDataTypeClick(dataType: UmbDataTypeTreeItemModel) { + if (dataType.unique) { + this._select(dataType.unique); this._submitModal(); } } - private _select(id: string | undefined) { - this.value = { selection: id ? [id] : [] }; + private _select(unique: string | undefined) { + this.value = { selection: unique ? [unique] : [] }; } private _handleFilterInput(event: UUIInputEvent) { @@ -270,13 +270,13 @@ export class UmbDataTypePickerFlowModalElement extends UmbModalBaseElement< `; } - private _renderGroupDataTypes(dataTypes: Array) { + private _renderGroupDataTypes(dataTypes: Array) { return html`
    ${repeat( dataTypes, - (dataType) => dataType.id, + (dataType) => dataType.unique, (dataType) => - html`
  • + html`