@openmfp/portal-ui-lib 0.189.5 → 0.190.0

package/fesm2022/openmfp-portal-ui-lib.mjs

@@ -1483,7 +1483,9 @@ class LocalConfigurationServiceImpl {
         this.luigiConfigService = inject(LocalNodesService);
         this.i18nService = inject(I18nService);
         this.luigiCoreService = inject(LuigiCoreService);
+        this.nodeUtilsService = inject(NodeUtilsService);
         this.customLocalConfigurationService = inject(LOCAL_CONFIGURATION_SERVICE_INJECTION_TOKEN, { optional: true });
+        this.localNodesRead = false;
     }
     async getLocalNodes() {
         const localDevelopmentSettings = localDevelopmentSettingsLocalStorage.read();
@@ -1491,8 +1493,8 @@ class LocalConfigurationServiceImpl {
             return ((await this.customLocalConfigurationService?.getLocalNodes()) || []);
         }
         this.addLocalDevelopmentModeOnIndicator();
-        if (this.cachedLocalNodes?.length) {
-            return [...this.cachedLocalNodes];
+        if (this.localNodesRead) {
+            return this.cachedLocalNodes;
         }
         try {
             const configurations = await this.getLocalConfigurations(localDevelopmentSettings);
@@ -1509,7 +1511,8 @@ class LocalConfigurationServiceImpl {
                     },
                 };
             });
