oip-common 0.1.2 → 0.1.4

package/fesm2022/oip-common.mjs

@@ -7,7 +7,7 @@ import * as i2$4 from '@ngx-translate/core';
 import { TranslateService, TranslatePipe, TranslateModule } from '@ngx-translate/core';
 import * as i1$3 from '@angular/router';
 import { ActivatedRoute, Router, RouterModule, NavigationEnd, RouterLinkActive, RouterLink } from '@angular/router';
-import { lastValueFrom, BehaviorSubject, Subject, filter as filter$1, combineLatest, of, map as map$1, Observable } from 'rxjs';
+import { lastValueFrom, BehaviorSubject, Subject, ReplaySubject, merge, filter as filter$1, combineLatest, of, map as map$1, Observable } from 'rxjs';
 import { Title, DomSanitizer } from '@angular/platform-browser';
 import * as i1 from 'primeng/multiselect';
 import { MultiSelectModule } from 'primeng/multiselect';
@@ -29,7 +29,7 @@ import { PrimeNG } from 'primeng/config';
 import * as i3 from 'primeng/selectbutton';
 import { SelectButtonModule } from 'primeng/selectbutton';
 import { OidcSecurityService, PublicEventsService, EventTypes, StsConfigHttpLoader } from 'angular-auth-oidc-client';
-import { filter, map, switchMap, catchError } from 'rxjs/operators';
+import { filter, distinctUntilChanged, map, switchMap, catchError } from 'rxjs/operators';
 import { Tabs, TabList, Tab } from 'primeng/tabs';
 import * as i2$2 from 'primeng/avatar';
 import { AvatarModule } from 'primeng/avatar';
@@ -1475,22 +1475,35 @@ class KeycloakSecurityService extends OidcSecurityService {
          * Stores the decoded access token payload.
          */
         this.payload = new BehaviorSubject(null);
+        /**
+         * Stores user-specific data from the login response.
+         */
+        this.currentUser = new BehaviorSubject(null);
+        /**
+         * Emits access token updates from initial auth check, manual refresh,
+         * and library authentication events.
+         */
+        this.accessToken = new ReplaySubject(1);
         this.publicEventsService
             .registerForEvents()
             .pipe(filter((event) => event.type === EventTypes.NewAuthenticationResult))
             .subscribe(() => {
+            super.getAccessToken().subscribe(token => { this.accessToken.next(token); });
             this.auth();
         });
     }
     getCurrentUser() {
-        return this.userData;
+        return this.currentUser.getValue();
+    }
+    getCurrentUser$() {
+        return this.currentUser.asObservable();
     }
     /**
      * Returns the ID token for the sign-in.
      * @returns A string with the id token.
      */
