NAS-139471 / 25.10.3 / Smb share configuration cannot be edited after upgrade from Fangtooth (25.04.2.6) to Goldeye (25.10.2) when audit log is enabled

src/app/pages/sharing/smb/smb-form/smb-form.component.html

@@ -326,7 +326,7 @@
           mat-button
           type="button"
           ixTest="toggle-advanced-options"
-          (click)="this.isAdvancedMode = !this.isAdvancedMode"
+          (click)="toggleAdvancedMode()"
         >
           {{ isAdvancedMode ? ('Basic Options' | translate) : ('Advanced Options' | translate) }}
         </button>

src/app/pages/sharing/smb/smb-form/smb-form.component.spec.ts

@@ -197,8 +197,13 @@ describe('SmbFormComponent', () => {
     form = await loader.getHarness(IxFormHarness);
     api = spectator.inject(ApiService);
 
-    const advancedButton = await loader.getHarness(MatButtonHarness.with({ text: 'Advanced Options' }));
-    await advancedButton.click();
+    const advancedButton = await loader.getHarness(
+      MatButtonHarness.with({ selector: '[ixTest="toggle-advanced-options"]' }),
+    );
+    const advancedButtonText = await advancedButton.getText();
+    if (advancedButtonText.includes('Advanced Options')) {
+      await advancedButton.click();
+    }
   }
 
   const commonValues = {
@@ -563,6 +568,27 @@ describe('SmbFormComponent', () => {
     });
   });
 
+  describe('edit share with legacy audit logging', () => {
+    beforeEach(async () => {
+      await setupTest({
+        purpose: SmbSharePurpose.DefaultShare,
+        audit: {
+          enable: true,
+          watch_list: [],
+          ignore_list: [],
+        },
+      });
+    });
+
+    it('disables save when audit logging has no groups', async () => {
+      spectator.detectChanges();
+      await spectator.fixture.whenStable();
+
+      const saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
+      expect(await saveButton.isDisabled()).toBe(true);
+    });
+  });
+
   describe('edit FCP share', () => {
     it('shows aapl_name_mangling checkbox as checked and disabled for FCP share', async () => {
       await setupTest({

src/app/pages/sharing/smb/smb-form/smb-form.component.ts

@@ -202,6 +202,29 @@ export class SmbFormComponent implements OnInit, AfterViewInit {
     return this.isNewTimeMachineShare || this.isNewHomeShare || this.wasPathChanged || this.hasAddedAllowDenyHosts;
   }
 
+  private readonly basicControlNames = new Set([
+    'purpose',
+    'path',
+    'name',
+    'comment',
+    'enabled',
+    'remote_path',
+  ]);
+
+  private hasAdvancedErrorsInternal(): boolean {
+    return Object.entries(this.form.controls).some(([controlName, control]) => {
+      if (this.basicControlNames.has(controlName)) {
+        return false;
+      }
+
+      if (control.disabled) {
+        return false;
+      }
+
+      return control.invalid;
+    });
+  }
+
   private isFieldEnabledForPurpose(fieldName: string, purpose: SmbSharePurpose): boolean {
     return presetEnabledFields[purpose]?.includes(fieldName as never) ?? false;
   }
@@ -273,6 +296,47 @@ export class SmbFormComponent implements OnInit, AfterViewInit {
     };
   }
 
+  private setupAuditValidation(): void {
+    const auditGroup = this.form.controls.audit;
+    const enableControl = auditGroup.controls.enable;
+
+    enableControl.valueChanges.pipe(untilDestroyed(this))
+      .subscribe(() => {
+        this.updateAuditValidationState();
+      });
+
+    this.updateAuditValidationState();
+  }
+
+  private updateAuditValidationState(): void {
+    const auditGroup = this.form.controls.audit;
+    const watchList = auditGroup.controls.watch_list.value ?? [];
+    const ignoreList = auditGroup.controls.ignore_list.value ?? [];
+
+    auditGroup.updateValueAndValidity({ emitEvent: true });
+
+    if (auditGroup.controls.enable.value && watchList.length === 0 && ignoreList.length === 0) {
+      auditGroup.markAllAsTouched();
+    }
+  }
+
+  private openAdvancedOptionsIfInvalid(): void {
+    this.form.updateValueAndValidity({ emitEvent: false });
+
+    if (this.hasAdvancedErrorsInternal()) {
+      this.isAdvancedMode = true;
+      this.updateAuditValidationState();
+    }
+  }
+
+  protected toggleAdvancedMode(): void {
+    this.isAdvancedMode = !this.isAdvancedMode;
+
+    if (this.isAdvancedMode) {
+      this.updateAuditValidationState();
+    }
+  }
+
   protected form = this.formBuilder.group({
     // Common for all share purposes
     purpose: [SmbSharePurpose.DefaultShare as SmbSharePurpose | null],
@@ -381,12 +445,20 @@ export class SmbFormComponent implements OnInit, AfterViewInit {
     this.setupMangleWarning();
     this.setupPathControl();
     this.setupAclControl();
+    this.setupAuditValidation();
+    this.openAdvancedOptionsIfInvalid();
   }
 
   ngAfterViewInit(): void {
     this.form.controls.name.addAsyncValidators([
       this.smbValidationService.validate(this.existingSmbShare?.name),
     ]);
+
+    // Ensure audit validation errors are visible after view init (edit mode included).
+    this.updateAuditValidationState();
+    if (this.hasAdvancedErrorsInternal()) {
+      this.isAdvancedMode = true;
+    }
   }
 
   private setupAclControl(): void {
@@ -629,6 +701,14 @@ export class SmbFormComponent implements OnInit, AfterViewInit {
   }
 
   protected submit(): void {
+    if (this.form.invalid || this.isAsyncValidatorPending) {
+      this.form.markAllAsTouched();
+      if (this.hasAdvancedErrorsInternal()) {
+        this.isAdvancedMode = true;
+      }
+      return;
+    }
+
     const smbShare = { ...this.form.value } as SmbShare;
     const purpose = smbShare.purpose;
     const presetFields = presetEnabledFields[purpose] ?? [];