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

append more properties to add base url for

Browse Source
This commit is contained in:
Niels Lyngsø
2023-11-16 14:03:23 +01:00
parent 40f8f8fe52
commit ee0c7dad95
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web.UI.Client/src/apps/backoffice/server-extension-registrator.controller.ts
View File

@@ -23,7 +23,7 @@ export class UmbServerExtensionRegistrator extends UmbBaseController {
This code is copy pasted from the package repository. We probably don't need this is the package repository anymore.
*/
const { data: packages } = await tryExecuteAndNotify(this._host, PackageResource.getPackageManifest());
const { data: packages } = await tryExecuteAndNotify(this, PackageResource.getPackageManifest());
if (packages) {
// Append packages to the store but only if they have a name
@@ -39,13 +39,21 @@ export class UmbServerExtensionRegistrator extends UmbBaseController {
* Crude check to see if extension is of type "js" since it is safe to assume we do not
* need to load any other types of extensions in the backoffice (we need a js file to load)
*/
// Add API base url if the js path is relative
if ('js' in e && typeof e.js === 'string' && !e.js.startsWith('http')) {
e.js = `${this.#apiBaseUrl}${e.js}`;
}
// TODO: Niels: I assume we also need to do this for, element and api?
// Add API base url if the element path is relative
if ('element' in e && typeof e.element === 'string' && !e.element.startsWith('http')) {
e.element = `${this.#apiBaseUrl}${e.element}`;
}
// Add API base url if the element path api relative
if ('api' in e && typeof e.api === 'string' && !e.api.startsWith('http')) {
e.api = `${this.#apiBaseUrl}${e.api}`;
}
extensions.push(e);
}

13
src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.repository.ts
View File

@@ -54,11 +54,21 @@ export class UmbPackageRepository extends UmbBaseController implements UmbApi {
* Crude check to see if extension is of type "js" since it is safe to assume we do not
* need to load any other types of extensions in the backoffice (we need a js file to load)
*/
// Add API base url if the js path is relative
// Add API base url if the js path is relative
if ('js' in e && typeof e.js === 'string' && !e.js.startsWith('http')) {
e.js = `${this.#apiBaseUrl}${e.js}`;
}
// Add API base url if the element path is relative
if ('element' in e && typeof e.element === 'string' && !e.element.startsWith('http')) {
e.element = `${this.#apiBaseUrl}${e.element}`;
}
// Add API base url if the element path api relative
if ('api' in e && typeof e.api === 'string' && !e.api.startsWith('http')) {
e.api = `${this.#apiBaseUrl}${e.api}`;
}
extensions.push(e);
}
});
@@ -106,5 +116,4 @@ export class UmbPackageRepository extends UmbBaseController implements UmbApi {
await this.#init;
return this.#packageStore!.migrations;
}
}