@lowcodeunit/applications-flow-common 1.39.88-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.
Files changed (7) hide show
  1. package/esm2020/lib/services/eac.service.mjs +5 -5
  2. package/esm2020/lib/services/project.service.mjs +203 -180
  3. package/fesm2015/lowcodeunit-applications-flow-common.mjs +204 -181
  4. package/fesm2015/lowcodeunit-applications-flow-common.mjs.map +1 -1
  5. package/fesm2020/lowcodeunit-applications-flow-common.mjs +206 -183
  6. package/fesm2020/lowcodeunit-applications-flow-common.mjs.map +1 -1
  7. package/package.json +1 -1
package/fesm2020/lowcodeunit-applications-flow-common.mjs CHANGED
@@ -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,41 +456,47 @@ 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
  }
@@ -517,9 +529,8 @@ class ProjectService {
517
529
  console.log('Load ent called!!!');
518
530
  // state.Loading = true;
519
531
  // state.LoadingActiveEnterprise = true;
520
- // BaseModeledResponse<EnterpriseAsCode>
521
532
  this.appsFlowSvc.LoadEnterpriseAsCode().subscribe({
522
- next: (response) => {
533
+ next: async (response) => {
523
534
  console.log('State at Load ent: ', state);
524
535
  state.Loading = false;
525
536
  state.LoadingActiveEnterprise = false;
@@ -570,36 +581,39 @@ class ProjectService {
570
581
  let result = this.loadApplicationsForFeed(state, paramMap);
571
582
  this.appsFlowSvc
572
583
  .LoadUserFeed(page, pageSize, filterStr, result?.Project, result?.Applications)
573
- .subscribe(async (response) => {
574
- state.LoadingFeed = false;
575
- if (response.Status.Code === 0) {
576
- // console.log('user feed response: ', response);
577
- if (!forCheck) {
578
- state.Advertisements = response.Advertisements;
579
- state.Questions = response.Questions;
580
- state.FeedFilters = response.ItemTypes;
581
- state.Feed = response.Items;
582
- state.FeedSourceControlLookups =
583
- response.SourceControlLookups;
584
- state.FeedActions = response.Actions;
585
- 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);
586
607
  }
587
608
  else {
588
- let items = response.Items?.filter((i) => !state.Feed?.find((f) => f.ID == i.ID));
589
- if (items?.length > 0) {
590
- state.FeedCheck = response;
591
- }
609
+ reject(response.Status);
592
610
  }
593
- // console.log("ITEMZ: ", response.Items)
594
- resolve(response.Items);
595
- }
596
- else {
597
- reject(response.Status);
598
- }
599
- }, (err) => {
600
- state.LoadingFeed = false;
601
- reject(err);
602
- console.log(err);
611
+ },
612
+ error: (err) => {
613
+ state.LoadingFeed = false;
614
+ reject(err);
615
+ console.log(err);
616
+ },
603
617
  });
604
618
  });
605
619
  }
@@ -621,45 +635,48 @@ class ProjectService {
621
635
  state.LoadingActiveEnterprise = true;
622
636
  state.LoadingFeed = true;
623
637
  state.ActiveEnterpriseLookup = activeEntLookup;
624
- this.appsFlowSvc.SetActiveEnterprise(activeEntLookup).subscribe(async (response) => {
625
- if (response.Status.Code === 0) {
626
- this.EditingProjectLookup = null;
627
- // console.log('state: ', state);
628
- // console.log(
629
- // 'project service active ent: ',
630
- // activeEntLookup
631
- // );
632
- // state.ActiveEnterpriseLookup = activeEntLookup;
633
- // console.log(
634
- // 'project service State active ent: ',
635
- // state.ActiveEnterpriseLookup
636
- // );
637
- resolve(response.Status);
638
- var results = await Promise.all([
639
- // this.ListEnterprises(state),
640
- // this.LoadEnterpriseAsCode(state),
641
- // this.LoadUserFeed(
642
- // 1,
643
- // 25,
644
- // localStorage.getItem('activeFilter')
645
- // ? localStorage.getItem('activeFilter')
646
- // : '',
647
- // false,
648
- // state
649
- // ),
650
- ]);
651
- }
652
- 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) => {
653
675
  state.Loading = false;
654
676
  state.LoadingActiveEnterprise = false;
655
- reject(response.Status);
656
- // console.log(response);
657
- }
658
- }, (err) => {
659
- state.Loading = false;
660
- state.LoadingActiveEnterprise = false;
661
- reject(err);
662
- console.log(err);
677
+ reject(err);
678
+ console.log(err);
679
+ },
663
680
  });
