@propmix/profet-common-header 3.1.0 → 4.0.3-unstable

package/fesm2020/propmix-profet-common-header.mjs

@@ -376,7 +376,7 @@ class HeaderComponent {
         this._snackbar = inject(MatSnackBar);
         this._headerSer = inject(CommonHeaderService);
         this._domSanitizer = inject(DomSanitizer);
-        this.INACTIVITY_LIMIT = 30 * 60 * 1000; // 30 minutes
+        this.INACTIVITY_LIMIT = 10000; // 30 minutes
         this.isDialogOpen = false;
         this.companyControl = new FormControl();
         this.appConfig = AppConfig.appConfig;
@@ -386,6 +386,7 @@ class HeaderComponent {
     async ngOnInit() {
         this.updateLastAccessedAppInfo();
         this.getCompanyList();
+        this.getMenuList();
         let userInfo = await getCurrentUser();
         if (userInfo?.username) {
             let userDetails = this._headerSer.getUserDetailsByEmail({
@@ -396,7 +397,6 @@ class HeaderComponent {
                     if (res && res[0]) {
                         this.userAuthData = res[0];
                         this.username = this.userAuthData.firstName;
-                        this.getMenuList();
                         if (this.userAuthData?._links?.profileImage?.href) {
                             this.getUserProfile();
                         }
@@ -431,15 +431,6 @@ class HeaderComponent {
     groupByAppType(menuList) {
         let grouped = menuList.reduce((r, a) => {
             r[a.appType] = r[a.appType] || [];
-            // TODO: Path references are to be replaced with values from backend API response. Remove this block when backend is ready
-            if (a.appType == PROFET_APPS.profet_portal) {
-                let isCompanyMenu = a.path === 'app/companies';
-                let isCompanyAdmin = this.userAuthData?.rolesForCurrentCompany.includes("COMPANY_ADMIN");
-                if (isCompanyMenu && isCompanyAdmin) {
-                    a = { ...a, path: 'app/addCompany/companyDetails' };
-                }
-            }
-            // END of TODO block
             r[a.appType].push(a);
             return r;
         }, Object.create(null));
@@ -447,30 +438,15 @@ class HeaderComponent {
     }
     menuSelection(menu) {
         this.sideMenuToggle();
-        let activeCom = this.companyList.find(x => x.isActive);
-        let isCompanyMenu = menu.path === 'app/addCompany/companyDetails';
-        let isCompanyAdmin = this.userAuthData?.rolesForCurrentCompany.includes("COMPANY_ADMIN");
         if (menu.appType == this._headerSer.headerConfig.appType) {
-            // TODO: Path references are to be replaced with values from backend API response
-            if (isCompanyMenu && isCompanyAdmin) {
-                this._router.navigate([menu.path, activeCom?.id]);
-            }
-            else {
-                this._router.navigate([menu.path]);
-            }
+            this._router.navigate([menu.path]);
         }
         else {
+            let activeCom = this.companyList.find(x => x.isActive);
             if (activeCom) {
                 if (activeCom.baseUrls[menu.appType]) {
-                    // TODO: Path references are to be replaced with values from backend API response
-                    if (isCompanyMenu && isCompanyAdmin) {
-                        let url = `${activeCom.baseUrls[menu.appType]}/${menu.path}/${activeCom.id}`;
-                        window.location.replace(url);
-                    }
-                    else {
-                        let url = `${activeCom.baseUrls[menu.appType]}/${menu.path}`;
-                        window.location.replace(url);
-                    }
+                    let url = `${activeCom.baseUrls[menu.appType]}/${menu.path}`;
+                    window.location.replace(url);
                 }
             }
         }