@lowcodeunit/applications-flow-common 1.39.87-enterprise-switch-fix → 1.39.89-enterprise-switch-fix

Sign up to get free protection for your applications and to get access to all the features.
@@ -361,45 +361,51 @@ class ProjectService {
361
361
  EnsureUserEnterprise(state) {
362
362
  return new Promise((resolve, reject) => {
363
363
  state.Loading = true;
364
- this.appsFlowSvc.EnsureUserEnterprise().subscribe(async (response) => {
365
- if (response.Status.Code === 0) {
366
- // const eac = await this.LoadEnterpriseAsCode(state);
367
- resolve(response);
368
- }
369
- else {
364
+ this.appsFlowSvc.EnsureUserEnterprise().subscribe({
365
+ next: async (response) => {
366
+ if (response.Status.Code === 0) {
367
+ // const eac = await this.LoadEnterpriseAsCode(state);
368
+ resolve(response);
369
+ }
370
+ else {
371
+ state.Loading = false;
372
+ reject(response.Status);
373
+ // console.log(response);
374
+ }
375
+ },
376
+ error: (err) => {
370
377
  state.Loading = false;
371
- reject(response.Status);
372
- // console.log(response);
373
- }
374
- }, (err) => {
375
- state.Loading = false;
376
- reject(err);
377
- console.log(err);
378
+ reject(err);
379
+ console.log(err);
380
+ },
378
381
  });
379
382
  });
380
383
  }
381
384
  async EnterpriseAsCodeRemovals(state, eac) {
382
385
  return new Promise((resolve, reject) => {
383
386
  state.Loading = true;
384
- this.appsFlowSvc.EnterpriseAsCodeRemovals(eac).subscribe(async (response) => {
385
- if (response.Status.Code === 0) {
386
- resolve(response.Status);
387
- var results = await Promise.all([
388
- this.LoadEnterpriseAsCode(state),
389
- this.LoadUserFeed(1, 25, localStorage.getItem('activeFilter')
390
- ? localStorage.getItem('activeFilter')
391
- : '', false, state),
392
- ]);
393
- }
394
- else {
387
+ this.appsFlowSvc.EnterpriseAsCodeRemovals(eac).subscribe({
388
+ next: async (response) => {
389
+ if (response.Status.Code === 0) {
390
+ resolve(response.Status);
391
+ var results = await Promise.all([
392
+ this.LoadEnterpriseAsCode(state),
393
+ this.LoadUserFeed(1, 25, localStorage.getItem('activeFilter')
394
+ ? localStorage.getItem('activeFilter')
395
+ : '', false, state),
396
+ ]);
397
+ }
398
+ else {
399
+ state.Loading = false;
400
+ reject(response.Status);
401
+ // console.log(response);
402
+ }
403
+ },
404
+ error: (err) => {
395
405
  state.Loading = false;
396
- reject(response.Status);
397
- // console.log(response);
398
- }
399
- }, (err) => {
400
- state.Loading = false;
401
- reject(err);
402
- console.log(err);
406
+ reject(err);
407
+ console.log(err);
408
+ },
403
409
  });
404
410
  });
405
411
  }
@@ -450,106 +456,120 @@ class ProjectService {
450
456
  async GetActiveEnterprise(state) {
451
457
  return new Promise((resolve, reject) => {
452
458
  state.LoadingActiveEnterprise = true;
453
- this.appsFlowSvc.GetActiveEnterprise().subscribe(async (response) => {
454
- state.LoadingActiveEnterprise = false;
455
- if (response.Status.Code === 0) {
456
- state.ActiveEnterpriseLookup = response.Model?.Lookup;
457
- // console.log(
458
- // 'Active Ent set to = ',
459
- // response.Model?.Lookup
460
- // );
461
- resolve();
462
- }
463
- else {
464
- reject(response.Status);
465
- // console.log(response);
466
- }
467
- }, (err) => {
468
- state.LoadingActiveEnterprise = false;
469
- reject(err);
470
- console.log(err);
459
+ this.appsFlowSvc.GetActiveEnterprise().subscribe({
460
+ next: async (response) => {
461
+ state.LoadingActiveEnterprise = false;
462
+ if (response.Status.Code === 0) {
463
+ state.ActiveEnterpriseLookup = response.Model?.Lookup;
464
+ // console.log(
465
+ // 'Active Ent set to = ',
466
+ // response.Model?.Lookup
467
+ // );
468
+ resolve();
469
+ }
470
+ else {
471
+ reject(response.Status);
472
+ // console.log(response);
473
+ }
474
+ },
475
+ error: (err) => {
476
+ state.LoadingActiveEnterprise = false;
477
+ reject(err);
478
+ console.log(err);
479
+ },
471
480
  });
472
481
  });
473
482
  }
474
483
  HasValidConnection(state, forceEnsureUser = false) {
475
484
  return new Promise(async (resolve, reject) => {
476
485
  state.Loading = true;
477
- this.appsFlowSvc.HasValidConnection().subscribe(async (response) => {
478
- state.GitHub.HasConnection = response.Status.Code === 0;
479
- if (state.GitHub.HasConnection || forceEnsureUser) {
480
- }
481
- else {
482
- }
483
- resolve({});
484
- }, (err) => {
485
- state.Loading = false;
486
- reject(err);
487
- console.log(err);
486
+ this.appsFlowSvc.HasValidConnection().subscribe({
487
+ next: async (response) => {
488
+ state.GitHub.HasConnection = response.Status.Code === 0;
489
+ if (state.GitHub.HasConnection || forceEnsureUser) {
490
+ }
491
+ else {
492
+ }
493
+ resolve({});
494
+ },
495
+ error: (err) => {
496
+ state.Loading = false;
497
+ reject(err);
498
+ console.log(err);
499
+ },
488
500
  });
489
501
  });
490
502
  }
491
503
  async ListEnterprises(state) {
492
504
  return new Promise((resolve, reject) => {
493
505
  state.LoadingEnterprises = true;
494
- this.appsFlowSvc.ListEnterprises().subscribe(async (response) => {
495
- // console.log('list Enterprises resp: ', response);
496
- state.LoadingEnterprises = false;
497
- if (response.Status.Code === 0) {
498
- state.Enterprises = response.Model;
499
- resolve(response.Model);
500
- }
501
- else {
502
- reject(response.Status);
503
- // console.log(response);
504
- }
505
- }, (err) => {
506
- state.LoadingEnterprises = false;
507
- reject(err);
508
- console.log(err);
506
+ this.appsFlowSvc.ListEnterprises().subscribe({
507
+ next: async (response) => {
508
+ // console.log('list Enterprises resp: ', response);
509
+ state.LoadingEnterprises = false;
510
+ if (response.Status.Code === 0) {
511
+ state.Enterprises = response.Model;
512
+ resolve(response.Model);
513
+ }
514
+ else {
515
+ reject(response.Status);
516
+ // console.log(response);
517
+ }
518
+ },
519
+ error: (err) => {
520
+ state.LoadingEnterprises = false;
521
+ reject(err);
522
+ console.log(err);
523
+ },
509
524
  });
510
525
  });
511
526
  }
512
- LoadEnterpriseAsCode(state) {
527
+ async LoadEnterpriseAsCode(state) {
513
528
  return new Promise((resolve, reject) => {
514
- // console.log('Load ent called!!!');
515
- state.Loading = true;
516
- state.LoadingActiveEnterprise = true;
517
- this.appsFlowSvc.LoadEnterpriseAsCode().subscribe((response) => {
518
- state.Loading = false;
519
- state.LoadingActiveEnterprise = false;
520
- // console.log('Load eac response: ', response);
521
- if (response.Status.Code === 0) {
522
- state.EaC = response.Model || {};
523
- }
524
- else if (response.Status.Code === 3) {
525
- }
526
- state.EaC = state.EaC || {};
527
- // console.log('state.eac = ', state.EaC);
528
- this.CreatingProject =
529
- Object.keys(state?.EaC?.Projects || {}).length <= 0;
530
- resolve(state.EaC);
531
- this.activatedRoute.queryParams.subscribe((params) => {
532
- if (params?.direct == 'true') {
533
- let projKeys = Object.keys(state.EaC.Projects || {});
534
- if (projKeys.length == 1) {
535
- // console.log('Directing to deeper link');
536
- let appKeys = Object.keys(state.EaC.Applications || {});
537
- if (appKeys.length == 1) {
538
- let app = state.EaC.Applications[appKeys[0]];
539
- let routeKey = encodeURIComponent(app.LookupConfig.PathRegex?.replace('.*', '') || '/');
540
- window.location.href = `/dashboard/application/${appKeys[0]}/${routeKey}/${projKeys[0]}`;
541
- }
542
- else {
543
- window.location.href = `/dashboard/project/${projKeys[0]}`;
529
+ console.log('Load ent called!!!');
530
+ // state.Loading = true;
531
+ // state.LoadingActiveEnterprise = true;
532
+ this.appsFlowSvc.LoadEnterpriseAsCode().subscribe({
533
+ next: async (response) => {
534
+ console.log('State at Load ent: ', state);
535
+ state.Loading = false;
536
+ state.LoadingActiveEnterprise = false;
537
+ console.log('Load eac State after set Loading FALSE: ', state);
538
+ if (response.Status.Code === 0) {
539
+ state.EaC = response.Model || {};
540
+ }
541
+ else if (response.Status.Code === 3) {
542
+ }
543
+ state.EaC = state.EaC || {};
544
+ // console.log('state.eac = ', state.EaC);
545
+ this.CreatingProject =
546
+ Object.keys(state?.EaC?.Projects || {}).length <= 0;
547
+ resolve(state.EaC);
548
+ this.activatedRoute.queryParams.subscribe((params) => {
549
+ if (params?.direct == 'true') {
550
+ let projKeys = Object.keys(state.EaC.Projects || {});
551
+ if (projKeys.length == 1) {
552
+ // console.log('Directing to deeper link');
553
+ let appKeys = Object.keys(state.EaC.Applications || {});
554
+ if (appKeys.length == 1) {
555
+ let app = state.EaC.Applications[appKeys[0]];
556
+ let routeKey = encodeURIComponent(app.LookupConfig.PathRegex?.replace('.*', '') || '/');
557
+ window.location.href = `/dashboard/application/${appKeys[0]}/${routeKey}/${projKeys[0]}`;
558
+ }
559
+ else {
560
+ window.location.href = `/dashboard/project/${projKeys[0]}`;
561
+ }
544
562
  }
545
563
  }
546
- }
547
- });
548
- // console.log(state);
549
- }, (err) => {
550
- state.Loading = false;
551
- reject(err);
552
- console.log(err);
564
+ });
565
+ // console.log(state);
566
+ },
567
+ error: (err) => {
568
+ console.log('Load EAC ERROR Block');
569
+ state.Loading = false;
570
+ reject(err);
571
+ console.error(err);
572
+ },
553
573
  });
554
574
  });
555
575
  }
@@ -561,36 +581,39 @@ class ProjectService {
561
581
  let result = this.loadApplicationsForFeed(state, paramMap);
562
582
  this.appsFlowSvc
563
583
  .LoadUserFeed(page, pageSize, filterStr, result?.Project, result?.Applications)
564
- .subscribe(async (response) => {
565
- state.LoadingFeed = false;
566
- if (response.Status.Code === 0) {
567
- // console.log('user feed response: ', response);
568
- if (!forCheck) {
569
- state.Advertisements = response.Advertisements;
570
- state.Questions = response.Questions;
571
- state.FeedFilters = response.ItemTypes;
572
- state.Feed = response.Items;
573
- state.FeedSourceControlLookups =
574
- response.SourceControlLookups;
575
- state.FeedActions = response.Actions;
576
- state.FeedCheck = null;
584
+ .subscribe({
585
+ next: async (response) => {
586
+ state.LoadingFeed = false;
587
+ if (response.Status.Code === 0) {
588
+ // console.log('user feed response: ', response);
589
+ if (!forCheck) {
590
+ state.Advertisements = response.Advertisements;
591
+ state.Questions = response.Questions;
592
+ state.FeedFilters = response.ItemTypes;
593
+ state.Feed = response.Items;
594
+ state.FeedSourceControlLookups =
595
+ response.SourceControlLookups;
596
+ state.FeedActions = response.Actions;
597
+ state.FeedCheck = null;
598
+ }
599
+ else {
600
+ let items = response.Items?.filter((i) => !state.Feed?.find((f) => f.ID == i.ID));
601
+ if (items?.length > 0) {
602
+ state.FeedCheck = response;
603
+ }
604
+ }
605
+ // console.log("ITEMZ: ", response.Items)
606
+ resolve(response.Items);
577
607
  }
578
608
  else {
579
- let items = response.Items?.filter((i) => !state.Feed?.find((f) => f.ID == i.ID));
580
- if (items?.length > 0) {
581
- state.FeedCheck = response;
582
- }
609
+ reject(response.Status);
583
610
  }
584
- // console.log("ITEMZ: ", response.Items)
585
- resolve(response.Items);
586
- }
587
- else {
588
- reject(response.Status);
589
- }
590
- }, (err) => {
591
- state.LoadingFeed = false;
592
- reject(err);
593
- console.log(err);
611
+ },
612
+ error: (err) => {
613
+ state.LoadingFeed = false;
614
+ reject(err);
615
+ console.log(err);
616
+ },
594
617
  });
595
618
  });
596
619
  }
@@ -612,77 +635,99 @@ class ProjectService {
612
635
  state.LoadingActiveEnterprise = true;
613
636
  state.LoadingFeed = true;
614
637
  state.ActiveEnterpriseLookup = activeEntLookup;
615
- // state.LoadingFeed = true;
616
- this.appsFlowSvc.SetActiveEnterprise(activeEntLookup).subscribe(async (response) => {
617
- if (response.Status.Code === 0) {
618
- this.EditingProjectLookup = null;
619
- // console.log('state: ', state);
620
- // console.log(
621
- // 'project service active ent: ',
622
- // activeEntLookup
623
- // );
624
- // state.ActiveEnterpriseLookup = activeEntLookup;
625
- // console.log(
626
- // 'project service State active ent: ',
627
- // state.ActiveEnterpriseLookup
628
- // );
629
- resolve(response.Status);
630
- var results = await Promise.all([
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
- // ),
642
- ]);
643
- }
644
- else {
638
+ this.appsFlowSvc.SetActiveEnterprise(activeEntLookup).subscribe({
639
+ next: async (response) => {
640
+ if (response.Status.Code === 0) {
641
+ this.EditingProjectLookup = null;
642
+ // console.log('state: ', state);
643
+ // console.log(
644
+ // 'project service active ent: ',
645
+ // activeEntLookup
646
+ // );
647
+ // state.ActiveEnterpriseLookup = activeEntLookup;
648
+ // console.log(
649
+ // 'project service State active ent: ',
650
+ // state.ActiveEnterpriseLookup
651
+ // );
652
+ resolve(response.Status);
653
+ var results = await Promise.all([
654
+ // this.ListEnterprises(state),
655
+ // this.LoadEnterpriseAsCode(state),
656
+ // this.LoadUserFeed(
657
+ // 1,
658
+ // 25,
659
+ // localStorage.getItem('activeFilter')
660
+ // ? localStorage.getItem('activeFilter')
661
+ // : '',
662
+ // false,
663
+ // state
664
+ // ),
665
+ ]);
666
+ }
667
+ else {
668
+ state.Loading = false;
669
+ state.LoadingActiveEnterprise = false;
670
+ reject(response.Status);
671
+ // console.log(response);
672
+ }
673
+ },
674
+ error: (err) => {
645
675
  state.Loading = false;
646
676
  state.LoadingActiveEnterprise = false;
647
- reject(response.Status);
648
- // console.log(response);
649
- }
650
- }, (err) => {
651
- state.Loading = false;
652
- state.LoadingActiveEnterprise = false;
653
- reject(err);
654
- console.log(err);
677
+ reject(err);
678
+ console.log(err);
679
+ },
655
680
  });
656
681
  });
657
682
  }
658
683
  async SaveEnterpriseAsCode(state, eac) {
659
684
  return new Promise((resolve, reject) => {
685
+ console.log('save EAC called');
660
686
  state.Loading = true;
687
+ state.LoadingActiveEnterprise = true;
661
688
  // console.log('eac: ', eac);
662
- this.appsFlowSvc.SaveEnterpriseAsCode(eac).subscribe(async (response) => {
663
- if (response.Status.Code === 0) {
664
- resolve(response.Status);
665
- var results = await Promise.all([
666
- // this.EnsureUserEnterprise(state),
667
- this.LoadEnterpriseAsCode(state),
668
- this.ListEnterprises(state),
669
- // this.GetActiveEnterprise(state),
670
- this.LoadUserFeed(1, 25, localStorage.getItem('activeFilter')
671
- ? localStorage.getItem('activeFilter')
672
- : '', false, state),
673
- ]);
674
- // console.log('LOAD EAC RESULTS: ', results);
675
- }
676
- else {
689
+ let saveEntSub = this.appsFlowSvc
690
+ .SaveEnterpriseAsCode(eac)
691
+ .subscribe({
692
+ next: async (response) => {
693
+ if (response.Status.Code === 0) {
694
+ resolve(response.Status);
695
+ console.log('Save EAC Success');
696
+ var results = Promise.all([
697
+ // this.EnsureUserEnterprise(state),
698
+ this.LoadEnterpriseAsCode(state),
699
+ // this.ListEnterprises(state),
700
+ // this.GetActiveEnterprise(state),
701
+ // this.LoadUserFeed(
702
+ // 1,
703
+ // 25,
704
+ // localStorage.getItem('activeFilter')
705
+ // ? localStorage.getItem('activeFilter')
706
+ // : '',
707
+ // false,
708
+ // state
709
+ // ),
710
+ ]);
711
+ // var results = this.LoadEnterpriseAsCode(state);
712
+ console.log('LOAD EAC RESULTS: ', results);
713
+ state.Loading = false;
714
+ state.LoadingActiveEnterprise = false;
715
+ console.log('State from save eac: ', state);
716
+ }
717
+ else {
718
+ state.Loading = false;
719
+ reject(response.Status);
720
+ // console.log(response);
721
+ }
722
+ },
723
+ error: (err) => {
677
724
  state.Loading = false;
678
- reject(response.Status);
679
- // console.log(response);
680
- }
681
- }, (err) => {
682
- state.Loading = false;
683
- reject(err);
684
- console.log(err);
725
+ reject(err);
726
+ console.log(err);
727
+ },
685
728
  });
729
+ console.log('SAVE ENT SUB: ', saveEntSub);
730
+ // saveEntSub.unsubscribe();
686
731
  });
687
732
  }
688
733
  SetCreatingProject(creatingProject) {
@@ -712,26 +757,29 @@ class ProjectService {
712
757
  async SubmitFeedEntry(state, entry) {
713
758
  return new Promise((resolve, reject) => {
714
759
  state.Loading = true;
715
- this.appsFlowSvc.SubmitFeedEntry(entry).subscribe(async (response) => {
716
- if (response.Status.Code === 0 ||
717
- response.Status.Code === 1) {
718
- resolve(response.Status);
719
- var results = await Promise.all([
720
- this.LoadEnterpriseAsCode(state),
721
- this.LoadUserFeed(1, 25, localStorage.getItem('activeFilter')
722
- ? localStorage.getItem('activeFilter')
723
- : '', false, state),
724
- ]);
725
- }
726
- else {
760
+ this.appsFlowSvc.SubmitFeedEntry(entry).subscribe({
761
+ next: async (response) => {
762
+ if (response.Status.Code === 0 ||
763
+ response.Status.Code === 1) {
764
+ resolve(response.Status);
765
+ var results = await Promise.all([
766
+ this.LoadEnterpriseAsCode(state),
767
+ this.LoadUserFeed(1, 25, localStorage.getItem('activeFilter')
768
+ ? localStorage.getItem('activeFilter')
769
+ : '', false, state),
770
+ ]);
771
+ }
772
+ else {
773
+ state.Loading = false;
774
+ reject(response.Status);
775
+ // console.log(response);
776
+ }
777
+ },
778
+ error: (err) => {
727
779
  state.Loading = false;
728
- reject(response.Status);
729
- // console.log(response);
730
- }
731
- }, (err) => {
732
- state.Loading = false;
733
- reject(err);
734
- console.log(err);
780
+ reject(err);
781
+ console.log(err);
782
+ },
735
783
  });
736
784
  });
737
785
  }
@@ -741,25 +789,28 @@ class ProjectService {
741
789
  UnpackLowCodeUnit(state, req) {
742
790
  return new Promise((resolve, reject) => {
743
791
  state.Loading = true;
744
- this.appsFlowSvc.UnpackLowCodeUnit(req).subscribe(async (response) => {
745
- if (response.Status.Code === 0) {
746
- resolve(response.Status);
747
- var results = await Promise.all([
748
- this.LoadEnterpriseAsCode(state),
749
- this.LoadUserFeed(1, 25, localStorage.getItem('activeFilter')
750
- ? localStorage.getItem('activeFilter')
751
- : '', false, state),
752
- ]);
753
- }
754
- else {
792
+ this.appsFlowSvc.UnpackLowCodeUnit(req).subscribe({
793
+ next: async (response) => {
794
+ if (response.Status.Code === 0) {
795
+ resolve(response.Status);
796
+ var results = await Promise.all([
797
+ this.LoadEnterpriseAsCode(state),
798
+ this.LoadUserFeed(1, 25, localStorage.getItem('activeFilter')
799
+ ? localStorage.getItem('activeFilter')
800
+ : '', false, state),
801
+ ]);
802
+ }
803
+ else {
804
+ state.Loading = false;
805
+ reject(response.Status);
806
+ // console.log(response);
807
+ }
808
+ },
809
+ error: (err) => {
755
810
  state.Loading = false;
756
- reject(response.Status);
757
- // console.log(response);
758
- }
759
- }, (err) => {
760
- state.Loading = false;
761
- reject(err);
762
- console.log(err);
811
+ reject(err);
812
+ console.log(err);
813
+ },
763
814
  });
764
815
  });
765
816
  }
@@ -1018,6 +1069,9 @@ class EaCService {
1018
1069
  return status;
1019
1070
  }
1020
1071
  }
1072
+ // this.appsFlowEventsSvc.EnsureUserEnterpriseEvent.subscribe(async () => {
1073
+ // await this.projectService.EnsureUserEnterprise(this.State);
1074
+ // });
1021
1075
  async EnsureUserEnterprise() {
1022
1076
  const state = this.stateSubject.getValue();
1023
1077
  const status = await this.projectService.EnsureUserEnterprise(state);
@@ -1085,6 +1139,7 @@ class EaCService {
1085
1139
  return state;
1086
1140
  }
1087
1141
  async SaveApplicationAsCode(req) {
1142
+ console.log('Calling Save App as Code: ', req);
1088
1143
  return await this.handleSaveApplication(req);
1089
1144
  }
1090
1145
  async SaveDFSModifier(req) {
@@ -1137,6 +1192,7 @@ class EaCService {
1137
1192
  // Helpers
1138
1193
  async handleSaveApplication(req) {
1139
1194
  const state = this.stateSubject.getValue();
1195
+ console.log('calling handle Save App: ', state);
1140
1196
  const saveEaC = {
1141
1197
  EnterpriseLookup: state.EaC.EnterpriseLookup,
1142
1198
  Applications: {},
@@ -1153,7 +1209,11 @@ class EaCService {
1153
1209
  if (req.Application) {
1154
1210
  saveEaC.Applications[req.ApplicationLookup] = req.Application;
1155
1211
  }
1212
+ //await
1213
+ // const status = await Promise.all([
1156
1214
  const status = await this.projectService.SaveEnterpriseAsCode(state, saveEaC);
1215
+ // ]);
1216
+ console.log('State after save app: ', state);
1157
1217
  this.stateSubject.next(state);
1158
1218
  return status;
1159
1219
  }
@@ -1177,11 +1237,12 @@ class EaCService {
1177
1237
  }
1178
1238
  if (req.ApplicationLookup) {
1179
1239
  // console.log('APPLOokup: ', req.ApplicationLookup);
1240
+ // console.log('saveEAC: ', saveEaC);
1180
1241
  saveEaC.Applications[req.ApplicationLookup] = {
1181
1242
  ModifierLookups: req.ModifierLookups,
1182
1243
  };
1183
1244
  }
1184
- console.log('Save mod eac: ', saveEaC);
1245
+ // console.log('Save mod eac: ', saveEaC);
1185
1246
  const status = await this.projectService.SaveEnterpriseAsCode(state, saveEaC);
1186
1247
  this.stateSubject.next(state);
1187
1248
  return status;