Revert "Made value not required property in Transformation Rule Node debug metadata"

This reverts commit 13a3605ced986a4bd9c8f562cee7b7407e6c8ec8.
This commit is contained in:
mpetrov 2024-11-08 14:19:24 +02:00
parent 9d033e6ecf
commit 2f73b16fa0
2 changed files with 19 additions and 7 deletions

View File

@ -25,7 +25,7 @@
placeholder="{{ (keyPlaceholderText ? keyPlaceholderText : 'key-val.key') | translate }}"/>
</mat-form-field>
<mat-form-field class="mat-block flex-1" subscriptSizing="{{ subscriptSizing }}">
<input [formControl]="keyValControl.get('value')" matInput
<input [formControl]="keyValControl.get('value')" matInput required
placeholder="{{ (valuePlaceholderText ? valuePlaceholderText : 'key-val.value') | translate }}"/>
</mat-form-field>
<button mat-icon-button color="primary"

View File

@ -20,12 +20,12 @@ import {
ControlValueAccessor,
UntypedFormArray,
UntypedFormBuilder,
UntypedFormControl,
UntypedFormGroup,
NG_VALIDATORS,
NG_VALUE_ACCESSOR,
Validator,
Validators,
ValidationErrors
Validators
} from '@angular/forms';
import { PageComponent } from '@shared/components/page.component';
import { Store } from '@ngrx/store';
@ -118,7 +118,7 @@ export class KeyValMapComponent extends PageComponent implements ControlValueAcc
if (Object.prototype.hasOwnProperty.call(keyValMap, property)) {
keyValsControls.push(this.fb.group({
key: [property, [Validators.required]],
value: [keyValMap[property]]
value: [keyValMap[property], [Validators.required]]
}));
}
}
@ -139,12 +139,24 @@ export class KeyValMapComponent extends PageComponent implements ControlValueAcc
const keyValsFormArray = this.kvListFormGroup.get('keyVals') as UntypedFormArray;
keyValsFormArray.push(this.fb.group({
key: ['', [Validators.required]],
value: ['']
value: ['', [Validators.required]]
}));
}
validate(): ValidationErrors | null {
return this.kvListFormGroup.valid ? null : { invalid: true };
public validate(c: UntypedFormControl) {
const kvList: {key: string; value: string}[] = this.kvListFormGroup.get('keyVals').value;
let valid = true;
for (const entry of kvList) {
if (!entry.key || !entry.value) {
valid = false;
break;
}
}
return (valid) ? null : {
keyVals: {
valid: false,
},
};
}
private updateModel() {