Skip to content

Fixed save of gateway settings #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArtemDzhereleiko merged 2 commits into from
Jan 12, 2026
Merged

Fixed save of gateway settings #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6abf0c2
Fixed save of gateway settings
mtsymbarov-del Jan 5, 2026
c056ffe
Changed styles
mtsymbarov-del Jan 5, 2026
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
4 changes: 2 additions & 2 deletions ...teway-configuration/components/basic/storage/gateway-storage-configuration.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@
</div>
</section>
<section *ngSwitchCase="StorageTypes.SQLITE">
<div class="tb-form-row no-border no-padding tb-standard-fields column-xs mb-2">
<mat-form-field appearance="outline" class="flex">
<div class="tb-form-row no-border no-padding tb-standard-fields column-xs align-start mb-2">
<mat-form-field appearance="outline" class="flex" subscriptSizing="dynamic">
<mat-label translate>gateway.storage-path</mat-label>
<input matInput formControlName="data_file_path"/>
<mat-error *ngIf="storageFormGroup.get('data_file_path').hasError('required')">
Expand Down
139 changes: 65 additions & 74 deletions ...gateway-configuration/components/basic/storage/gateway-storage-configuration.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
FormGroup,
NG_VALIDATORS,
NG_VALUE_ACCESSOR,
ValidationErrors,
ValidationErrors, ValidatorFn,
Validators
} from '@angular/forms';
import { CommonModule } from '@angular/common';
Expand Down Expand Up @@ -67,6 +67,33 @@ export class GatewayStorageConfigurationComponent implements AfterViewInit, Vali

private onChange: (value: GatewayStorageConfig) => void = () => {};

private readonly numberValidators = [Validators.min(1), Validators.pattern(numberInputPattern)];
private readonly requiredNumberValidators = [Validators.required, ...this.numberValidators];
private readonly requiredDirValidators = [Validators.required, Validators.pattern(directoryRegex)];

private readonly storageConfig: Record<StorageTypes, Record<string, ValidatorFn[]>> = {
[StorageTypes.MEMORY]: {
read_records_count: this.requiredNumberValidators,
max_records_count: this.requiredNumberValidators
},
[StorageTypes.FILE]: {
data_folder_path: this.requiredDirValidators,
max_file_count: this.requiredNumberValidators,
max_read_records_count: this.requiredNumberValidators,
max_records_per_file: this.requiredNumberValidators
},
[StorageTypes.SQLITE]: {
data_file_path: this.requiredDirValidators,
messages_ttl_check_in_hours: this.requiredNumberValidators,
messages_ttl_in_days: this.requiredNumberValidators,
max_read_records_count: this.requiredNumberValidators,
size_limit: this.numberValidators,
max_db_amount: this.numberValidators,
oversize_check_period: this.numberValidators,
writing_batch_size: this.numberValidators
}
};

constructor(private fb: FormBuilder) {
this.storageFormGroup = this.initStorageFormGroup();
this.observeStorageTypeChanges();
Expand All @@ -76,17 +103,14 @@ export class GatewayStorageConfigurationComponent implements AfterViewInit, Vali
}

ngAfterViewInit(): void {
this.updateValidators(this.storageFormGroup.get('type').value);
this.initialized.emit({ storage: this.storageFormGroup.value });
}

writeValue(value: GatewayStorageConfig): void {
if (isDefinedAndNotNull(value)) {
const type = this.storageFormGroup.get('type').value;
this.storageFormGroup.patchValue(value, { emitEvent: false });
if (type !== value.type) {
this.removeAllStorageValidators();
this.storageValidators(value.type);
}
this.updateValidators(value.type);
}
}

Expand All @@ -102,84 +126,51 @@ export class GatewayStorageConfigurationComponent implements AfterViewInit, Vali
};
}

private removeAllStorageValidators(): void {
for (const storageKey in this.storageFormGroup.controls) {
if (storageKey !== 'type') {
this.storageFormGroup.controls[storageKey].clearValidators();
this.storageFormGroup.controls[storageKey].setErrors(null);
this.storageFormGroup.controls[storageKey].updateValueAndValidity();
}
}
}

