From ff75d89e3f900cf5ea23d5bef72d7959187a3d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 22 Feb 2024 15:24:05 +0100 Subject: [PATCH] remove UDI utils --- .../block/context/block-manager.context.ts | 5 +++- .../src/shared/utils/index.ts | 1 - .../src/shared/utils/udi.ts | 23 ------------------- 3 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/shared/utils/udi.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context.ts index 294595b78f..521ca6a25e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context.ts @@ -3,7 +3,6 @@ import { UmbContextBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbArrayState, UmbClassState, UmbStringState } from '@umbraco-cms/backoffice/observable-api'; import { UmbDocumentTypeDetailRepository } from '@umbraco-cms/backoffice/document-type'; -import { buildUdi, getKeyFromUdi } from '@umbraco-cms/backoffice/utils'; import type { UmbBlockTypeBaseModel, UmbBlockWorkspaceData } from '@umbraco-cms/backoffice/block'; import { UMB_BLOCK_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/block'; import type { UmbContentTypeModel } from '@umbraco-cms/backoffice/content-type'; @@ -12,6 +11,10 @@ import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/ import { UMB_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/property'; import type { UmbVariantId } from '@umbraco-cms/backoffice/variant'; +function buildUdi(entityType: string, guid: string) { + return `umb://${entityType}/${guid.replace(/-/g, '')}`; +} + export type UmbBlockDataObjectModel = { layout: LayoutEntryType; content: UmbBlockDataType; diff --git a/src/Umbraco.Web.UI.Client/src/shared/utils/index.ts b/src/Umbraco.Web.UI.Client/src/shared/utils/index.ts index fae5270f48..f68fb1cb1e 100644 --- a/src/Umbraco.Web.UI.Client/src/shared/utils/index.ts +++ b/src/Umbraco.Web.UI.Client/src/shared/utils/index.ts @@ -9,7 +9,6 @@ export * from './path-decode.function.js'; export * from './path-encode.function.js'; export * from './path-folder-name.function.js'; export * from './selection-manager/selection.manager.js'; -export * from './udi.js'; export * from './umbraco-path.function.js'; export * from './math.js'; export * from './split-string-to-array.js'; diff --git a/src/Umbraco.Web.UI.Client/src/shared/utils/udi.ts b/src/Umbraco.Web.UI.Client/src/shared/utils/udi.ts deleted file mode 100644 index a943c6b452..0000000000 --- a/src/Umbraco.Web.UI.Client/src/shared/utils/udi.ts +++ /dev/null @@ -1,23 +0,0 @@ -export function buildUdi(entityType: string, guid: string) { - return `umb://${entityType}/${guid.replace(/-/g, '')}`; -} - -export function getKeyFromUdi(udi: string) { - if (typeof udi !== 'string') { - throw 'udi is not a string'; - } - if (!udi.startsWith('umb://')) { - throw 'udi does not start with umb://'; - } - const withoutScheme = udi.substring('umb://'.length); - const withoutHost = withoutScheme.substring(withoutScheme.indexOf('/') + 1).trim(); - - if (withoutHost.length !== 32) { - throw 'udi is not 32 chars'; - } - - return `${withoutHost.substring(0, 8)}-${withoutHost.substring(8, 12)}-${withoutHost.substring( - 12, - 16, - )}-${withoutHost.substring(16, 20)}-${withoutHost.substring(20)}`; -}