@quadrel-enterprise-ui/framework 20.0.0-beta.97.1 → 20.0.1

package/fesm2022/quadrel-enterprise-ui-framework.mjs

@@ -3,7 +3,7 @@ import { inject, ElementRef, Directive, InjectionToken, HostBinding, Input, View
 import { Dialog, DialogRef, DialogModule } from '@angular/cdk/dialog';
 import * as i1 from '@angular/common';
 import { CommonModule, NgFor, NgIf, NgClass, NgTemplateOutlet, AsyncPipe } from '@angular/common';
-import { BehaviorSubject, pairwise, from, switchMap, map as map$1, Subject, throwError, of, ReplaySubject, merge, fromEvent, isObservable, NEVER, Observable, EMPTY, shareReplay, Subscription, distinctUntilChanged as distinctUntilChanged$1, debounce, timer, startWith as startWith$1, debounceTime as debounceTime$1, takeUntil as takeUntil$1, firstValueFrom, combineLatest, concat, take as take$1, delay, tap as tap$1, first, scan, combineLatestWith, iif, delayWhen, withLatestFrom, async, filter as filter$1 } from 'rxjs';
+import { BehaviorSubject, pairwise, from, switchMap, map as map$1, Subject, throwError, of, ReplaySubject, merge, fromEvent, isObservable, NEVER, Observable, EMPTY, shareReplay, Subscription, distinctUntilChanged as distinctUntilChanged$1, debounce, timer, startWith as startWith$1, debounceTime as debounceTime$1, takeUntil as takeUntil$1, firstValueFrom, combineLatest, concat, take as take$1, delay, tap as tap$1, first, scan, combineLatestWith, forkJoin, delayWhen, withLatestFrom, async, filter as filter$1 } from 'rxjs';
 import { map, takeUntil, take, filter, catchError, debounceTime, startWith, distinctUntilChanged, concatMap, tap, skip, pairwise as pairwise$1, switchMap as switchMap$1, mergeMap, delay as delay$1 } from 'rxjs/operators';
 import { v4 } from 'uuid';
 import * as i3 from '@ngx-translate/core';
@@ -12052,8 +12052,8 @@ class QdTranslateService {
     get use() {
         return this.translateService.use;
     }
-    get getTranslation() {
-        return this.translateService.getTranslation;
+    get get() {
+        return this.translateService.get;
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: QdTranslateService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: QdTranslateService, providedIn: 'root' });
@@ -29819,17 +29819,49 @@ class QdShellServiceNavigationService {
         customButtonsLinks: 'custom-buttons'
     };
     getMappedAttributes$() {
-        /* There is an issue with the translateService.getTranslation method. In this method a pointer is set
-         * to the language given in the method call so that this language is used as the current language as long as
-         * the translations files are being loaded. That's why we swap the current language to the last position of
-         * the language list for the getTranslation calls. So the internal pointer in the getTranslation method will
-         * be set to the current language. */
-        const languageListSorted = this.swapCurrentLangToTheEndOfLanguageList(this.languageList);
-        return combineLatest(languageListSorted.map(language => this.translateService.getTranslation(language))).pipe(tap(translations => {
-            translations.forEach((languageTranslations, languageIndex) => {
-                this._translations[languageListSorted[languageIndex]] = languageTranslations;
+        const languagesInOrder = this.swapCurrentLangToTheEndOfLanguageList(this.languageList);
+        const keysFromConfig = this.collectI18nKeysFromConfig(this.config);
+        const keys = Array.isArray(keysFromConfig) ? keysFromConfig : [];
+        const translationObservables = languagesInOrder.map(lang => {
+            this.translateService.use(lang);
+            return this.translateService.get(keys).pipe(map(trans => ({ lang, trans })));
+        });
+        return forkJoin(translationObservables).pipe(tap(results => {
+            results.forEach(({ lang, trans }) => {
+                this._translations[lang] = typeof trans === 'object' && trans !== null ? trans : {};
             });
-        }), mergeMap(() => iif(() => this.config.defaultLanguage != null, of(this.mapAttributes()), this.eportalLanguageService.fetchEportalLanguage$().pipe(map(eportalLanguage => eportalLanguage?.toLowerCase()), map(eportalLanguage => this.languageList.includes(eportalLanguage) ? eportalLanguage : 'de'), map(eportalLanguage => this.mapAttributes(eportalLanguage))))));
+        }), mergeMap(() => {
+            if (this.config?.defaultLanguage != null) {
+                return of(this.mapAttributes());
+            }
+            return this.eportalLanguageService.fetchEportalLanguage$().pipe(map(lang => lang?.toLowerCase()), map(lang => (this.languageList.includes(lang) ? lang : 'de')), map(lang => this.mapAttributes(lang)));
+        }));
+    }
+    collectI18nKeysFromConfig(config) {
+        if (!config)
+            return [];
+        const keys = new Set();
+        const visitLink = (link) => {
+            if (!link || typeof link !== 'object')
+                return;
+            const linkItem = link;
+            if (typeof linkItem.i18n === 'string')
+                keys.add(linkItem.i18n);
+            if (linkItem.iconLink && typeof linkItem.iconLink.i18n === 'string') {
+                keys.add(linkItem.iconLink.i18n);
+            }
+            if (Array.isArray(linkItem.childLinks)) {
+                linkItem.childLinks.forEach(visitLink);
+            }
+        };
+        const visitArray = (maybeArray) => {
+            if (Array.isArray(maybeArray))
+                maybeArray.forEach(visitLink);
+        };
+        visitArray(config.infoLinks);
+        visitArray(config.profileLinks);
+        visitArray(config.customButtonsLinks);
+        return Array.from(keys);
     }
     swapCurrentLangToTheEndOfLanguageList(languageList) {
         const currentLangIndex = languageList.indexOf(this.currentLang);
@@ -30122,27 +30154,57 @@ class QdShellHeaderWidgetService {
         this._config = config;
     }
     getMappedAttributes$() {
-        /* There is an issue with the translateService.getTranslation method. In this method a pointer is set
-         * to the language given in the method call so that this language is used as the current language as long as
-         * the translations files are being loaded. That's why we swap the current language to the last position of
-         * the language list for the getTranslation calls. So the internal pointer in the getTranslation method will
-         * be set to the current language. */
-        const languageListSorted = this.swapCurrentLangToTheEndOfLanguageList(this.languageList);
-        return combineLatest(languageListSorted.map(language => this.translateService.getTranslation(language))).pipe(tap(translations => {
-            translations.forEach((languageTranslations, languageIndex) => {
-                this._translations[languageListSorted[languageIndex]] = languageTranslations;
+        const languagesInOrder = this.swapCurrentLangToTheEndOfLanguageList(this.languageList);
+        const keysFromConfig = this.collectI18nKeysFromConfig(this._config);
+        const keys = Array.isArray(keysFromConfig) ? keysFromConfig : [];
+        const translationObservables = languagesInOrder.map((lang) => {
+            this.translateService.use(lang);
+            return this.translateService.get(keys).pipe(map(translations => ({ lang, translations })));
+        });
+        return forkJoin(translationObservables).pipe(tap(results => {
+            results.forEach(({ lang, translations }) => {
+                this._translations[lang] = typeof translations === 'object' && translations !== null ? translations : {};
             });
-        }), mergeMap(() => iif(() => this._config.defaultLanguage != null, of(this.mapAttributes()), this.eportalLanguageService.fetchEportalLanguage$().pipe(map(eportalLanguage => eportalLanguage?.toLowerCase()), map(eportalLanguage => this.languageList.includes(eportalLanguage) ? eportalLanguage : 'de'), map(eportalLanguage => this.mapAttributes(eportalLanguage))))));
+        }), mergeMap(() => {
+            if (this._config?.defaultLanguage != null) {
+                return of(this.mapAttributes());
+            }
+            return this.eportalLanguageService.fetchEportalLanguage$().pipe(map(lang => lang?.toLowerCase()), map(lang => (this.languageList.includes(lang) ? lang : 'de')), map(lang => this.mapAttributes(lang)));
+        }));
+    }
+    collectI18nKeysFromConfig(config) {
+        if (!config)
+            return [];
+        const keys = new Set();
+        const visitLink = (linkCandidate) => {
+            if (!linkCandidate || typeof linkCandidate !== 'object')
+                return;
+            const link = linkCandidate;
+            if (typeof link.i18n === 'string')
+                keys.add(link.i18n);
+            if (link.iconLink && typeof link.iconLink.i18n === 'string')
+                keys.add(link.iconLink.i18n);
+            if (Array.isArray(link.childLinks))
+                link.childLinks.forEach(visitLink);
+        };
+        const visitArray = (maybeArray) => {
+            if (Array.isArray(maybeArray))
+                maybeArray.forEach(visitLink);
+        };
+        visitArray(config.infoLinks);
+        visitArray(config.profileLinks);
+        visitArray(config.customButtonsLinks);
+        return Array.from(keys);
     }
     swapCurrentLangToTheEndOfLanguageList(languageList) {
         const currentLangIndex = languageList.indexOf(this.currentLang);
         if (currentLangIndex === -1)
             return languageList;
-        const languageListSorted = [...languageList];
+        const sorted = [...languageList];
         const lastIndex = languageList.length - 1;
-        languageListSorted[languageList.indexOf(this.currentLang)] = languageList[lastIndex];
-        languageListSorted[lastIndex] = this.currentLang;
-        return languageListSorted;
+        sorted[currentLangIndex] = languageList[lastIndex];
+        sorted[lastIndex] = this.currentLang;
+        return sorted;
     }
     get currentLang() {
         return (this.translateService?.currentLang || this.translateService?.defaultLang);
@@ -30237,7 +30299,7 @@ class QdShellHeaderWidgetService {
             : {};
     }
     getChildLinks(linkObject) {
-        return linkObject.hasOwnProperty('childLinks')
+        return linkObject && Object.prototype.hasOwnProperty.call(linkObject, 'childLinks')
             ? {
                 childLinks: linkObject.childLinks.map(childLink => ({
                     ...this.getMappedLinkTexts(childLink),
@@ -30249,7 +30311,11 @@ class QdShellHeaderWidgetService {
             : {};
     }
     getDefaultAttribute(configValue) {
-        return typeof configValue === 'boolean' ? (configValue ? 'true' : 'false') : configValue;
+        if (typeof configValue === 'boolean')
+            return configValue ? 'true' : 'false';
+        if (configValue == null)
+            return '';
+        return String(configValue);
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: QdShellHeaderWidgetService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: QdShellHeaderWidgetService });