Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ describe('GeneralSettingsComponent', () => {
'updateSystemConfig',
'setIsSubmitting',
'setDefaultFormValues',
'setFormDisable',
'setFormEnable',
'getSystemConfig',
'viewModel$',
'systemStatus$',
Expand Down Expand Up @@ -140,19 +142,15 @@ describe('GeneralSettingsComponent', () => {

describe('#settingsDisable', () => {
it('should disable setting form when get settingDisable as true ', () => {
spyOn(component.settingForm, 'disable');

component.settingsDisable = true;

expect(component.settingForm.disable).toHaveBeenCalled();
expect(mockSettingsStore.setFormDisable).toHaveBeenCalled();
});

it('should enable setting form when get settingDisable as false ', () => {
spyOn(component.settingForm, 'enable');

component.settingsDisable = false;

expect(component.settingForm.enable).toHaveBeenCalled();
expect(mockSettingsStore.setFormEnable).toHaveBeenCalled();
});

it('should disable "Save" button when get settingDisable as true', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,12 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
.pipe(takeUntil(this.destroy$))
.subscribe(systemStatus => {
if (systemStatus?.status) {
this.settingsDisable = this.testRunService.testrunInProgress(
const isTestrunInProgress = this.testRunService.testrunInProgress(
systemStatus.status
);
if (isTestrunInProgress !== this.isSettingsDisable) {
this.settingsDisable = isTestrunInProgress;
}
}
});
}
Expand All @@ -187,11 +190,11 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
}

private disableSettings(): void {
this.settingForm?.disable();
this.settingsStore.setFormDisable(this.settingForm);
}

private enableSettings(): void {
this.settingForm?.enable();
this.settingsStore.setFormEnable(this.settingForm);
}

private createSettingForm() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,26 @@ export class GeneralSettingsStore extends ComponentStore<SettingsComponentState>
);
});

setFormDisable = this.effect((formGroup$: Observable<FormGroup>) => {
return formGroup$.pipe(
tap(formGroup => {
formGroup.disable();
})
);
});

setFormEnable = this.effect((formGroup$: Observable<FormGroup>) => {
return formGroup$.pipe(
withLatestFrom(this.systemConfig$),
tap(([formGroup, config]) => {
formGroup.enable();
if (config.single_intf) {
this.disableInternetInterface(formGroup);
}
})
);
});

setDefaultFormValues = this.effect((formGroup$: Observable<FormGroup>) => {
return formGroup$.pipe(
switchMap(formGroup =>
Expand Down
Loading