-            return [...(this.cachedLocalNodes = result.nodes || [])];
+            this.localNodesRead = true;
+            return (this.cachedLocalNodes = result.nodes || []);
         }
         catch (e) {
             console.warn(`Failed to retrieve local luigi config.`, e);
@@ -1558,7 +1561,9 @@ class LocalConfigurationServiceImpl {
         const localReplacingNodes = [];
         const filteredServerNodes = serverLuigiNodes.filter((serverNode) => {
             const index = localNodes.findIndex((localNode) => {
-                return this.localNodeMatchesServerNode(localNode, serverNode);
+                return (this.localNodeMatchesServerNode(localNode, serverNode) &&
+                    this.nodeUtilsService.isVisible(serverNode) &&
+                    this.nodeUtilsService.isVisible(localNode));
             });
             if (index !== -1) {
                 const [localFoundNode] = localNodes.splice(index, 1);
@@ -1916,6 +1921,38 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.2", ngImpor
             args: [{ standalone: true, changeDetection: ChangeDetectionStrategy.OnPush, template: "<div class=\"fd-page\">\n  <link rel=\"stylesheet\" href=\"/fundamental-styles/fundamental-styles.css\" />\n  <div class=\"fd-page__content\">\n    <div class=\"fd-container fd-container--centered\">\n      <div class=\"content\">\n        <span class=\"sap-icon--log\"></span>\n\n        <div class=\"info\" data-e2e=\"logout-headline\">{{ headline() }}</div>\n        <div class=\"hint\" data-e2e=\"logout-message\">{{ hint() }}</div>\n\n        <p class=\"fd-has-text-align-center\">\n          <button\n            class=\"fd-button fd-button--action-bar fd-button--l\"\n            (click)=\"login()\"\n          >\n            {{ btnText() }}\n          </button>\n        </p>\n      </div>\n    </div>\n  </div>\n</div>\n", styles: ["@font-face{font-family:\"72\";src:url(/fundamental-styles/72-Light-full.woff) format(\"woff\");font-weight:300;font-style:normal}@font-face{font-family:\"72\";src:url(/fundamental-styles/72-Light-full.woff2) format(\"woff2\");font-weight:300;font-style:normal}@font-face{font-family:\"72\";src:url(/fundamental-styles/72-Bold-full.woff) format(\"woff\");font-weight:700;font-style:normal}@font-face{font-family:\"72\";src:url(/fundamental-styles/72-Bold-full.woff2) format(\"woff2\");font-weight:700;font-style:normal}@font-face{font-family:\"72\";src:url(/fundamental-styles/72-Regular-full.woff) format(\"woff\");font-weight:400;font-style:normal}@font-face{font-family:\"72\";src:url(/fundamental-styles/72-Regular-full.woff2) format(\"woff2\");font-weight:400;font-style:normal}@font-face{font-family:SAP-icons;src:url(/fundamental-styles/SAP-icons.woff) format(\"woff\");font-weight:400;font-style:normal}@font-face{font-family:SAP-icons;src:url(/fundamental-styles/SAP-icons.woff2) format(\"woff2\");font-weight:400;font-style:normal}body{margin:0}.sap-icon--log:before{font-size:150px;color:#a0a0a0}.fd-container--centered{text-align:center}a.fd-button{color:#fff}.fd-page{margin-top:32px;height:100vh;overflow-y:auto;overflow-x:hidden}.content{width:100%}.fd-has-text-align-center{text-align:center}.info,.hint{text-align:center;margin:0}.info{padding-top:30px;font-size:36px}.hint{font-size:18px;color:#6f7275;padding-bottom:30px}\n"] }]
         }], ctorParameters: () => [{ type: i1$1.ActivatedRoute }, { type: LuigiCoreService }, { type: I18nService }, { type: LoginEventService }] });
 
+class FeatureTogglesService {
+    constructor() {
+        this.configService = inject(ConfigService);
+        this.envConfigService = inject(EnvConfigService);
+        this.luigiCoreService = inject(LuigiCoreService);
+    }
+    async initFeatureToggles() {
+        try {
+            const { uiOptions } = await this.envConfigService.getEnvConfig();
+            const { featureToggles } = await this.configService.getPortalConfig();
+            if (uiOptions?.includes('enableFeatureToggleSetting')) {
+                const featureToggleSettings = featureToggleLocalStorage.read();
+                this.luigiCoreService.setFeatureToggles({
+                    ...featureToggles,
+                    ...featureToggleSettings,
+                });
+                return;
+            }
+            this.luigiCoreService.setFeatureToggles(featureToggles);
+        }
+        catch (e) {
+            console.error('Failed to initialize feature toggles', e);
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.2", ngImport: i0, type: FeatureTogglesService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.1.2", ngImport: i0, type: FeatureTogglesService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.2", ngImport: i0, type: FeatureTogglesService, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }] });
+
 const buildViewGroups = (nodes) => {
     const viewGroups = {};
     nodes.forEach((node) => {
@@ -2051,11 +2088,11 @@ class NodeSortingService {
         });
     }
     nodeComparison(a, b) {
-        // set default order to the end if not defined
-        a.order = a.dxpOrder || a.order || '999';
-        b.order = b.dxpOrder || b.order || '999';
-        const orderA = isNaN(parseFloat(a?.order)) ? 999 : parseFloat(a.order);
-        const orderB = isNaN(parseFloat(b?.order)) ? 999 : parseFloat(b.order);
+        // set a default order to the end if not defined
+        a.order = a.dxpOrder ?? a.order ?? 999;
+        b.order = b.dxpOrder ?? b.order ?? 999;
+        const orderA = a.order;
+        const orderB = b.order;
         if (orderA < orderB) {
             return -1;
         }
@@ -2426,9 +2463,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.2", ngImpor
         }] });
 
 class NavigationConfigService {
-    constructor(configService, luigiCoreService, luigiNodesService, intentNavigationService, navigationGlobalContextConfigService, userProfileConfigService, appSwitcherConfigService, nodeChangeHookConfigService, nodesProcessingService, headerBarService) {
-        this.configService = configService;
-        this.luigiCoreService = luigiCoreService;
+    constructor(envConfigService, luigiNodesService, intentNavigationService, navigationGlobalContextConfigService, userProfileConfigService, appSwitcherConfigService, nodeChangeHookConfigService, nodesProcessingService, headerBarService) {
+        this.envConfigService = envConfigService;
         this.luigiNodesService = luigiNodesService;
         this.intentNavigationService = intentNavigationService;
         this.navigationGlobalContextConfigService = navigationGlobalContextConfigService;
@@ -2438,10 +2474,9 @@ class NavigationConfigService {
         this.nodesProcessingService = nodesProcessingService;
         this.headerBarService = headerBarService;
     }
-    async getNavigationConfig(childrenByEntity, envConfig) {
+    async getNavigationConfig(childrenByEntity) {
+        const envConfig = await this.envConfigService.getEnvConfig();
         const allNodes = Object.values(childrenByEntity).reduce((accumulator, value) => accumulator.concat(value), []);
-        const portalConfig = await this.configService.getPortalConfig();
-        this.initFeatureToggles(portalConfig.featureToggles, envConfig);
         const context = await this.navigationGlobalContextConfigService.getGlobalContext();
         const luigiNodes = await this.nodesProcessingService.processNodes(childrenByEntity);
         return {
@@ -2461,24 +2496,13 @@ class NavigationConfigService {
             breadcrumbs: await this.headerBarService.getConfig(),
         };
     }
-    initFeatureToggles(configFeatureToggles, envConfig) {
-        if (envConfig.uiOptions?.includes('enableFeatureToggleSetting')) {
-            const featureToggleSettings = featureToggleLocalStorage.read();
-            this.luigiCoreService.setFeatureToggles({
-                ...configFeatureToggles,
-                ...featureToggleSettings,
-            });
-            return;
-        }
-        this.luigiCoreService.setFeatureToggles(configFeatureToggles);
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.2", ngImport: i0, type: NavigationConfigService, deps: [{ token: ConfigService }, { token: LuigiCoreService }, { token: LuigiNodesService }, { token: IntentNavigationService }, { token: GlobalContextConfigService }, { token: LUIGI_USER_PROFILE_CONFIG_SERVICE_INJECTION_TOKEN, optional: true }, { token: LUIGI_APP_SWITCHER_CONFIG_SERVICE_INJECTION_TOKEN, optional: true }, { token: LUIGI_NODE_CHANGE_HOOK_SERVICE_INJECTION_TOKEN, optional: true }, { token: NodesProcessingService }, { token: HeaderBarService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.2", ngImport: i0, type: NavigationConfigService, deps: [{ token: EnvConfigService }, { token: LuigiNodesService }, { token: IntentNavigationService }, { token: GlobalContextConfigService }, { token: LUIGI_USER_PROFILE_CONFIG_SERVICE_INJECTION_TOKEN, optional: true }, { token: LUIGI_APP_SWITCHER_CONFIG_SERVICE_INJECTION_TOKEN, optional: true }, { token: LUIGI_NODE_CHANGE_HOOK_SERVICE_INJECTION_TOKEN, optional: true }, { token: NodesProcessingService }, { token: HeaderBarService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.1.2", ngImport: i0, type: NavigationConfigService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.2", ngImport: i0, type: NavigationConfigService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
-        }], ctorParameters: () => [{ type: ConfigService }, { type: LuigiCoreService }, { type: LuigiNodesService }, { type: IntentNavigationService }, { type: GlobalContextConfigService }, { type: undefined, decorators: [{
+        }], ctorParameters: () => [{ type: EnvConfigService }, { type: LuigiNodesService }, { type: IntentNavigationService }, { type: GlobalContextConfigService }, { type: undefined, decorators: [{
                     type: Optional
                 }, {
                     type: Inject,
@@ -2497,9 +2521,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.2", ngImpor
 
 class LifecycleHooksConfigService {
     constructor() {
+        this.featureTogglesService = inject(FeatureTogglesService);
         this.authConfigService = inject(AuthConfigService);
         this.customMessageListenersService = inject(CustomMessageListenersService);
-        this.envConfigService = inject(EnvConfigService);
         this.i18nService = inject(I18nService);
         this.luigiNodesService = inject(LuigiNodesService);
         this.luigiCoreService = inject(LuigiCoreService);
@@ -2518,7 +2542,7 @@ class LifecycleHooksConfigService {
     }
     async constructLuigiConfiguration() {
         this.i18nService.afterInit();
-        const envConfig = await this.envConfigService.getEnvConfig();
+        await this.featureTogglesService.initFeatureToggles();
         let childrenByEntity;
         try {
             childrenByEntity =
@@ -2533,7 +2557,7 @@ class LifecycleHooksConfigService {
             auth: await this.authConfigService.getAuthConfig(),
             settings: await this.staticSettingsConfigService.getStaticSettingsConfig(),
             communication: this.customMessageListenersService.getMessageListeners(),
-            navigation: await this.navigationConfigService.getNavigationConfig(childrenByEntity, envConfig),
+            navigation: await this.navigationConfigService.getNavigationConfig(childrenByEntity),
             routing: this.routingConfigService.getRoutingConfig(),
             userSettings: await this.userSettingsConfigService.getUserSettings(childrenByEntity),
             globalSearch: this.globalSearchConfigService?.getGlobalSearchConfig(),