private initStorageFormGroup(): FormGroup {
return this.fb.group({
type: [StorageTypes.MEMORY, [Validators.required]],
read_records_count: [100, [Validators.required, Validators.min(1), Validators.pattern(numberInputPattern)]],
max_records_count: [100000, [Validators.required, Validators.min(1), Validators.pattern(numberInputPattern)]],
data_folder_path: ['./data/', [Validators.required, Validators.pattern(directoryRegex)]],
max_file_count: [10, [Validators.min(1), Validators.pattern(numberInputPattern)]],
max_read_records_count: [10, [Validators.min(1), Validators.pattern(numberInputPattern)]],
max_records_per_file: [10000, [Validators.min(1), Validators.pattern(numberInputPattern)]],
data_file_path: ['./data/', [Validators.required, Validators.pattern(directoryRegex)]],
messages_ttl_check_in_hours: [1, [Validators.min(1), Validators.pattern(numberInputPattern)]],
messages_ttl_in_days: [7, [Validators.min(1), Validators.pattern(numberInputPattern)]],
size_limit: [1024, [Validators.min(1), Validators.pattern(numberInputPattern)]],
max_db_amount: [10, [Validators.min(1), Validators.pattern(numberInputPattern)]],
oversize_check_period: [1, [Validators.min(1), Validators.pattern(numberInputPattern)]],
writing_batch_size: [1000, [Validators.min(1), Validators.pattern(numberInputPattern)]]
read_records_count: [100],
max_records_count: [100000],
data_folder_path: ['./data/'],
max_file_count: [10],
max_read_records_count: [10],
max_records_per_file: [10000],
data_file_path: ['./data/'],
messages_ttl_check_in_hours: [1],
messages_ttl_in_days: [7],
size_limit: [1024],
max_db_amount: [10],
oversize_check_period: [1],
writing_batch_size: [1000]
});
}

private observeStorageTypeChanges(): void {
this.storageFormGroup.get('type').valueChanges.pipe(takeUntilDestroyed()).subscribe(type => {
this.removeAllStorageValidators();
this.storageValidators(type);
this.storageFormGroup.get('type').valueChanges.pipe(takeUntilDestroyed()).subscribe((type: StorageTypes) => {
this.updateValidators(type);
});
}

private storageValidators(type: StorageTypes) {
switch (type) {
case StorageTypes.MEMORY:
this.addMemoryStorageValidators(this.storageFormGroup);
break;
case StorageTypes.FILE:
this.addFileStorageValidators(this.storageFormGroup);
this.storageFormGroup.get('data_folder_path').addValidators([Validators.required, Validators.pattern(/.*\/$/)]);
this.storageFormGroup.get('data_folder_path').updateValueAndValidity({ emitEvent: false });
break;
case StorageTypes.SQLITE:
this.addSqliteStorageValidators(this.storageFormGroup);
this.storageFormGroup.get('data_file_path').addValidators([Validators.required, Validators.pattern(/.*\/$/)]);
this.storageFormGroup.get('data_file_path').updateValueAndValidity({ emitEvent: false });
break;
}
}

private addMemoryStorageValidators(group: FormGroup): void {
group.get('read_records_count').addValidators([Validators.required, Validators.min(1), Validators.pattern(numberInputPattern)]);
group.get('max_records_count').addValidators([Validators.required, Validators.min(1), Validators.pattern(numberInputPattern)]);
group.get('read_records_count').updateValueAndValidity({ emitEvent: false });
group.get('max_records_count').updateValueAndValidity({ emitEvent: false });
}

private addFileStorageValidators(group: FormGroup): void {
group.get('data_folder_path').addValidators([Validators.required, Validators.pattern(directoryRegex)]);
group.get('data_folder_path').updateValueAndValidity({ emitEvent: false });

['max_file_count', 'max_read_records_count', 'max_records_per_file'].forEach(field => {
group.get(field).addValidators([Validators.required, Validators.min(1), Validators.pattern(numberInputPattern)]);
group.get(field).updateValueAndValidity({ emitEvent: false });
});
}

private addSqliteStorageValidators(group: FormGroup): void {
group.get('data_file_path').addValidators([Validators.required, Validators.pattern(directoryRegex)]);
group.get('data_file_path').updateValueAndValidity({ emitEvent: false });

['messages_ttl_check_in_hours', 'messages_ttl_in_days', 'max_records_per_file'].forEach(field => {
group.get(field).addValidators([Validators.required, Validators.min(1), Validators.pattern(numberInputPattern)]);
group.get(field).updateValueAndValidity({ emitEvent: false });
private updateValidators(type: StorageTypes): void {
const activeConfig = this.storageConfig[type];

Object.keys(this.storageFormGroup.controls).forEach(key => {
if (key === 'type') return;

const control = this.storageFormGroup.get(key);
const activeValidators = activeConfig[key];

if (activeValidators) {
control.enable({ emitEvent: false });
control.setValidators(activeValidators);
control.updateValueAndValidity({ emitEvent: false });
control.markAsTouched({ emitEvent: false });
} else {
control.disable({ emitEvent: false });
control.clearValidators();
control.updateValueAndValidity({ emitEvent: false });
control.markAsUntouched({ emitEvent: false });
}
});
}
}