yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v14.2+] Fix Block Grid layoutStylesheet not using correct URL (#2512)

Browse Source 
* Update block-grid-manager.context.ts

* Renames field to `serverUrl`

Uses `URL()` object to handle slashes in constructing the URL path.

* Tidied up imports

---------

Co-authored-by: leekelleher <leekelleher@gmail.com>
This commit is contained in:
Rick Butterfield
2024-11-06 12:44:23 +00:00
committed by GitHub
parent c7b4b5142e
commit 4ddfd0d37f
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-manager.context.ts
View File

@@ -1,18 +1,19 @@
import type { UmbBlockGridLayoutModel, UmbBlockGridTypeModel } from '../types.js';
import type { UmbBlockGridWorkspaceOriginData } from '../index.js';
import {
UmbArrayState,
UmbBooleanState,
appendToFrozenArray,
pushAtToUniqueArray,
UmbArrayState,
UmbBooleanState,
} from '@umbraco-cms/backoffice/observable-api';
import { removeLastSlashFromPath, transformServerPathToClientPath } from '@umbraco-cms/backoffice/utils';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { transformServerPathToClientPath } from '@umbraco-cms/backoffice/utils';
import { UmbBlockManagerContext } from '@umbraco-cms/backoffice/block';
import { UMB_APP_CONTEXT } from '@umbraco-cms/backoffice/app';
import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
import { type UmbBlockDataModel, UmbBlockManagerContext } from '@umbraco-cms/backoffice/block';
import type { UmbBlockDataModel } from '@umbraco-cms/backoffice/block';
import type { UmbBlockTypeGroup } from '@umbraco-cms/backoffice/block-type';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import type { UmbNumberRangeValueType } from '@umbraco-cms/backoffice/models';
import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
export const UMB_BLOCK_GRID_DEFAULT_LAYOUT_STYLESHEET = '/umbraco/backoffice/css/umbraco-blockgridlayout.css';
@@ -34,7 +35,9 @@ export class UmbBlockGridManagerContext<
}
#initAppUrl: Promise<void>;
#appUrl?: string;
#serverUrl?: string;
#blockGroups = new UmbArrayState(<Array<UmbBlockTypeGroup>>[], (x) => x.key);
public readonly blockGroups = this.#blockGroups.asObservable();
@@ -45,7 +48,8 @@ export class UmbBlockGridManagerContext<
if (layoutStylesheet) {
// Cause we await initAppUrl in setting the _editorConfiguration, we can trust the appUrl begin here.
return removeLastSlashFromPath(this.#appUrl!) + transformServerPathToClientPath(layoutStylesheet);
const url = new URL(transformServerPathToClientPath(layoutStylesheet), this.#serverUrl);
return url.href;
}
return undefined;
});
@@ -85,7 +89,7 @@ export class UmbBlockGridManagerContext<
super(host);
this.#initAppUrl = this.getContext(UMB_APP_CONTEXT).then((appContext) => {
this.#appUrl = appContext.getServerUrl() + appContext.getBackofficePath();
this.#serverUrl = appContext.getServerUrl();
});
}