fix: issue with keeping RPE state between tabs in cloud

Author: nmgaston

src/app/devices/devices.service.spec.ts

@@ -587,7 +587,14 @@ describe('DevicesService', () => {
 
       const req = httpMock.expectOne(`${mockEnvironment.mpsServer}/api/v1/amt/features/device1`)
       expect(req.request.method).toBe('POST')
-      expect(req.request.body).toEqual(payload)
+      expect(req.request.body).toEqual({
+        userConsent: 'none',
+        enableKVM: true,
+        enableSOL: true,
+        enableIDER: true,
+        ocr: true,
+        platformEraseEnabled: true
+      })
       req.flush(mockResponse)
     })
 
@@ -652,6 +659,56 @@ describe('DevicesService', () => {
       expect((latest as any).status).toBeUndefined()
     })
 
+    it('keeps the cached rpe value when a stale GET response arrives after a save', () => {
+      const seeded: AMTFeaturesResponse = {
+        userConsent: 'none',
+        optInState: 0,
+        redirection: true,
+        kvmAvailable: true,
+        KVM: true,
+        SOL: false,
+        IDER: false,
+        ocr: false,
+        httpsBootSupported: true,
+        winREBootSupported: true,
+        localPBABootSupported: true,
+        rpe: true,
+        rpeSupported: true,
+        pbaBootFilesPath: [],
+        winREBootFilesPath: { instanceID: '', biosBootString: '', bootString: '' }
+      }
+      const emitted: AMTFeaturesResponse[] = []
+      service.featuresChanges('device1').subscribe((v) => {
+        if (v) emitted.push(v)
+      })
+      service.getAMTFeatures('device1').subscribe()
+      httpMock.expectOne(`${mockEnvironment.mpsServer}/api/v1/amt/features/device1`).flush(seeded)
+
+      service
+        .setAmtFeatures('device1', {
+          userConsent: 'all',
+          enableKVM: true,
+          enableSOL: true,
+          enableIDER: true,
+          ocr: true,
+          rpe: false
+        })
+        .subscribe()
+      httpMock.expectOne(`${mockEnvironment.mpsServer}/api/v1/amt/features/device1`).flush({ status: 'SUCCESS' } as any)
+
+      let latestGet: AMTFeaturesResponse | undefined
+      service.getAMTFeatures('device1').subscribe((r) => {
+        latestGet = r
+      })
+      httpMock.expectOne(`${mockEnvironment.mpsServer}/api/v1/amt/features/device1`).flush({
+        ...seeded,
+        rpe: true
+      })
+
+      expect(emitted[emitted.length - 1].rpe).toBe(false)
+      expect(latestGet?.rpe).toBe(false)
+    })
+
     it('derives redirection from the chosen features rather than keeping the stale cached value', () => {
       const seeded: AMTFeaturesResponse = {
         userConsent: 'none',

src/app/devices/devices.service.ts

@@ -283,7 +283,14 @@ export class DevicesService {
 
   getAMTFeatures(guid: string): Observable<AMTFeaturesResponse> {
     return this.http.get<AMTFeaturesResponse>(`${environment.mpsServer}/api/v1/amt/features/${guid}`).pipe(
-      tap((features) => this.getOrCreateFeaturesStream(guid).next(this.applyRpeOverride(guid, features))),
+      map((features) => {
+        const stream = this.getOrCreateFeaturesStream(guid)
+        const current = stream.value
+        const merged = current === null ? features : { ...features, rpe: current.rpe }
+        const nextFeatures = this.applyRpeOverride(guid, merged)
+        stream.next(nextFeatures)
+        return nextFeatures
+      }),
       catchError((err) => {
         throw err
       })
@@ -466,8 +473,16 @@ export class DevicesService {
     if (payload.rpe) {
       this.rpeDisabledAfterErase.delete(deviceId)
     }
+    const requestBody = {
+      userConsent: payload.userConsent,
+      enableKVM: payload.enableKVM,
+      enableSOL: payload.enableSOL,
+      enableIDER: payload.enableIDER,
+      ocr: payload.ocr,
+      platformEraseEnabled: payload.rpe
+    }
     return this.http
-      .post<AMTFeaturesResponse>(`${environment.mpsServer}/api/v1/amt/features/${deviceId}`, payload)
+      .post<AMTFeaturesResponse>(`${environment.mpsServer}/api/v1/amt/features/${deviceId}`, requestBody)
       .pipe(
         tap(() => this.applyFeaturesSelection(deviceId, payload)),
         catchError((err) => {

src/app/devices/general/general.component.html

@@ -164,7 +164,7 @@
           [matTooltip]="'general.remotePlatformEraseNotSupported.value' | translate"
           [matTooltipDisabled]="!amtEnabledFeatures.get('rpe')?.disabled"
           matTooltipPosition="after">
-          <mat-checkbox formControlName="rpe" (change)="setAmtFeatures()"></mat-checkbox>
+          <mat-checkbox formControlName="rpe" (change)="setAmtFeatures({ rpe: $event.checked })"></mat-checkbox>
         </div>
         <div class="flex flex-50 items-end">
           <p>{{ 'general.ideRedirection.value' | translate }}</p>

src/app/devices/general/general.component.ts

@@ -189,12 +189,14 @@ export class GeneralComponent implements OnInit, OnDestroy {
     return !!(enableKVM || enableSOL || enableIDER)
   }
 
-  setAmtFeatures(): void {
+  setAmtFeatures(override: Partial<AMTFeaturesRequest> = {}): void {
     this.isLoading.set(true)
+    const payload = {
+      ...this.amtEnabledFeatures.getRawValue(),
+      ...override
+    } as AMTFeaturesRequest
     this.devicesService
-      .setAmtFeatures(this.deviceId(), {
-        ...this.amtEnabledFeatures.getRawValue()
-      } as AMTFeaturesRequest)
+      .setAmtFeatures(this.deviceId(), payload)
       .pipe(
         finalize(() => {
           this.isLoading.set(false)