allow all zones for beta testers (#1188)

* allow all zones for beta testers * apply feature flagging in zones in NUA key creation
nuclia · Dec 12, 2023 · f53d3d7 · f53d3d7
1 parent 99d11c9
commit f53d3d7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/apps/dashboard/src/app/account/account-nua/client-dialog/client-dialog.component.ts b/apps/dashboard/src/app/account/account-nua/client-dialog/client-dialog.component.ts
@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { filter, map, take, tap } from 'rxjs';
 import { NUAClient } from '@nuclia/core';
-import { SDKService, UserService } from '@flaps/core';
+import { SDKService, UserService, Zone, ZoneService } from '@flaps/core';
 import { AccountNUAService } from '../account-nua.service';
 import { ModalRef } from '@guillotinaweb/pastanaga-angular';
 
@@ -53,23 +53,23 @@ export class ClientDialogComponent implements OnInit {
     },
   };
 
-  zones: { id: string; title: string }[] = [];
+  zones: Zone[] = [];
 
   constructor(
     public modal: ModalRef,
     private userService: UserService,
     private nua: AccountNUAService,
     private sdkService: SDKService,
     private cdr: ChangeDetectorRef,
+    private zoneService: ZoneService,
   ) {
     this.editMode = !!this.modal.config.data?.['client'];
   }
 
   ngOnInit() {
-    this.sdkService.nuclia.rest
+    this.zoneService
       .getZones()
       .pipe(
-        map((zoneMap) => Object.entries(zoneMap).map(([key, title]) => ({ id: key, title }))),
         tap((zones) => {
           this.zones = zones;
           this.cdr.detectChanges();

diff --git a/libs/core/src/lib/api/zone.service.ts b/libs/core/src/lib/api/zone.service.ts
@@ -17,16 +17,21 @@ export class ZoneService {
   ) {}
 
   getZones(includeZonesBlocked = false): Observable<Zone[]> {
+    const isRegionalSystemBetaTester = localStorage.getItem('NUCLIA_NEW_REGIONAL_ENDPOINTS') === 'true';
     return this.sdk.nuclia.rest.get<Zone[]>(`/${ZONES}`).pipe(
       switchMap((zones) =>
         this.featureFlagService.getFeatureBlocklist('zones').pipe(
           map((blocklist) => {
-            return includeZonesBlocked
-              ? zones.map((zone) => ({
-                  ...zone,
-                  notAvailableYet: blocklist.includes(zone.slug),
-                }))
-              : zones.filter((zone) => !blocklist.includes(zone.slug));
+            if (isRegionalSystemBetaTester) {
+              return zones;
+            } else {
+              return includeZonesBlocked
+                ? zones.map((zone) => ({
+                    ...zone,
+                    notAvailableYet: blocklist.includes(zone.slug),
+                  }))
+                : zones.filter((zone) => !blocklist.includes(zone.slug));
+            }
           }),
         ),
       ),