From a0ad88015ae5e746b3131b90ebfbada41f9f7c39 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 9 Jan 2024 15:44:13 +0100 Subject: [PATCH] add null check --- .../tree/partial-view-tree.server.data-source.ts | 6 +++--- .../scripts/tree/script-tree.server.data-source.ts | 6 +++--- .../stylesheets/tree/stylesheet-tree.server.data-source.ts | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/partial-view-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/partial-view-tree.server.data-source.ts index 40253db6d0..80f665dabb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/partial-view-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/partial-view-tree.server.data-source.ts @@ -33,14 +33,14 @@ export class UmbPartialViewTreeServerDataSource extends UmbTreeServerDataSourceB const getRootItems = () => PartialViewResource.getTreePartialViewRoot({}); const getChildrenOf = (parentUnique: string | null) => { - const serializer = new UmbServerPathUniqueSerializer(); + const parentPath = new UmbServerPathUniqueSerializer().toServerPath(parentUnique); - if (parentUnique === null) { + if (parentPath === null) { return getRootItems(); } else { // eslint-disable-next-line local-rules/no-direct-api-import return PartialViewResource.getTreePartialViewChildren({ - parentPath: serializer.toServerPath(parentUnique), + parentPath, }); } }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/script-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/script-tree.server.data-source.ts index e16fa2c1d3..aebef6903b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/script-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/script-tree.server.data-source.ts @@ -33,14 +33,14 @@ export class UmbScriptTreeServerDataSource extends UmbTreeServerDataSourceBase< const getRootItems = () => ScriptResource.getTreeScriptRoot({}); const getChildrenOf = (parentUnique: string | null) => { - const serializer = new UmbServerPathUniqueSerializer(); + const parentPath = new UmbServerPathUniqueSerializer().toServerPath(parentUnique); - if (parentUnique === null) { + if (parentPath === null) { return getRootItems(); } else { // eslint-disable-next-line local-rules/no-direct-api-import return ScriptResource.getTreeScriptChildren({ - parentPath: serializer.toServerPath(parentUnique), + parentPath, }); } }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/stylesheet-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/stylesheet-tree.server.data-source.ts index 04d0716ed3..3c3b8d8ec7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/stylesheet-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/stylesheet-tree.server.data-source.ts @@ -33,14 +33,14 @@ export class UmbStylesheetTreeServerDataSource extends UmbTreeServerDataSourceBa const getRootItems = () => StylesheetResource.getTreeStylesheetRoot({}); const getChildrenOf = (parentUnique: string | null) => { - const serializer = new UmbServerPathUniqueSerializer(); + const parentPath = new UmbServerPathUniqueSerializer().toServerPath(parentUnique); - if (parentUnique === null) { + if (parentPath === null) { return getRootItems(); } else { // eslint-disable-next-line local-rules/no-direct-api-import return StylesheetResource.getTreeStylesheetChildren({ - parentPath: serializer.toServerPath(parentUnique), + parentPath, }); } };