-    getAccessToken() {
-        return this.loginResponse.pipe(map((data) => data?.accessToken));
+    getAccessToken(configId) {
+        return merge(super.getAccessToken(configId), this.accessToken.asObservable()).pipe(distinctUntilChanged());
     }
     /**
      * Indicates whether the current user has the 'admin' role.
@@ -1507,7 +1520,7 @@ class KeycloakSecurityService extends OidcSecurityService {
     auth() {
         super.checkAuth().subscribe((_response) => {
             this.loginResponse.next(_response);
-            this.userData = _response.userData;
+            this.currentUser.next(_response.userData);
             this.getPayloadFromAccessToken().subscribe((_token) => {
                 this.payload.next(_token);
             });
@@ -1528,6 +1541,7 @@ class KeycloakSecurityService extends OidcSecurityService {
     ngOnDestroy() {
         this.loginResponse.complete();
         this.payload.complete();
+        this.currentUser.complete();
     }
     /**
      * Checks whether the current access token is expired based on the 'exp' claim.
@@ -1554,6 +1568,7 @@ class UserService {
     constructor() {
         this.securityService = inject(SecurityService);
         this.baseDataService = inject(BaseDataService);
+        this.requestedPhotoEmail = null;
         /**
          * Stores the user's photo as a data URL or binary blob, depending on how it's processed.
          */
@@ -1562,7 +1577,12 @@ class UserService {
          * Indicates whether the user photo has finished loading.
          */
         this.photoLoaded = false;
-        this.getUserPhoto();
+        this.securityService
+            .getCurrentUser$()
+            .pipe(map((user) => user?.email ?? null), filter((email) => !!email), distinctUntilChanged())
+            .subscribe(() => {
+            this.getUserPhoto();
+        });
     }
     /**
      * Returns a short label composed of the user's initials.
@@ -1585,9 +1605,12 @@ class UserService {
     getUserPhoto() {
         const email = this.securityService.getCurrentUser()?.email;
         if (!email) {
-            this.photoLoaded = true;
             return;
         }
+        if (this.requestedPhotoEmail === email && (this.photoLoaded || this.photo)) {
+            return;
+        }
+        this.requestedPhotoEmail = email;
         const url = this.baseDataService.buildUrl(`api/user-profile/get-user-photo?email=${email}`);
         this.baseDataService.getBlob(url).then((data) => {
             this.createImageFromBlob(data);
@@ -1719,101 +1742,101 @@ class AppTopbar {
         }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AppTopbar, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: AppTopbar, isStandalone: true, selector: "app-topbar", ngImport: i0, template: ` <div class="layout-topbar">
-    <div class="layout-topbar-logo-container">
-      <button class="layout-menu-button layout-topbar-action" (click)="layoutService.onMenuToggle()">
-        <i class="pi pi-bars"></i>
-      </button>
-      <a class="layout-topbar-logo" id="oip-app-topbar-logo-link" routerLink="">
-        <ng-container
-          *ngComponentOutlet="logoService.getLogoComponent(); inputs: { width: 36, height: 36 }"></ng-container>
-        <span>{{ 'app-info.title' | translate }}</span>
-      </a>
-    </div>
-
-    @if (securityService.isAdmin() && topBarService.topBarItems.length > 0) {
-      <p-tabs class="layout-topbar-tabs ml-2" [(value)]="topBarService.activeId">
-        <p-tablist>
-          @for (tab of topBarService.availableTopBarItems; track tab.id) {
-            <p-tab id="oip-app-topbar-tab-{{ tab.id }}" [value]="tab.id">
-              <i class="pi {{ tab.icon }}"></i>
-              <span class="ml-2">{{ tab.caption }}</span>
-            </p-tab>
-          }
-        </p-tablist>
-      </p-tabs>
-    }
-    <div class="layout-topbar-actions">
-      <div class="layout-config-menu">
-        <p-button
-          class="layout-topbar-action"
-          id="oip-app-topbar-theme-button"
-          severity="secondary"
-          type="button"
-          [rounded]="true"
-          [text]="true"
-          (click)="toggleDarkMode()">
-          <i
-            class="pi"
-            [ngClass]="{
-              'pi-moon': layoutService.isDarkTheme(),
-              'pi-sun': !layoutService.isDarkTheme()
-            }"></i>
-        </p-button>
-        <div class="relative">
-          <p-button
-            class="layout-topbar-action layout-topbar-action-highlight"
-            enterActiveClass="animate-scalein"
-            enterFromClass="hidden"
-            id="oip-app-topbar-palette-button"
-            leaveActiveClass="animate-fadeout"
-            leaveToClass="hidden"
-            pStyleClass="@next"
-            [hideOnOutsideClick]="true"
-            [rounded]="true">
-            <i class="pi pi-palette"></i>
-          </p-button>
-          <app-configurator />
-        </div>
-      </div>
-
-      <button
-        class="layout-topbar-menu-button layout-topbar-action"
-        enterActiveClass="animate-scalein"
-        enterFromClass="hidden"
-        id="oip-app-topbar-menu-expand-button"
-        leaveActiveClass="animate-fadeout"
-        leaveToClass="hidden"
-        pStyleClass="@next"
-        [hideOnOutsideClick]="true">
-        <i class="pi pi-ellipsis-v"></i>
-      </button>
-
-      <div class="layout-topbar-menu hidden lg:block">
-        <div class="layout-topbar-menu-content">
-          <button
-            class="layout-topbar-action"
-            id="oip-app-topbar-logout-button"
-            type="button"
-            (click)="securityService.logout()"
-            (keydown)="logoutKeyDown($event)">
-            <i class="pi pi-sign-out"></i>
-            <span>{{ 'topbar.logout' | translate }}</span>
-          </button>
-          <button class="layout-topbar-action" routerLink="config">
-            <p-avatar
-              class="p-link flex align-items-center"
-              id="oip-app-topbar-user-avatar"
-              shape="circle"
-              size="normal"
-              [image]="userService.photoLoaded ? userService.photo : null"
-              >{{ !userService.photoLoaded ? userService.shortLabel : null }}
-            </p-avatar>
-            <span class="ml-2">{{ 'topbar.profile' | translate }}</span>
-          </button>
-        </div>
-      </div>
-    </div>
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: AppTopbar, isStandalone: true, selector: "app-topbar", ngImport: i0, template: ` <div class="layout-topbar">
+    <div class="layout-topbar-logo-container">
+      <button class="layout-menu-button layout-topbar-action" (click)="layoutService.onMenuToggle()">
+        <i class="pi pi-bars"></i>
+      </button>
+      <a class="layout-topbar-logo" id="oip-app-topbar-logo-link" routerLink="">
+        <ng-container
+          *ngComponentOutlet="logoService.getLogoComponent(); inputs: { width: 36, height: 36 }"></ng-container>
+        <span>{{ 'app-info.title' | translate }}</span>
+      </a>
+    </div>
+
+    @if (securityService.isAdmin() && topBarService.topBarItems.length > 0) {
+      <p-tabs class="layout-topbar-tabs ml-2" [(value)]="topBarService.activeId">
+        <p-tablist>
+          @for (tab of topBarService.availableTopBarItems; track tab.id) {
+            <p-tab id="oip-app-topbar-tab-{{ tab.id }}" [value]="tab.id">
+              <i class="pi {{ tab.icon }}"></i>
+              <span class="ml-2">{{ tab.caption }}</span>
+            </p-tab>
+          }
+        </p-tablist>
+      </p-tabs>
+    }
+    <div class="layout-topbar-actions">
+      <div class="layout-config-menu">
+        <p-button
+          class="layout-topbar-action"
+          id="oip-app-topbar-theme-button"
+          severity="secondary"
+          type="button"
+          [rounded]="true"
+          [text]="true"
+          (click)="toggleDarkMode()">
+          <i
+            class="pi"
+            [ngClass]="{
+              'pi-moon': layoutService.isDarkTheme(),
+              'pi-sun': !layoutService.isDarkTheme()
+            }"></i>
+        </p-button>
+        <div class="relative">
+          <p-button
+            class="layout-topbar-action layout-topbar-action-highlight"
+            enterActiveClass="animate-scalein"
+            enterFromClass="hidden"
+            id="oip-app-topbar-palette-button"
+            leaveActiveClass="animate-fadeout"
+            leaveToClass="hidden"
+            pStyleClass="@next"
+            [hideOnOutsideClick]="true"
+            [rounded]="true">
+            <i class="pi pi-palette"></i>
+          </p-button>
+          <app-configurator />
+        </div>
+      </div>
+
+      <button
+        class="layout-topbar-menu-button layout-topbar-action"
+        enterActiveClass="animate-scalein"
+        enterFromClass="hidden"
+        id="oip-app-topbar-menu-expand-button"
+        leaveActiveClass="animate-fadeout"
+        leaveToClass="hidden"
+        pStyleClass="@next"
+        [hideOnOutsideClick]="true">
+        <i class="pi pi-ellipsis-v"></i>
+      </button>
+
+      <div class="layout-topbar-menu hidden lg:block">
+        <div class="layout-topbar-menu-content">
+          <button
+            class="layout-topbar-action"
+            id="oip-app-topbar-logout-button"
+            type="button"
+            (click)="securityService.logout()"
+            (keydown)="logoutKeyDown($event)">
+            <i class="pi pi-sign-out"></i>
+            <span>{{ 'topbar.logout' | translate }}</span>
+          </button>
+          <button class="layout-topbar-action" routerLink="config">
+            <p-avatar
+              class="p-link flex align-items-center"
+              id="oip-app-topbar-user-avatar"
+              shape="circle"
+              size="normal"
+              [image]="userService.photoLoaded ? userService.photo : null"
+              >{{ !userService.photoLoaded ? userService.shortLabel : null }}
+            </p-avatar>
+            <span class="ml-2">{{ 'topbar.profile' | translate }}</span>
+          </button>
+        </div>
+      </div>
+    </div>
   </div>`, isInline: true, dependencies: [{ kind: "ngmodule", type: RouterModule }, { kind: "directive", type: i1$3.RouterLink, selector: "[routerLink]", inputs: ["target", "queryParams", "fragment", "queryParamsHandling", "state", "info", "relativeTo", "preserveFragment", "skipLocationChange", "replaceUrl", "routerLink"] }, { kind: "ngmodule", type: CommonModule }, { kind: "directive", type: i2$1.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: i2$1.NgComponentOutlet, selector: "[ngComponentOutlet]", inputs: ["ngComponentOutlet", "ngComponentOutletInputs", "ngComponentOutletInjector", "ngComponentOutletEnvironmentInjector", "ngComponentOutletContent", "ngComponentOutletNgModule", "ngComponentOutletNgModuleFactory"], exportAs: ["ngComponentOutlet"] }, { kind: "ngmodule", type: StyleClassModule }, { kind: "directive", type: i3$1.StyleClass, selector: "[pStyleClass]", inputs: ["pStyleClass", "enterFromClass", "enterActiveClass", "enterToClass", "leaveFromClass", "leaveActiveClass", "leaveToClass", "hideOnOutsideClick", "toggleClass", "hideOnEscape", "hideOnResize", "resizeSelector"] }, { kind: "component", type: AppConfiguratorComponent, selector: "app-configurator" }, { kind: "component", type: Tabs, selector: "p-tabs", inputs: ["value", "scrollable", "lazy", "selectOnFocus", "showNavigators", "tabindex"], outputs: ["valueChange"] }, { kind: "component", type: TabList, selector: "p-tablist" }, { kind: "component", type: Tab, selector: "p-tab", inputs: ["value", "disabled"], outputs: ["valueChange"] }, { kind: "ngmodule", type: AvatarModule }, { kind: "component", type: i2$2.Avatar, selector: "p-avatar", inputs: ["label", "icon", "image", "size", "shape", "styleClass", "ariaLabel", "ariaLabelledBy"], outputs: ["onImageError"] }, { kind: "ngmodule", type: ButtonModule }, { kind: "component", type: i1$2.Button, selector: "p-button", inputs: ["hostName", "type", "badge", "disabled", "raised", "rounded", "text", "plain", "outlined", "link", "tabindex", "size", "variant", "style", "styleClass", "badgeClass", "badgeSeverity", "ariaLabel", "autofocus", "iconPos", "icon", "label", "loading", "loadingIcon", "severity", "buttonProps", "fluid"], outputs: ["onClick", "onFocus", "onBlur"] }, { kind: "pipe", type: TranslatePipe, name: "translate" }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AppTopbar, decorators: [{
@@ -1833,101 +1856,101 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                         ButtonModule,
                         TranslatePipe
                     ],
-                    template: ` <div class="layout-topbar">
-    <div class="layout-topbar-logo-container">
-      <button class="layout-menu-button layout-topbar-action" (click)="layoutService.onMenuToggle()">
-        <i class="pi pi-bars"></i>
-      </button>
-      <a class="layout-topbar-logo" id="oip-app-topbar-logo-link" routerLink="">
-        <ng-container
-          *ngComponentOutlet="logoService.getLogoComponent(); inputs: { width: 36, height: 36 }"></ng-container>
-        <span>{{ 'app-info.title' | translate }}</span>
-      </a>
-    </div>
-
-    @if (securityService.isAdmin() && topBarService.topBarItems.length > 0) {
-      <p-tabs class="layout-topbar-tabs ml-2" [(value)]="topBarService.activeId">
-        <p-tablist>
-          @for (tab of topBarService.availableTopBarItems; track tab.id) {
-            <p-tab id="oip-app-topbar-tab-{{ tab.id }}" [value]="tab.id">
-              <i class="pi {{ tab.icon }}"></i>
-              <span class="ml-2">{{ tab.caption }}</span>
-            </p-tab>
-          }
-        </p-tablist>
-      </p-tabs>
-    }
-    <div class="layout-topbar-actions">
-      <div class="layout-config-menu">
-        <p-button
-          class="layout-topbar-action"
-          id="oip-app-topbar-theme-button"
-          severity="secondary"
-          type="button"
-          [rounded]="true"
-          [text]="true"
-          (click)="toggleDarkMode()">
-          <i
-            class="pi"
-            [ngClass]="{
-              'pi-moon': layoutService.isDarkTheme(),
-              'pi-sun': !layoutService.isDarkTheme()
-            }"></i>
-        </p-button>
-        <div class="relative">
-          <p-button
-            class="layout-topbar-action layout-topbar-action-highlight"
-            enterActiveClass="animate-scalein"
-            enterFromClass="hidden"
-            id="oip-app-topbar-palette-button"
-            leaveActiveClass="animate-fadeout"
-            leaveToClass="hidden"
-            pStyleClass="@next"
-            [hideOnOutsideClick]="true"
-            [rounded]="true">
-            <i class="pi pi-palette"></i>
-          </p-button>
-          <app-configurator />
-        </div>
-      </div>
-
-      <button
-        class="layout-topbar-menu-button layout-topbar-action"
-        enterActiveClass="animate-scalein"
-        enterFromClass="hidden"
-        id="oip-app-topbar-menu-expand-button"
-        leaveActiveClass="animate-fadeout"
-        leaveToClass="hidden"
-        pStyleClass="@next"
-        [hideOnOutsideClick]="true">
-        <i class="pi pi-ellipsis-v"></i>
-      </button>
-
-      <div class="layout-topbar-menu hidden lg:block">
-        <div class="layout-topbar-menu-content">
-          <button
-            class="layout-topbar-action"
-            id="oip-app-topbar-logout-button"
-            type="button"
-            (click)="securityService.logout()"
-            (keydown)="logoutKeyDown($event)">
-            <i class="pi pi-sign-out"></i>
-            <span>{{ 'topbar.logout' | translate }}</span>
-          </button>
-          <button class="layout-topbar-action" routerLink="config">
-            <p-avatar
-              class="p-link flex align-items-center"
-              id="oip-app-topbar-user-avatar"
-              shape="circle"
-              size="normal"
-              [image]="userService.photoLoaded ? userService.photo : null"
-              >{{ !userService.photoLoaded ? userService.shortLabel : null }}
-            </p-avatar>
-            <span class="ml-2">{{ 'topbar.profile' | translate }}</span>
-          </button>
-        </div>
-      </div>
-    </div>
+                    template: ` <div class="layout-topbar">
+    <div class="layout-topbar-logo-container">
+      <button class="layout-menu-button layout-topbar-action" (click)="layoutService.onMenuToggle()">
+        <i class="pi pi-bars"></i>
+      </button>
+      <a class="layout-topbar-logo" id="oip-app-topbar-logo-link" routerLink="">
+        <ng-container
+          *ngComponentOutlet="logoService.getLogoComponent(); inputs: { width: 36, height: 36 }"></ng-container>
+        <span>{{ 'app-info.title' | translate }}</span>
+      </a>
+    </div>
+
+    @if (securityService.isAdmin() && topBarService.topBarItems.length > 0) {
+      <p-tabs class="layout-topbar-tabs ml-2" [(value)]="topBarService.activeId">
+        <p-tablist>
+          @for (tab of topBarService.availableTopBarItems; track tab.id) {
+            <p-tab id="oip-app-topbar-tab-{{ tab.id }}" [value]="tab.id">
+              <i class="pi {{ tab.icon }}"></i>
+              <span class="ml-2">{{ tab.caption }}</span>
+            </p-tab>
+          }
+        </p-tablist>
+      </p-tabs>
+    }
+    <div class="layout-topbar-actions">
+      <div class="layout-config-menu">
+        <p-button
+          class="layout-topbar-action"
+          id="oip-app-topbar-theme-button"
+          severity="secondary"
+          type="button"
+          [rounded]="true"
+          [text]="true"
+          (click)="toggleDarkMode()">
+          <i
+            class="pi"
+            [ngClass]="{
+              'pi-moon': layoutService.isDarkTheme(),
+              'pi-sun': !layoutService.isDarkTheme()
+            }"></i>
+        </p-button>
+        <div class="relative">
+          <p-button
+            class="layout-topbar-action layout-topbar-action-highlight"
+            enterActiveClass="animate-scalein"
+            enterFromClass="hidden"
+            id="oip-app-topbar-palette-button"
+            leaveActiveClass="animate-fadeout"
+            leaveToClass="hidden"
+            pStyleClass="@next"
+            [hideOnOutsideClick]="true"
+            [rounded]="true">
+            <i class="pi pi-palette"></i>
+          </p-button>
+          <app-configurator />
+        </div>
+      </div>
+
+      <button
+        class="layout-topbar-menu-button layout-topbar-action"
+        enterActiveClass="animate-scalein"
+        enterFromClass="hidden"
+        id="oip-app-topbar-menu-expand-button"
+        leaveActiveClass="animate-fadeout"
+        leaveToClass="hidden"
+        pStyleClass="@next"
+        [hideOnOutsideClick]="true">
+        <i class="pi pi-ellipsis-v"></i>
+      </button>
+
+      <div class="layout-topbar-menu hidden lg:block">
+        <div class="layout-topbar-menu-content">
+          <button
+            class="layout-topbar-action"
+            id="oip-app-topbar-logout-button"
+            type="button"
+            (click)="securityService.logout()"
+            (keydown)="logoutKeyDown($event)">
+            <i class="pi pi-sign-out"></i>
+            <span>{{ 'topbar.logout' | translate }}</span>
+          </button>
+          <button class="layout-topbar-action" routerLink="config">
+            <p-avatar
+              class="p-link flex align-items-center"
+              id="oip-app-topbar-user-avatar"
+              shape="circle"
+              size="normal"
+              [image]="userService.photoLoaded ? userService.photo : null"
+              >{{ !userService.photoLoaded ? userService.shortLabel : null }}
+            </p-avatar>
+            <span class="ml-2">{{ 'topbar.profile' | translate }}</span>
+          </button>
+        </div>
+      </div>
+    </div>
   </div>`
                 }]
         }] });
@@ -1988,15 +2011,18 @@ class HttpClient {
         this.layoutService = inject(LayoutService);
         this.baseUrl = "";
         this.securityData = null;
-        this.securityWorker = (securityData) => ({
-            headers: {
+        this.securityWorker = (securityData) => {
+            const headers = {
                 "Accept-language": this.layoutService.language()
                     ? this.layoutService.language()
                     : "en",
                 "X-Timezone": this.layoutService.timeZone(),
-                Authorization: `Bearer ${securityData}`,
-            },
-        });
+            };
+            if (securityData) {
+                headers.Authorization = `Bearer ${securityData}`;
+            }
+            return { headers };
+        };
         this.abortControllers = new Map();
         this.customFetch = (...fetchParams) => fetch(...fetchParams);
         this.baseApiParams = {
@@ -3128,7 +3154,8 @@ class MenuComponent {
         ];
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: MenuComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: MenuComponent, isStandalone: true, selector: "app-menu", providers: [MenuApi], viewQueries: [{ propertyName: "menuItemCreateDialogComponent", first: true, predicate: MenuItemCreateDialogComponent, descendants: true }, { propertyName: "menuItemEditDialogComponent", first: true, predicate: MenuItemEditDialogComponent, descendants: true }, { propertyName: "contextMenu", first: true, predicate: ContextMenu, descendants: true }], ngImport: i0, template: ` <div #empty class="layout-sidebar" (contextmenu)="onContextMenu($event)">
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: MenuComponent, isStandalone: true, selector: "app-menu", providers: [MenuApi], viewQueries: [{ propertyName: "menuItemCreateDialogComponent", first: true, predicate: MenuItemCreateDialogComponent, descendants: true }, { propertyName: "menuItemEditDialogComponent", first: true, predicate: MenuItemEditDialogComponent, descendants: true }, { propertyName: "contextMenu", first: true, predicate: ContextMenu, descendants: true }], ngImport: i0, template: `
+    <div #empty class="layout-sidebar" (contextmenu)="onContextMenu($event)">
       <ul class="layout-menu">
         @for (item of menuService.menu; track item; let i = $index) {
           <ng-container>
@@ -3148,10 +3175,10 @@ class MenuComponent {
         }
       </ul>
     </div>
-    <p-contextMenu [target]="empty" />
-    @if (securityService.isAdmin) {
-      <menu-item-create-dialog />
-      <menu-item-edit-dialog />
+    <p-contextMenu [target]="empty"/>
+    @if (securityService.isAdmin()) {
+      <menu-item-create-dialog/>
+      <menu-item-edit-dialog/>
     }`, isInline: true, dependencies: [{ kind: "component", type: MenuItemComponent, selector: "[app-menuitem]", inputs: ["item", "index", "root", "parentKey", "menuItemCreateDialogComponent", "menuItemEditDialogComponent", "contextMenu"] }, { kind: "ngmodule", type: ButtonModule }, { kind: "ngmodule", type: ContextMenuModule }, { kind: "component", type: i1$4.ContextMenu, selector: "p-contextMenu, p-contextmenu, p-context-menu", inputs: ["model", "triggerEvent", "target", "global", "style", "styleClass", "autoZIndex", "baseZIndex", "id", "breakpoint", "ariaLabel", "ariaLabelledBy", "pressDelay", "appendTo"], outputs: ["onShow", "onHide"] }, { kind: "ngmodule", type: DialogModule }, { kind: "ngmodule", type: InputTextModule }, { kind: "component", type: MenuItemCreateDialogComponent, selector: "menu-item-create-dialog", inputs: ["visible"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: FormsModule }, { kind: "component", type: MenuItemEditDialogComponent, selector: "menu-item-edit-dialog", inputs: ["visible"], outputs: ["visibleChange"] }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: MenuComponent, decorators: [{
@@ -3170,7 +3197,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                     providers: [MenuApi],
                     selector: 'app-menu',
                     standalone: true,
-                    template: ` <div #empty class="layout-sidebar" (contextmenu)="onContextMenu($event)">
+                    template: `
+    <div #empty class="layout-sidebar" (contextmenu)="onContextMenu($event)">
       <ul class="layout-menu">
         @for (item of menuService.menu; track item; let i = $index) {
           <ng-container>
@@ -3190,10 +3218,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
         }
       </ul>
     </div>
-    <p-contextMenu [target]="empty" />
-    @if (securityService.isAdmin) {
-      <menu-item-create-dialog />
-      <menu-item-edit-dialog />
+    <p-contextMenu [target]="empty"/>
+    @if (securityService.isAdmin()) {
+      <menu-item-create-dialog/>
+      <menu-item-edit-dialog/>
     }`
                 }]
         }], propDecorators: { menuItemCreateDialogComponent: [{
@@ -5925,17 +5953,10 @@ class NotificationService {
         this.securityService = inject(SecurityService);
         this.msgService = inject(MsgService);
         this.frontendConfig = inject(OIP_FRONTEND_CONFIG);
-        this.securityService.getAccessToken().subscribe((token) => {
-            this.securityData = token;
-            if (token) {
-                this.connection.stop().then(() => {
-                    this.connection.start().then();
-                });
-            }
-        });
+        this.securityData = null;
         this.connection = new signalR.HubConnectionBuilder()
             .withUrl(this.resolveHubUrl(), {
-            accessTokenFactory: () => this.securityData,
+            accessTokenFactory: () => this.securityData ?? '',
             skipNegotiation: true,
             transport: signalR.HttpTransportType.WebSockets
         })
@@ -5950,6 +5971,19 @@ class NotificationService {
             };
             this.msgService.add(opt);
         });
+        this.securityService.getAccessToken().subscribe((token) => {
+            this.securityData = token;
+            if (!token) {
+                return;
+            }
+            if (this.connection.state === signalR.HubConnectionState.Disconnected) {
+                this.connection.start().catch((error) => console.error('Failed to start notification connection', error));
+                return;
+            }
+            this.connection.stop().then(() => {
+                this.connection.start().catch((error) => console.error('Failed to restart notification connection', error));
+            });
+        });
     }
     resolveHubUrl() {
         if (this.frontendConfig.notificationHubUrl) {