@lowcodeunit/applications-flow-common 1.39.81-merge → 1.39.85-enterprise-switch-fix

package/fesm2020/lowcodeunit-applications-flow-common.mjs

@@ -454,6 +454,7 @@ class ProjectService {
                 state.LoadingActiveEnterprise = false;
                 if (response.Status.Code === 0) {
                     state.ActiveEnterpriseLookup = response.Model?.Lookup;
+                    console.log('Active Ent set to = ', response.Model?.Lookup);
                     resolve();
                 }
                 else {
@@ -488,6 +489,7 @@ class ProjectService {
         return new Promise((resolve, reject) => {
             state.LoadingEnterprises = true;
             this.appsFlowSvc.ListEnterprises().subscribe(async (response) => {
+                console.log('list Enterprises resp: ', response);
                 state.LoadingEnterprises = false;
                 if (response.Status.Code === 0) {
                     state.Enterprises = response.Model;
@@ -506,9 +508,12 @@ class ProjectService {
     }
     LoadEnterpriseAsCode(state) {
         return new Promise((resolve, reject) => {
+            console.log('Load ent called!!!');
             state.Loading = true;
+            state.LoadingActiveEnterprise = true;
             this.appsFlowSvc.LoadEnterpriseAsCode().subscribe((response) => {
                 state.Loading = false;
+                state.LoadingActiveEnterprise = false;
                 console.log('Load eac response: ', response);
                 if (response.Status.Code === 0) {
                     state.EaC = response.Model || {};
@@ -547,6 +552,7 @@ class ProjectService {
     }
     async LoadUserFeed(page, pageSize, filterStr, forCheck = false, state) {
         return new Promise((resolve, reject) => {
+            console.log('load user feed called');
             state.LoadingFeed = !forCheck;
             let paramMap = this.activatedRoute.snapshot.children[0].paramMap;
             let result = this.loadApplicationsForFeed(state, paramMap);
@@ -598,35 +604,49 @@ class ProjectService {
     }
     async SetActiveEnterprise(state, activeEntLookup) {
         return new Promise((resolve, reject) => {
+            console.log('SET ACTIVE ENT CALLED', activeEntLookup);
             state.Loading = true;
+            state.LoadingActiveEnterprise = true;
             state.LoadingFeed = true;
+            state.ActiveEnterpriseLookup = activeEntLookup;
+            // state.LoadingFeed = true;
             this.appsFlowSvc.SetActiveEnterprise(activeEntLookup).subscribe(async (response) => {
                 if (response.Status.Code === 0) {
                     this.EditingProjectLookup = null;
+                    console.log('state: ', state);
                     // console.log(
                     //     'project service active ent: ',
                     //     activeEntLookup
                     // );
-                    state.ActiveEnterpriseLookup = activeEntLookup;
+                    // state.ActiveEnterpriseLookup = activeEntLookup;
                     // console.log(
                     //     'project service State active ent: ',
                     //     state.ActiveEnterpriseLookup
                     // );
                     resolve(response.Status);
                     var results = await Promise.all([
-                        this.LoadEnterpriseAsCode(state),
-                        this.LoadUserFeed(1, 25, localStorage.getItem('activeFilter')
-                            ? localStorage.getItem('activeFilter')
-                            : '', false, state),
+                    // this.ListEnterprises(state),
+                    // this.LoadEnterpriseAsCode(state),
+                    // this.LoadUserFeed(
+                    //     1,
+                    //     25,
+                    //     localStorage.getItem('activeFilter')
+                    //         ? localStorage.getItem('activeFilter')
+                    //         : '',
+                    //     false,
+                    //     state
+                    // ),
                     ]);
                 }
                 else {
                     state.Loading = false;
+                    state.LoadingActiveEnterprise = false;
                     reject(response.Status);
                     // console.log(response);
                 }
             }, (err) => {
                 state.Loading = false;
+                state.LoadingActiveEnterprise = false;
                 reject(err);
                 console.log(err);
             });
@@ -995,9 +1015,6 @@ class EaCService {
             return status;
         }
     }
-    // this.appsFlowEventsSvc.EnsureUserEnterpriseEvent.subscribe(async () => {
-    //   await this.projectService.EnsureUserEnterprise(this.State);
-    // });
     async EnsureUserEnterprise() {
         const state = this.stateSubject.getValue();
         const status = await this.projectService.EnsureUserEnterprise(state);
@@ -1117,7 +1134,6 @@ class EaCService {
     //  Helpers
     async handleSaveApplication(req) {
         const state = this.stateSubject.getValue();
-        // console.log("app req: ", req);
         const saveEaC = {
             EnterpriseLookup: state.EaC.EnterpriseLookup,
             Applications: {},
@@ -1158,12 +1174,11 @@ class EaCService {
         }
         if (req.ApplicationLookup) {
             // console.log('APPLOokup: ', req.ApplicationLookup);
-            // console.log('saveEAC: ', saveEaC);
             saveEaC.Applications[req.ApplicationLookup] = {
                 ModifierLookups: req.ModifierLookups,
             };
         }
-        // console.log('Save mod eac: ', saveEaC);
+        console.log('Save mod eac: ', saveEaC);
         const status = await this.projectService.SaveEnterpriseAsCode(state, saveEaC);
         this.stateSubject.next(state);
         return status;
@@ -7031,6 +7046,7 @@ class DFSModifiersFormComponent {
     SaveModifier(projectLookup = null) {
         let saveStatus;
         if (this.ModifierFormGroup) {
+            // console.log("here 1")
             const saveMdfrReq = {
                 Modifier: {
                     ...this.EditingModifier,
@@ -7041,7 +7057,7 @@ class DFSModifiersFormComponent {
                     Type: this.CurrentType,
                 },
                 ModifierLookups: [this.EditingModifierLookup],
-                ProjectLookups: [projectLookup],
+                // ProjectLookups: [projectLookup],
             };
             let details = this.getDetails();
             saveMdfrReq.Modifier.Details = JSON.stringify(details);
@@ -7050,6 +7066,7 @@ class DFSModifiersFormComponent {
             });
         }
         else if (this.ModifierSelectFormGroup) {
+            // console.log('here 2');
             const saveMdfrReq = {
                 ModifierLookups: this.MultiSelectFormControl.value,
                 ProjectLookups: [projectLookup],
@@ -7265,7 +7282,7 @@ class DFSModifiersDialogComponent {
         }
     }
     SaveDFSModifier() {
-        // console.log("level at save: ", this.data.level)
+        console.log('level at save: ', this.data.level);
         let status;
         switch (this.data.level) {
             case 'enterprise': {
@@ -7287,7 +7304,7 @@ class DFSModifiersDialogComponent {
                     this.DFSModifersFormControls.SaveModifierForApplication(this.data.applicationLookup);
             }
         }
-        if (status.Code === 0) {
+        if (status?.Code === 0) {
             this.snackBar.open('DFS Modifier Saved Successfully', 'Dismiss', {
                 duration: 5000,
             });
@@ -8169,7 +8186,7 @@ class TeamMemberCardComponent {
             memberList.push(this.CurrentUser);
         }
         this.ProjectLookups.forEach((proj) => {
-            this.Projects[proj].RelyingParty?.AccessConfigurations?.fathym?.Usernames?.forEach((username) => {
+            this.Projects[proj]?.RelyingParty?.AccessConfigurations?.fathym?.Usernames?.forEach((username) => {
                 if (!memberList.includes(username)) {
                     memberList.push(username);
                     // console.log("Added: ", username)
@@ -8499,10 +8516,10 @@ class ProjectCardComponent {
             let tempProj = this.Projects[pLookup];
             this.Project = tempProj;
             let tempProjNode = {
-                name: tempProj.Project.Name,
-                description: tempProj.Project.Description,
+                name: tempProj?.Project?.Name,
+                description: tempProj?.Project?.Description,
                 lookup: pLookup,
-                url: 'https://' + tempProj.PrimaryHost,
+                url: 'https://' + tempProj?.PrimaryHost,
                 routerLink: ['/project', pLookup],
             };
             let tempRoutes = this.ApplicationRoutes;