@umbraco-cms/backoffice 14.0.0-bd6f74b3 → 14.0.0-c074e160

package/README.md

@@ -29,9 +29,12 @@ Create an umbraco-package.json file in the root of your package.
 				"label": "My Dashboard",
 				"pathname": "my-dashboard"
 			},
-			"conditions": {
-				"sections": ["Umb.Section.Content"]
-			}
+			"conditions": [
+				{
+					"alias": "Umb.Condition.SectionAlias",
+					"match": "Umb.Section.Content"
+				}
+			]
 		}
 	]
 }
@@ -157,9 +160,12 @@ Finally add an umbraco-package.json file in the root of your package folder `my-
 				"label": "My Dashboard",
 				"pathname": "my-dashboard"
 			},
-			"conditions": {
-				"sections": ["Umb.Section.Content"]
-			}
+			"conditions": [
+				{
+					"alias": "Umb.Condition.SectionAlias",
+					"match": "Umb.Section.Content"
+				}
+			]
 		}
 	]
 }

package/dist-cms/{shared/context → apps/app}/app.context.d.ts

@@ -6,4 +6,4 @@ export declare class UmbAppContext {
     getBackofficePath(): string;
     getServerUrl(): string;
 }
-export declare const UMB_APP: UmbContextToken<UmbAppContext>;
+export declare const UMB_APP: UmbContextToken<UmbAppContext, UmbAppContext>;

package/dist-cms/apps/app/app.element.d.ts

@@ -8,17 +8,6 @@ export declare class UmbAppElement extends UmbLitElement {
      * @remarks This is the base URL of the Umbraco server, not the base URL of the backoffice.
      */
     serverUrl: string;
-    /**
-     * The default culture to use for localization.
-     *
-     * When the current user is resolved, the culture will be set to the user's culture.
-     *
-     * @attr
-     * @remarks This is the default culture to use for localization, not the current culture.
-     * @example "en-us"
-     * @example "en"
-     */
-    culture: string;
     /**
      * The base path of the backoffice.
      *

package/dist-cms/apps/app/app.element.js

@@ -4,9 +4,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { umbTranslationRegistry } from '../../packages/core/localization/index.js';
+import { UMB_APP, UmbAppContext } from './app.context.js';
+import { umbLocalizationRegistry } from '../../packages/core/localization/index.js';
 import { UMB_AUTH, UmbAuthFlow, UmbAuthContext } from '../../shared/auth/index.js';
-import { UMB_APP, UmbAppContext } from '../../shared/context/index.js';
 import { css, html, customElement, property } from '../../external/lit/index.js';
 import { UUIIconRegistryEssential } from '../../external/uui/index.js';
 import { UmbIconRegistry } from '../../shared/icon-registry/index.js';
@@ -29,17 +29,6 @@ export let UmbAppElement = class UmbAppElement extends UmbLitElement {
          * @remarks This is the base URL of the Umbraco server, not the base URL of the backoffice.
          */
         this.serverUrl = window.location.origin;
-        /**
-         * The default culture to use for localization.
-         *
-         * When the current user is resolved, the culture will be set to the user's culture.
-         *
-         * @attr
-         * @remarks This is the default culture to use for localization, not the current culture.
-         * @example "en-us"
-         * @example "en"
-         */
-        this.culture = 'en-us';
         /**
          * The base path of the backoffice.
          *
@@ -79,12 +68,22 @@ export let UmbAppElement = class UmbAppElement extends UmbLitElement {
         this.#setup();
     }
     #setLanguage() {
-        umbTranslationRegistry.loadLanguage(this.culture);
+        if (this.lang) {
+            umbLocalizationRegistry.loadLanguage(this.lang);
+        }
     }
     #listenForLanguageChange(authContext) {
-        this.observe(authContext.languageIsoCode, (currentLanguageIsoCode) => {
-            umbTranslationRegistry.loadLanguage(currentLanguageIsoCode);
-        }, 'languageIsoCode');
+        // This will wait for the default language to be loaded before attempting to load the current user language
+        // just in case the user language is not the default language.
+        // We **need** to do this because the default language (typically en-us) holds all the fallback keys for all the other languages.
+        // This way we can ensure that the document language is always loaded first and subsequently registered as the fallback language.
+        umbLocalizationRegistry.isDefaultLoaded.subscribe((isDefaultLoaded) => {
+            if (!isDefaultLoaded)
+                return;
+            this.observe(authContext.languageIsoCode, (currentLanguageIsoCode) => {
+                umbLocalizationRegistry.loadLanguage(currentLanguageIsoCode);
+            }, 'languageIsoCode');
+        });
     }
     async #setup() {
         if (this.serverUrl === undefined)
@@ -97,6 +96,9 @@ export let UmbAppElement = class UmbAppElement extends UmbLitElement {
         this.provideContext(UMB_APP, new UmbAppContext({ backofficePath: this.backofficePath, serverUrl: this.serverUrl }));
         // Try to initialise the auth flow and get the runtime status
         try {
+            if (this.bypassAuth === false) {
+                await this.#authFlow.fetchServiceConfiguration();
+            }
             // Get the current runtime level
             await this.#setInitStatus();
             // If the runtime level is "install" we should clear any cached tokens
@@ -247,9 +249,6 @@ export let UmbAppElement = class UmbAppElement extends UmbLitElement {
 __decorate([
     property({ type: String })
 ], UmbAppElement.prototype, "serverUrl", void 0);
-__decorate([
-    property({ type: String, attribute: 'default-culture' })
-], UmbAppElement.prototype, "culture", void 0);
 __decorate([
     property({ type: String })
     // TODO: get from server config

package/dist-cms/apps/app/index.d.ts

@@ -1,3 +1,4 @@
 export * from './app-context-config.interface.js';
 export * from './app-error.element.js';
 export * from './app.element.js';
+export * from './app.context.js';

package/dist-cms/apps/app/index.js

@@ -1,3 +1,4 @@
 export * from './app-context-config.interface.js';
 export * from './app-error.element.js';
 export * from './app.element.js';
+export * from './app.context.js';

package/dist-cms/apps/backoffice/backoffice.context.d.ts

@@ -9,4 +9,4 @@ export declare class UmbBackofficeContext {
     constructor(host: UmbControllerHost);
     setActiveSectionAlias(alias: string): void;
 }
-export declare const UMB_BACKOFFICE_CONTEXT_TOKEN: UmbContextToken<UmbBackofficeContext>;
+export declare const UMB_BACKOFFICE_CONTEXT_TOKEN: UmbContextToken<UmbBackofficeContext, UmbBackofficeContext>;

package/dist-cms/apps/backoffice/backoffice.element.d.ts

@@ -1,6 +1,12 @@
 import { UmbLitElement } from '../../shared/lit-element/index.js';
 import './components/index.js';
 export declare class UmbBackofficeElement extends UmbLitElement {
+    /**
+     * Backoffice extension registry.
+     * This enables to register and unregister extensions via DevTools, or just via querying this element via the DOM.
+     * @type {UmbExtensionsRegistry}
+     */
+    extensionRegistry: import("../../packages/core/extension-registry/index.js").UmbBackofficeExtensionRegistry;
     constructor();
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];

package/dist-cms/apps/backoffice/backoffice.element.js

@@ -5,9 +5,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UmbBackofficeContext, UMB_BACKOFFICE_CONTEXT_TOKEN } from './backoffice.context.js';
-import { UmbExtensionInitializer } from './extension-initializer.controller.js';
+import { UmbServerExtensionRegistrator } from './server-extension-registrator.controller.js';
 import { css, html, customElement } from '../../external/lit/index.js';
-import { UUITextStyles } from '../../external/uui/index.js';
 import { umbExtensionsRegistry } from '../../packages/core/extension-registry/index.js';
 import { UmbBundleExtensionInitializer, UmbEntryPointExtensionInitializer, } from '../../libs/extension-api/index.js';
 import { UmbLitElement } from '../../shared/lit-element/index.js';
@@ -26,15 +25,27 @@ const CORE_PACKAGES = [
     import('../../packages/templating/umbraco-package.js'),
     import('../../packages/umbraco-news/umbraco-package.js'),
     import('../../packages/tags/umbraco-package.js'),
+    import('../../packages/log-viewer/umbraco-package.js'),
+    import('../../packages/health-check/umbraco-package.js'),
 ];
 export let UmbBackofficeElement = class UmbBackofficeElement extends UmbLitElement {
     constructor() {
         super();
+        /**
+         * Backoffice extension registry.
+         * This enables to register and unregister extensions via DevTools, or just via querying this element via the DOM.
+         * @type {UmbExtensionsRegistry}
+         */
+        this.extensionRegistry = umbExtensionsRegistry;
         this.provideContext(UMB_BACKOFFICE_CONTEXT_TOKEN, new UmbBackofficeContext(this));
         new UmbBundleExtensionInitializer(this, umbExtensionsRegistry);
         new UmbEntryPointExtensionInitializer(this, umbExtensionsRegistry);
-        const extensionInitializer = new UmbExtensionInitializer(this, umbExtensionsRegistry);
-        extensionInitializer.setLocalPackages(CORE_PACKAGES);
+        new UmbServerExtensionRegistrator(this, umbExtensionsRegistry);
+        // So far local packages are this simple to registerer, so no need for a manager to do that:
+        CORE_PACKAGES.forEach(async (packageImport) => {
+            const packageModule = await packageImport;
+            umbExtensionsRegistry.registerMany(packageModule.extensions);
+        });
     }
     render() {
         return html `