664
681
  });
665
682
  }
@@ -676,22 +693,22 @@ class ProjectService {
676
693
  if (response.Status.Code === 0) {
677
694
  resolve(response.Status);
678
695
  console.log('Save EAC Success');
679
- // var results = Promise.all([
680
- // this.EnsureUserEnterprise(state),
681
- // this.LoadEnterpriseAsCode(state),
682
- // this.ListEnterprises(state),
683
- // this.GetActiveEnterprise(state),
684
- // this.LoadUserFeed(
685
- // 1,
686
- // 25,
687
- // localStorage.getItem('activeFilter')
688
- // ? localStorage.getItem('activeFilter')
689
- // : '',
690
- // false,
691
- // state
692
- // ),
693
- // ]);
694
- var results = this.LoadEnterpriseAsCode(state);
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);
695
712
  console.log('LOAD EAC RESULTS: ', results);
696
713
  state.Loading = false;
697
714
  state.LoadingActiveEnterprise = false;
@@ -740,26 +757,29 @@ class ProjectService {
740
757
  async SubmitFeedEntry(state, entry) {
741
758
  return new Promise((resolve, reject) => {
742
759
  state.Loading = true;
743
- this.appsFlowSvc.SubmitFeedEntry(entry).subscribe(async (response) => {
744
- if (response.Status.Code === 0 ||
745
- response.Status.Code === 1) {
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 {
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) => {
755
779
  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);
780
+ reject(err);
781
+ console.log(err);
782
+ },
763
783
  });
764
784
  });
765
785
  }
@@ -769,25 +789,28 @@ class ProjectService {
769
789
  UnpackLowCodeUnit(state, req) {
770
790
  return new Promise((resolve, reject) => {
771
791
  state.Loading = true;
772
- this.appsFlowSvc.UnpackLowCodeUnit(req).subscribe(async (response) => {
773
- if (response.Status.Code === 0) {
774
- resolve(response.Status);
775
- var results = await Promise.all([
776
- this.LoadEnterpriseAsCode(state),
777
- this.LoadUserFeed(1, 25, localStorage.getItem('activeFilter')
778
- ? localStorage.getItem('activeFilter')
779
- : '', false, state),
780
- ]);
781
- }
782
- 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) => {
783
810
  state.Loading = false;
784
- reject(response.Status);
785
- // console.log(response);
786
- }
787
- }, (err) => {
788
- state.Loading = false;
789
- reject(err);
790
- console.log(err);
811
+ reject(err);
812
+ console.log(err);
813
+ },
791
814
  });
792
815
  });
793
816
  }
@@ -1187,12 +1210,12 @@ class EaCService {
1187
1210
  saveEaC.Applications[req.ApplicationLookup] = req.Application;
1188
1211
  }
1189
1212
  //await
1190
- const status = await Promise.all([
1191
- this.projectService.SaveEnterpriseAsCode(state, saveEaC),
1192
- ]);
1213
+ // const status = await Promise.all([
1214
+ const status = await this.projectService.SaveEnterpriseAsCode(state, saveEaC);
1215
+ // ]);
1193
1216
  console.log('State after save app: ', state);
1194
1217
  this.stateSubject.next(state);
1195
- return status[0];
1218
+ return status;
1196
1219
  }
1197
1220
  async handleSaveDFSModifier(req) {
1198
1221
  const state = this.stateSubject.getValue();