feat: hide CIRA in profile when disabled on the server

Author: nmgaston

src/app/profiles/profile-detail/profile-detail.component.html

@@ -320,6 +320,7 @@
               <mat-error>{{ 'profileDetail.connectionModeRequired.value' | translate }}</mat-error>
             </p>
           }
+          @if (ciraEnabled()) {
           <fieldset>
             <legend>{{ 'profileDetail.internetModeLegend.value' | translate }}</legend>
             <p>{{ 'profileDetail.internetModeDescription.value' | translate }}</p>
@@ -337,35 +338,23 @@
               </mat-radio-button>
             </p>
             @if (profileForm.get('connectionMode')?.value === 'CIRA') {
-              @if (ciraEnabled()) {
-                <mat-form-field class="flex flex-1">
-                  <mat-label>{{ 'profileDetail.ciraConfiguration.value' | translate }}</mat-label>
-                  <mat-select formControlName="ciraConfigName">
-                    @for (cc of ciraConfigurations(); track cc) {
-                      <mat-option [value]="cc.configName">{{ cc.configName }} </mat-option>
-                    }
-                  </mat-select>
-                  <mat-hint>
-                    @if (profileForm.get('ciraConfigName')?.value === null) {
-                      <span>{{ 'profileDetail.noConfigSelected.value' | translate }}</span>
-                    }
-                    {{ 'profileDetail.ciraConfigHint.value' | translate }}
-                  </mat-hint>
-                </mat-form-field>
-              } @else {
-                <!-- CIRA disabled on this server but the profile still references a CIRA config.
-                     Show it read-only with a warning and let the user switch to TLS/Direct. -->
-                <p class="error-messages-container">
-                  <mat-icon color="warn">warning</mat-icon>
-                  <span class="error-messages">{{ 'profileDetail.ciraDisabledWarning.value' | translate }}</span>
-                </p>
-                <mat-form-field class="flex flex-1">
-                  <mat-label>{{ 'profileDetail.ciraConfiguration.value' | translate }}</mat-label>
-                  <input matInput formControlName="ciraConfigName" readonly />
-                </mat-form-field>
-              }
+              <mat-form-field class="flex flex-1">
+                <mat-label>{{ 'profileDetail.ciraConfiguration.value' | translate }}</mat-label>
+                <mat-select formControlName="ciraConfigName">
+                  @for (cc of ciraConfigurations(); track cc) {
+                    <mat-option [value]="cc.configName">{{ cc.configName }} </mat-option>
+                  }
+                </mat-select>
+                <mat-hint>
+                  @if (profileForm.get('ciraConfigName')?.value === null) {
+                    <span>{{ 'profileDetail.noConfigSelected.value' | translate }}</span>
+                  }
+                  {{ 'profileDetail.ciraConfigHint.value' | translate }}
+                </mat-hint>
+              </mat-form-field>              
             }
           </fieldset>
+        }
           <fieldset>
             <legend>{{ 'profileDetail.directConnectLegend.value' | translate }}</legend>
             <p>

src/app/profiles/profile-detail/profile-detail.component.spec.ts

@@ -27,6 +27,7 @@ import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { provideTranslateHttpLoader, TRANSLATE_HTTP_LOADER_CONFIG } from '@ngx-translate/http-loader'
 
 describe('ProfileDetailComponent', () => {
+  const defaultCloudMode = environment.cloud
   let component: ProfileDetailComponent
   let fixture: ComponentFixture<ProfileDetailComponent>
   let profileSpy: jasmine.Spy
@@ -148,6 +149,7 @@ describe('ProfileDetailComponent', () => {
   })
 
   afterEach(() => {
+    environment.cloud = defaultCloudMode
     TestBed.resetTestingModule()
   })
 
@@ -166,6 +168,14 @@ describe('ProfileDetailComponent', () => {
     component.getAmtProfile('profile')
   }
 
+  const recreateComponent = (): void => {
+    fixture = TestBed.createComponent(ProfileDetailComponent)
+    component = fixture.componentInstance
+    translate = TestBed.inject(TranslateService)
+    translate.setFallbackLang('en')
+    fixture.detectChanges()
+  }
+
   it('should create', () => {
     expect(component).toBeTruthy()
     expect(ciraGetDataSpy).toHaveBeenCalled()
@@ -174,6 +184,49 @@ describe('ProfileDetailComponent', () => {
     expect(wirelessGetDataSpy).toHaveBeenCalled()
     expect(proxyGetDataSpy).toHaveBeenCalled()
   })
+
+  it('should hide CIRA option and skip CIRA config fetch when enterprise has CIRA disabled', () => {
+    environment.cloud = false
+    serverFeaturesGetFeaturesSpy.and.returnValue(of({ ciraEnabled: false }))
+    serverFeaturesGetFeaturesSpy.calls.reset()
+    ciraGetDataSpy.calls.reset()
+
+    recreateComponent()
+
+    expect(serverFeaturesGetFeaturesSpy).toHaveBeenCalled()
+    expect(ciraGetDataSpy).not.toHaveBeenCalled()
+    expect(component.ciraEnabled()).toBeFalse()
+    expect(fixture.nativeElement.querySelector('[data-cy="radio-cira"]')).toBeNull()
+  })
+
+  it('should show CIRA option and fetch CIRA configs when enterprise has CIRA enabled', () => {
+    environment.cloud = false
+    serverFeaturesGetFeaturesSpy.and.returnValue(of({ ciraEnabled: true }))
+    serverFeaturesGetFeaturesSpy.calls.reset()
+    ciraGetDataSpy.calls.reset()
+
+    recreateComponent()
+
+    expect(serverFeaturesGetFeaturesSpy).toHaveBeenCalled()
+    expect(ciraGetDataSpy).toHaveBeenCalled()
+    expect(component.ciraEnabled()).toBeTrue()
+    expect(fixture.nativeElement.querySelector('[data-cy="radio-cira"]')).not.toBeNull()
+  })
+
+  it('should fail open for enterprise CIRA features API errors', () => {
+    environment.cloud = false
+    serverFeaturesGetFeaturesSpy.and.returnValue(throwError(() => new Error('features call failed')))
+    serverFeaturesGetFeaturesSpy.calls.reset()
+    ciraGetDataSpy.calls.reset()
+
+    recreateComponent()
+
+    expect(serverFeaturesGetFeaturesSpy).toHaveBeenCalled()
+    expect(ciraGetDataSpy).toHaveBeenCalled()
+    expect(component.ciraEnabled()).toBeTrue()
+    expect(fixture.nativeElement.querySelector('[data-cy="radio-cira"]')).not.toBeNull()
+  })
+
   it('should set connectionMode to TLS when tlsMode is a TLS mode (1-4)', () => {
     const profile: Profile = { tlsMode: 4, ciraConfigName: 'config1' } as any
     component.setConnectionMode(profile)