@@ -44,7 +55,6 @@ export let UmbBackofficeElement = class UmbBackofficeElement extends UmbLitEleme
 		`;
     }
     static { this.styles = [
-        UUITextStyles,
         css `
 			:host {
 				display: flex;

package/dist-cms/apps/backoffice/{extension-initializer.controller.d.ts → server-extension-registrator.controller.d.ts}

@@ -1,10 +1,7 @@
 import { UmbBaseController, UmbControllerHost } from '../../libs/controller-api/index.js';
 import { UmbBackofficeExtensionRegistry } from '../../packages/core/extension-registry/index.js';
-export declare class UmbExtensionInitializer extends UmbBaseController {
+export declare class UmbServerExtensionRegistrator extends UmbBaseController {
     #private;
     constructor(host: UmbControllerHost, extensionRegistry: UmbBackofficeExtensionRegistry);
-    setLocalPackages(localPackages: Array<Promise<any>>): void;
-    hostConnected(): void;
-    hostDisconnected(): void;
     private isManifestBase;
 }

package/dist-cms/apps/backoffice/{extension-initializer.controller.js → server-extension-registrator.controller.js}

@@ -1,36 +1,18 @@
-import { Subject } from '../../external/rxjs/index.js';
 import { PackageResource, OpenAPI } from '../../external/backend-api/index.js';
 import { UmbBaseController } from '../../libs/controller-api/index.js';
 import { tryExecuteAndNotify } from '../../shared/resources/index.js';
 import { isManifestJSType } from '../../libs/extension-api/index.js';
-// TODO: consider if this can be replaced by the new extension controllers.
+// TODO: consider if this can be replaced by the new extension controllers
 // TODO: move local part out of this, and name something with server.
-export class UmbExtensionInitializer extends UmbBaseController {
+export class UmbServerExtensionRegistrator extends UmbBaseController {
     #extensionRegistry;
-    #unobserve = new Subject();
-    #localPackages = [];
     #apiBaseUrl = OpenAPI.BASE;
     constructor(host, extensionRegistry) {
-        super(host, UmbExtensionInitializer.name);
+        super(host, UmbServerExtensionRegistrator.name);
         this.#extensionRegistry = extensionRegistry;
-    }
-    setLocalPackages(localPackages) {
-        this.#localPackages = localPackages;
-        this.#loadLocalPackages();
-    }
-    hostConnected() {
+        // TODO: This was before in hostConnected(), but I don't see the reason to wait. lets just do it right away.
         this.#loadServerPackages();
     }
-    hostDisconnected() {
-        this.#unobserve.next();
-        this.#unobserve.complete();
-    }
-    async #loadLocalPackages() {
-        this.#localPackages.forEach(async (packageImport) => {
-            const packageModule = await packageImport;
-            this.#extensionRegistry.registerMany(packageModule.extensions);
-        });
-    }
     async #loadServerPackages() {
         /* TODO: we need a new endpoint here, to remove the dependency on the package repository, to get the modules available for the backoffice scope
         / we will need a similar endpoint for the login, installer etc at some point.

package/dist-cms/apps/installer/installer.context.d.ts

@@ -76,4 +76,4 @@ export declare class UmbInstallerContext {
      */
     private _loadInstallerSettings;
 }
