@lowcodeunit/applications-flow-common 1.39.86-merge → 1.39.88-enterprise-switch-fix

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

@@ -454,6 +454,10 @@ 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 {
@@ -487,66 +491,80 @@ class ProjectService {
     async ListEnterprises(state) {
         return new Promise((resolve, reject) => {
             state.LoadingEnterprises = true;
-            this.appsFlowSvc.ListEnterprises().subscribe(async (response) => {
-                state.LoadingEnterprises = false;
-                if (response.Status.Code === 0) {
-                    state.Enterprises = response.Model;
-                    resolve(response.Model);
-                }
-                else {
-                    reject(response.Status);
-                    // console.log(response);
-                }
-            }, (err) => {
-                state.LoadingEnterprises = false;
-                reject(err);
-                console.log(err);
+            this.appsFlowSvc.ListEnterprises().subscribe({
+                next: async (response) => {
+                    // console.log('list Enterprises resp: ', response);
+                    state.LoadingEnterprises = false;
+                    if (response.Status.Code === 0) {
+                        state.Enterprises = response.Model;
+                        resolve(response.Model);
+                    }
+                    else {
+                        reject(response.Status);
+                        // console.log(response);
+                    }
+                },
+                error: (err) => {
+                    state.LoadingEnterprises = false;
+                    reject(err);
+                    console.log(err);
+                },
             });
         });
     }
-    LoadEnterpriseAsCode(state) {
+    async LoadEnterpriseAsCode(state) {
         return new Promise((resolve, reject) => {
-            state.Loading = true;
-            this.appsFlowSvc.LoadEnterpriseAsCode().subscribe((response) => {
-                state.Loading = false;
-                console.log('Load eac response: ', response);
-                if (response.Status.Code === 0) {
-                    state.EaC = response.Model || {};
-                }
-                else if (response.Status.Code === 3) {
-                }
-                state.EaC = state.EaC || {};
-                console.log('state.eac = ', state.EaC);
-                this.CreatingProject =
-                    Object.keys(state?.EaC?.Projects || {}).length <= 0;
-                resolve(state.EaC);
-                this.activatedRoute.queryParams.subscribe((params) => {
-                    if (params?.direct == 'true') {
-                        let projKeys = Object.keys(state.EaC.Projects || {});
-                        if (projKeys.length == 1) {
-                            // console.log('Directing to deeper link');
-                            let appKeys = Object.keys(state.EaC.Applications || {});
-                            if (appKeys.length == 1) {
-                                let app = state.EaC.Applications[appKeys[0]];
-                                let routeKey = encodeURIComponent(app.LookupConfig.PathRegex?.replace('.*', '') || '/');
-                                window.location.href = `/dashboard/application/${appKeys[0]}/${routeKey}/${projKeys[0]}`;
-                            }
-                            else {
-                                window.location.href = `/dashboard/project/${projKeys[0]}`;
+            console.log('Load ent called!!!');
+            // state.Loading = true;
+            // state.LoadingActiveEnterprise = true;
+            // BaseModeledResponse<EnterpriseAsCode>
+            this.appsFlowSvc.LoadEnterpriseAsCode().subscribe({
+                next: (response) => {
+                    console.log('State at Load ent: ', state);
+                    state.Loading = false;
+                    state.LoadingActiveEnterprise = false;
+                    console.log('Load eac State after set Loading FALSE: ', state);
+                    if (response.Status.Code === 0) {
+                        state.EaC = response.Model || {};
+                    }
+                    else if (response.Status.Code === 3) {
+                    }
+                    state.EaC = state.EaC || {};
+                    // console.log('state.eac = ', state.EaC);
+                    this.CreatingProject =
+                        Object.keys(state?.EaC?.Projects || {}).length <= 0;
+                    resolve(state.EaC);
+                    this.activatedRoute.queryParams.subscribe((params) => {
+                        if (params?.direct == 'true') {
+                            let projKeys = Object.keys(state.EaC.Projects || {});
+                            if (projKeys.length == 1) {
+                                // console.log('Directing to deeper link');
+                                let appKeys = Object.keys(state.EaC.Applications || {});
+                                if (appKeys.length == 1) {
+                                    let app = state.EaC.Applications[appKeys[0]];
+                                    let routeKey = encodeURIComponent(app.LookupConfig.PathRegex?.replace('.*', '') || '/');
+                                    window.location.href = `/dashboard/application/${appKeys[0]}/${routeKey}/${projKeys[0]}`;
+                                }
+                                else {
+                                    window.location.href = `/dashboard/project/${projKeys[0]}`;
+                                }
                             }
                         }
-                    }
-                });
-                // console.log(state);
-            }, (err) => {
-                state.Loading = false;
-                reject(err);
-                console.log(err);
+                    });
+                    // console.log(state);
+                },
+                error: (err) => {
+                    console.log('Load EAC ERROR Block');
+                    state.Loading = false;
+                    reject(err);
+                    console.error(err);
+                },
             });
         });
     }
     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,12 +616,15 @@ 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;
             this.appsFlowSvc.SetActiveEnterprise(activeEntLookup).subscribe(async (response) => {
                 if (response.Status.Code === 0) {
                     this.EditingProjectLookup = null;
-                    console.log('state: ', state);
+                    // console.log('state: ', state);
                     // console.log(
                     //     'project service active ent: ',
                     //     activeEntLookup
@@ -615,20 +636,28 @@ class ProjectService {
                     // );
                     resolve(response.Status);
                     var results = await Promise.all([
-                        this.ListEnterprises(state),
-                        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);
             });
@@ -636,32 +665,52 @@ class ProjectService {
     }
     async SaveEnterpriseAsCode(state, eac) {
         return new Promise((resolve, reject) => {
+            console.log('save EAC called');
             state.Loading = true;
+            state.LoadingActiveEnterprise = true;
             // console.log('eac: ', eac);
-            this.appsFlowSvc.SaveEnterpriseAsCode(eac).subscribe(async (response) => {
-                if (response.Status.Code === 0) {
-                    resolve(response.Status);
-                    var results = await Promise.all([
+            let saveEntSub = this.appsFlowSvc
+                .SaveEnterpriseAsCode(eac)
+                .subscribe({
+                next: async (response) => {
+                    if (response.Status.Code === 0) {
+                        resolve(response.Status);
+                        console.log('Save EAC Success');
+                        // var results =  Promise.all([
                         // this.EnsureUserEnterprise(state),
-                        this.LoadEnterpriseAsCode(state),
-                        this.ListEnterprises(state),
+                        //  this.LoadEnterpriseAsCode(state),
+                        // this.ListEnterprises(state),
                         // this.GetActiveEnterprise(state),
-                        this.LoadUserFeed(1, 25, localStorage.getItem('activeFilter')
-                            ? localStorage.getItem('activeFilter')
-                            : '', false, state),
-                    ]);
-                    // console.log('LOAD EAC RESULTS: ', results);
-                }
-                else {
+                        // this.LoadUserFeed(
+                        //     1,
+                        //     25,
+                        //     localStorage.getItem('activeFilter')
+                        //         ? localStorage.getItem('activeFilter')
+                        //         : '',
+                        //     false,
+                        //     state
+                        // ),
+                        // ]);
+                        var results = this.LoadEnterpriseAsCode(state);
+                        console.log('LOAD EAC RESULTS: ', results);
+                        state.Loading = false;
+                        state.LoadingActiveEnterprise = false;
+                        console.log('State from save eac: ', state);
+                    }
+                    else {
+                        state.Loading = false;
+                        reject(response.Status);
+                        // console.log(response);
+                    }
+                },
+                error: (err) => {
                     state.Loading = false;
-                    reject(response.Status);
-                    // console.log(response);
-                }
-            }, (err) => {
-                state.Loading = false;
-                reject(err);
-                console.log(err);
+                    reject(err);
+                    console.log(err);
+                },
             });
+            console.log('SAVE ENT SUB: ', saveEntSub);
+            // saveEntSub.unsubscribe();
         });
     }
     SetCreatingProject(creatingProject) {
@@ -997,6 +1046,9 @@ 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);
@@ -1064,6 +1116,7 @@ class EaCService {
         return state;
     }
     async SaveApplicationAsCode(req) {
+        console.log('Calling Save App as Code: ', req);
         return await this.handleSaveApplication(req);
     }
     async SaveDFSModifier(req) {
@@ -1116,6 +1169,7 @@ class EaCService {
     //  Helpers
     async handleSaveApplication(req) {
         const state = this.stateSubject.getValue();
+        console.log('calling handle Save App: ', state);
         const saveEaC = {
             EnterpriseLookup: state.EaC.EnterpriseLookup,
             Applications: {},
@@ -1132,9 +1186,13 @@ class EaCService {
         if (req.Application) {
             saveEaC.Applications[req.ApplicationLookup] = req.Application;
         }
-        const status = await this.projectService.SaveEnterpriseAsCode(state, saveEaC);
+        //await
+        const status = await Promise.all([
+            this.projectService.SaveEnterpriseAsCode(state, saveEaC),
+        ]);
+        console.log('State after save app: ', state);
         this.stateSubject.next(state);
-        return status;
+        return status[0];
     }
     async handleSaveDFSModifier(req) {
         const state = this.stateSubject.getValue();
@@ -1156,11 +1214,12 @@ 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;
@@ -4130,7 +4189,7 @@ class DevopsSourceControlFormComponent {
     }
     RefreshOrganizations() {
         // this.Loading = true;
-        console.log('refresh');
+        // console.log('refresh');
         this.listOrganizations();
         this.OrganizationFormControl?.reset();
         this.RepositoryFormControl?.reset();
@@ -6819,7 +6878,7 @@ class FeedHeaderComponent {
         window.location.href = path;
     }
     Submit() {
-        console.log('submitting: ', this.value);
+        // console.log('submitting: ', this.value);
         switch (this.selectedBtn) {
             case 'pr-btn':
                 //Pull request
@@ -7264,7 +7323,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': {
@@ -8168,7 +8227,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)
@@ -8498,10 +8557,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;