@lowcodeunit/applications-flow-common 1.39.82-integration → 1.39.86-enterprise-switch-fix
Sign up to get free protection for your applications and to get access to all the features.
- package/esm2020/lib/controls/devops-source-control-form/devops-source-control-form.component.mjs +2 -2
- package/esm2020/lib/controls/dfs-modifiers-form/dfs-modifiers-form.component.mjs +4 -2
- package/esm2020/lib/dialogs/dfs-modifiers-dialog/dfs-modifiers-dialog.component.mjs +3 -3
- package/esm2020/lib/elements/feed-header/feed-header.component.mjs +2 -2
- package/esm2020/lib/elements/project-card/project-card.component.mjs +4 -4
- package/esm2020/lib/elements/team-member-card/team-member-card.component.mjs +2 -2
- package/esm2020/lib/services/eac.service.mjs +2 -7
- package/esm2020/lib/services/project.service.mjs +31 -8
- package/fesm2015/lowcodeunit-applications-flow-common.mjs +44 -23
- package/fesm2015/lowcodeunit-applications-flow-common.mjs.map +1 -1
- package/fesm2020/lowcodeunit-applications-flow-common.mjs +42 -22
- package/fesm2020/lowcodeunit-applications-flow-common.mjs.map +1 -1
- package/package.json +1 -1
@@ -454,6 +454,10 @@ class ProjectService {
|
|
454
454
|
state.LoadingActiveEnterprise = false;
|
455
455
|
if (response.Status.Code === 0) {
|
456
456
|
state.ActiveEnterpriseLookup = response.Model?.Lookup;
|
457
|
+
// console.log(
|
458
|
+
// 'Active Ent set to = ',
|
459
|
+
// response.Model?.Lookup
|
460
|
+
// );
|
457
461
|
resolve();
|
458
462
|
}
|
459
463
|
else {
|
@@ -488,6 +492,7 @@ class ProjectService {
|
|
488
492
|
return new Promise((resolve, reject) => {
|
489
493
|
state.LoadingEnterprises = true;
|
490
494
|
this.appsFlowSvc.ListEnterprises().subscribe(async (response) => {
|
495
|
+
// console.log('list Enterprises resp: ', response);
|
491
496
|
state.LoadingEnterprises = false;
|
492
497
|
if (response.Status.Code === 0) {
|
493
498
|
state.Enterprises = response.Model;
|
@@ -506,17 +511,20 @@ class ProjectService {
|
|
506
511
|
}
|
507
512
|
LoadEnterpriseAsCode(state) {
|
508
513
|
return new Promise((resolve, reject) => {
|
514
|
+
// console.log('Load ent called!!!');
|
509
515
|
state.Loading = true;
|
516
|
+
state.LoadingActiveEnterprise = true;
|
510
517
|
this.appsFlowSvc.LoadEnterpriseAsCode().subscribe((response) => {
|
511
518
|
state.Loading = false;
|
512
|
-
|
519
|
+
state.LoadingActiveEnterprise = false;
|
520
|
+
// console.log('Load eac response: ', response);
|
513
521
|
if (response.Status.Code === 0) {
|
514
522
|
state.EaC = response.Model || {};
|
515
523
|
}
|
516
524
|
else if (response.Status.Code === 3) {
|
517
525
|
}
|
518
526
|
state.EaC = state.EaC || {};
|
519
|
-
console.log('state.eac = ', state.EaC);
|
527
|
+
// console.log('state.eac = ', state.EaC);
|
520
528
|
this.CreatingProject =
|
521
529
|
Object.keys(state?.EaC?.Projects || {}).length <= 0;
|
522
530
|
resolve(state.EaC);
|
@@ -547,6 +555,7 @@ class ProjectService {
|
|
547
555
|
}
|
548
556
|
async LoadUserFeed(page, pageSize, filterStr, forCheck = false, state) {
|
549
557
|
return new Promise((resolve, reject) => {
|
558
|
+
// console.log('load user feed called');
|
550
559
|
state.LoadingFeed = !forCheck;
|
551
560
|
let paramMap = this.activatedRoute.snapshot.children[0].paramMap;
|
552
561
|
let result = this.loadApplicationsForFeed(state, paramMap);
|
@@ -598,35 +607,49 @@ class ProjectService {
|
|
598
607
|
}
|
599
608
|
async SetActiveEnterprise(state, activeEntLookup) {
|
600
609
|
return new Promise((resolve, reject) => {
|
610
|
+
// console.log('SET ACTIVE ENT CALLED', activeEntLookup);
|
601
611
|
state.Loading = true;
|
612
|
+
state.LoadingActiveEnterprise = true;
|
602
613
|
state.LoadingFeed = true;
|
614
|
+
state.ActiveEnterpriseLookup = activeEntLookup;
|
615
|
+
// state.LoadingFeed = true;
|
603
616
|
this.appsFlowSvc.SetActiveEnterprise(activeEntLookup).subscribe(async (response) => {
|
604
617
|
if (response.Status.Code === 0) {
|
605
618
|
this.EditingProjectLookup = null;
|
619
|
+
// console.log('state: ', state);
|
606
620
|
// console.log(
|
607
621
|
// 'project service active ent: ',
|
608
622
|
// activeEntLookup
|
609
623
|
// );
|
610
|
-
state.ActiveEnterpriseLookup = activeEntLookup;
|
624
|
+
// state.ActiveEnterpriseLookup = activeEntLookup;
|
611
625
|
// console.log(
|
612
626
|
// 'project service State active ent: ',
|
613
627
|
// state.ActiveEnterpriseLookup
|
614
628
|
// );
|
615
629
|
resolve(response.Status);
|
616
630
|
var results = await Promise.all([
|
617
|
-
|
618
|
-
|
619
|
-
|
620
|
-
|
631
|
+
// this.ListEnterprises(state),
|
632
|
+
// this.LoadEnterpriseAsCode(state),
|
633
|
+
// this.LoadUserFeed(
|
634
|
+
// 1,
|
635
|
+
// 25,
|
636
|
+
// localStorage.getItem('activeFilter')
|
637
|
+
// ? localStorage.getItem('activeFilter')
|
638
|
+
// : '',
|
639
|
+
// false,
|
640
|
+
// state
|
641
|
+
// ),
|
621
642
|
]);
|
622
643
|
}
|
623
644
|
else {
|
624
645
|
state.Loading = false;
|
646
|
+
state.LoadingActiveEnterprise = false;
|
625
647
|
reject(response.Status);
|
626
648
|
// console.log(response);
|
627
649
|
}
|
628
650
|
}, (err) => {
|
629
651
|
state.Loading = false;
|
652
|
+
state.LoadingActiveEnterprise = false;
|
630
653
|
reject(err);
|
631
654
|
console.log(err);
|
632
655
|
});
|
@@ -995,9 +1018,6 @@ class EaCService {
|
|
995
1018
|
return status;
|
996
1019
|
}
|
997
1020
|
}
|
998
|
-
// this.appsFlowEventsSvc.EnsureUserEnterpriseEvent.subscribe(async () => {
|
999
|
-
// await this.projectService.EnsureUserEnterprise(this.State);
|
1000
|
-
// });
|
1001
1021
|
async EnsureUserEnterprise() {
|
1002
1022
|
const state = this.stateSubject.getValue();
|
1003
1023
|
const status = await this.projectService.EnsureUserEnterprise(state);
|
@@ -1117,7 +1137,6 @@ class EaCService {
|
|
1117
1137
|
// Helpers
|
1118
1138
|
async handleSaveApplication(req) {
|
1119
1139
|
const state = this.stateSubject.getValue();
|
1120
|
-
// console.log("app req: ", req);
|
1121
1140
|
const saveEaC = {
|
1122
1141
|
EnterpriseLookup: state.EaC.EnterpriseLookup,
|
1123
1142
|
Applications: {},
|
@@ -1158,12 +1177,11 @@ class EaCService {
|
|
1158
1177
|
}
|
1159
1178
|
if (req.ApplicationLookup) {
|
1160
1179
|
// console.log('APPLOokup: ', req.ApplicationLookup);
|
1161
|
-
// console.log('saveEAC: ', saveEaC);
|
1162
1180
|
saveEaC.Applications[req.ApplicationLookup] = {
|
1163
1181
|
ModifierLookups: req.ModifierLookups,
|
1164
1182
|
};
|
1165
1183
|
}
|
1166
|
-
|
1184
|
+
console.log('Save mod eac: ', saveEaC);
|
1167
1185
|
const status = await this.projectService.SaveEnterpriseAsCode(state, saveEaC);
|
1168
1186
|
this.stateSubject.next(state);
|
1169
1187
|
return status;
|
@@ -4133,7 +4151,7 @@ class DevopsSourceControlFormComponent {
|
|
4133
4151
|
}
|
4134
4152
|
RefreshOrganizations() {
|
4135
4153
|
// this.Loading = true;
|
4136
|
-
console.log('refresh');
|
4154
|
+
// console.log('refresh');
|
4137
4155
|
this.listOrganizations();
|
4138
4156
|
this.OrganizationFormControl?.reset();
|
4139
4157
|
this.RepositoryFormControl?.reset();
|
@@ -6822,7 +6840,7 @@ class FeedHeaderComponent {
|
|
6822
6840
|
window.location.href = path;
|
6823
6841
|
}
|
6824
6842
|
Submit() {
|
6825
|
-
console.log('submitting: ', this.value);
|
6843
|
+
// console.log('submitting: ', this.value);
|
6826
6844
|
switch (this.selectedBtn) {
|
6827
6845
|
case 'pr-btn':
|
6828
6846
|
//Pull request
|
@@ -7031,6 +7049,7 @@ class DFSModifiersFormComponent {
|
|
7031
7049
|
SaveModifier(projectLookup = null) {
|
7032
7050
|
let saveStatus;
|
7033
7051
|
if (this.ModifierFormGroup) {
|
7052
|
+
// console.log("here 1")
|
7034
7053
|
const saveMdfrReq = {
|
7035
7054
|
Modifier: {
|
7036
7055
|
...this.EditingModifier,
|
@@ -7041,7 +7060,7 @@ class DFSModifiersFormComponent {
|
|
7041
7060
|
Type: this.CurrentType,
|
7042
7061
|
},
|
7043
7062
|
ModifierLookups: [this.EditingModifierLookup],
|
7044
|
-
ProjectLookups: [projectLookup],
|
7063
|
+
// ProjectLookups: [projectLookup],
|
7045
7064
|
};
|
7046
7065
|
let details = this.getDetails();
|
7047
7066
|
saveMdfrReq.Modifier.Details = JSON.stringify(details);
|
@@ -7050,6 +7069,7 @@ class DFSModifiersFormComponent {
|
|
7050
7069
|
});
|
7051
7070
|
}
|
7052
7071
|
else if (this.ModifierSelectFormGroup) {
|
7072
|
+
// console.log('here 2');
|
7053
7073
|
const saveMdfrReq = {
|
7054
7074
|
ModifierLookups: this.MultiSelectFormControl.value,
|
7055
7075
|
ProjectLookups: [projectLookup],
|
@@ -7265,7 +7285,7 @@ class DFSModifiersDialogComponent {
|
|
7265
7285
|
}
|
7266
7286
|
}
|
7267
7287
|
SaveDFSModifier() {
|
7268
|
-
// console.log(
|
7288
|
+
// console.log('level at save: ', this.data.level);
|
7269
7289
|
let status;
|
7270
7290
|
switch (this.data.level) {
|
7271
7291
|
case 'enterprise': {
|
@@ -7287,7 +7307,7 @@ class DFSModifiersDialogComponent {
|
|
7287
7307
|
this.DFSModifersFormControls.SaveModifierForApplication(this.data.applicationLookup);
|
7288
7308
|
}
|
7289
7309
|
}
|
7290
|
-
if (status
|
7310
|
+
if (status?.Code === 0) {
|
7291
7311
|
this.snackBar.open('DFS Modifier Saved Successfully', 'Dismiss', {
|
7292
7312
|
duration: 5000,
|
7293
7313
|
});
|
@@ -8169,7 +8189,7 @@ class TeamMemberCardComponent {
|
|
8169
8189
|
memberList.push(this.CurrentUser);
|
8170
8190
|
}
|
8171
8191
|
this.ProjectLookups.forEach((proj) => {
|
8172
|
-
this.Projects[proj]
|
8192
|
+
this.Projects[proj]?.RelyingParty?.AccessConfigurations?.fathym?.Usernames?.forEach((username) => {
|
8173
8193
|
if (!memberList.includes(username)) {
|
8174
8194
|
memberList.push(username);
|
8175
8195
|
// console.log("Added: ", username)
|
@@ -8499,10 +8519,10 @@ class ProjectCardComponent {
|
|
8499
8519
|
let tempProj = this.Projects[pLookup];
|
8500
8520
|
this.Project = tempProj;
|
8501
8521
|
let tempProjNode = {
|
8502
|
-
name: tempProj
|
8503
|
-
description: tempProj
|
8522
|
+
name: tempProj?.Project?.Name,
|
8523
|
+
description: tempProj?.Project?.Description,
|
8504
8524
|
lookup: pLookup,
|
8505
|
-
url: 'https://' + tempProj
|
8525
|
+
url: 'https://' + tempProj?.PrimaryHost,
|
8506
8526
|
routerLink: ['/project', pLookup],
|
8507
8527
|
};
|
8508
8528
|
let tempRoutes = this.ApplicationRoutes;
|