-export declare const UMB_INSTALLER_CONTEXT_TOKEN: UmbContextToken<UmbInstallerContext>;
+export declare const UMB_INSTALLER_CONTEXT_TOKEN: UmbContextToken<UmbInstallerContext, UmbInstallerContext>;

package/dist-cms/assets/lang/da-dk.d.ts

@@ -1,3 +1,3 @@
-import type { UmbTranslationsDictionary } from '../../libs/localization-api/index.js';
-declare const _default: UmbTranslationsDictionary;
+import type { UmbLocalizationDictionary } from '../../libs/localization-api/index.js';
+declare const _default: UmbLocalizationDictionary;
 export default _default;

package/dist-cms/assets/lang/da-dk.ts

@@ -1,4 +1,4 @@
-import type { UmbTranslationsDictionary } from '@umbraco-cms/backoffice/localization-api';
+import type { UmbLocalizationDictionary } from '@umbraco-cms/backoffice/localization-api';
 
 export default {
 	actions: {
@@ -3243,4 +3243,4 @@ export default {
 			'\n      Sets the cached artifact signatures for all entities within the Umbraco environment.\n      This can be used when signatures have been cleared and you want to ensure they are pre-generated before attempting a potentially long-running restore or transfer operation.\n    ',
 		setSignatures: 'Set Signatures',
 	},
-} as UmbTranslationsDictionary;
+} as UmbLocalizationDictionary;

package/dist-cms/assets/lang/en-us.d.ts

@@ -1,3 +1,3 @@
-import type { UmbTranslationsDictionary } from '../../libs/localization-api/index.js';
-declare const _default: UmbTranslationsDictionary;
+import type { UmbLocalizationDictionary } from '../../libs/localization-api/index.js';
+declare const _default: UmbLocalizationDictionary;
 export default _default;

package/dist-cms/assets/lang/en-us.ts

@@ -1,4 +1,4 @@
-import type { UmbTranslationsDictionary } from '@umbraco-cms/backoffice/localization-api';
+import type { UmbLocalizationDictionary } from '@umbraco-cms/backoffice/localization-api';
 
 export default {
 	actions: {
@@ -3216,4 +3216,4 @@ export default {
 	formRecordSetActions: {
 		deleteConfirm: 'Are you sure you want to delete these entries?',
 	},
-} as UmbTranslationsDictionary;
+} as UmbLocalizationDictionary;