Skip to content

Commit 99bb449

Browse files
committed
refactor(frontend): compact UI parameter foundation
1 parent 8cad906 commit 99bb449

8 files changed

Lines changed: 203 additions & 737 deletions

‎frontend/src/app/workspace/component/ui-udf-parameters/ui-udf-parameters.component.html‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎frontend/src/app/workspace/component/ui-udf-parameters/ui-udf-parameters.component.scss‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎frontend/src/app/workspace/component/ui-udf-parameters/ui-udf-parameters.component.spec.ts‎

Lines changed: 15 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -16,54 +16,28 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
2019
import { FormControl } from "@angular/forms";
2120
import { FormlyFieldConfig } from "@ngx-formly/core";
2221
import { UiUdfParametersComponent } from "./ui-udf-parameters.component";
2322

2423
describe("UiUdfParametersComponent", () => {
25-
let component: UiUdfParametersComponent;
26-
27-
beforeEach(() => {
28-
component = new UiUdfParametersComponent();
29-
});
30-
31-
it("should disable name and type fields while leaving value editable", () => {
32-
const valueControl = new FormControl({ value: "42", disabled: true });
33-
const nameControl = new FormControl("threshold");
34-
const typeControl = new FormControl("double");
35-
36-
const valueField: FormlyFieldConfig = { key: "value", formControl: valueControl };
37-
const nameField: FormlyFieldConfig = { key: "attributeName", formControl: nameControl };
38-
const typeField: FormlyFieldConfig = { key: "attributeType", formControl: typeControl };
39-
const rowField: FormlyFieldConfig = {
40-
fieldGroup: [
41-
valueField,
42-
{
43-
key: "attribute",
44-
fieldGroup: [nameField, typeField],
45-
},
46-
],
24+
it("should lock inferred fields and keep value editable", () => {
25+
const component = new UiUdfParametersComponent();
26+
const value = field("value", new FormControl({ value: "42", disabled: true }));
27+
const name = field("attributeName", new FormControl("threshold"));
28+
const type = field("attributeType", new FormControl("double"));
29+
30+
(component as any).field = {
31+
fieldGroup: [{ fieldGroup: [value, { key: "attribute", fieldGroup: [name, type] }] }],
4732
};
48-
49-
(component as any).field = { fieldGroup: [rowField] } as FormlyFieldConfig;
50-
5133
component.ngOnInit();
5234

53-
expect(component.getValueField(rowField)).toBe(valueField);
54-
expect(component.getNameField(rowField)).toBe(nameField);
55-
expect(component.getTypeField(rowField)).toBe(typeField);
56-
57-
expect(valueField.props?.disabled).toBe(false);
58-
expect((valueField as any).templateOptions?.disabled).toBe(false);
59-
expect(valueControl.enabled).toBe(true);
60-
61-
expect(nameField.props?.disabled).toBe(true);
62-
expect((nameField as any).templateOptions?.disabled).toBe(true);
63-
expect(nameControl.disabled).toBe(true);
64-
65-
expect(typeField.props?.disabled).toBe(true);
66-
expect((typeField as any).templateOptions?.disabled).toBe(true);
67-
expect(typeControl.disabled).toBe(true);
35+
expect([value.props?.disabled, value.formControl?.enabled]).toEqual([false, true]);
36+
expect([name.props?.disabled, name.formControl?.disabled]).toEqual([true, true]);
37+
expect([type.props?.disabled, type.formControl?.disabled]).toEqual([true, true]);
6838
});
6939
});
40+
41+
function field(key: string, formControl: FormControl): FormlyFieldConfig {
42+
return { key, formControl };
43+
}

‎frontend/src/app/workspace/component/ui-udf-parameters/ui-udf-parameters.component.ts‎

Lines changed: 19 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -16,80 +16,40 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
import { NgFor } from "@angular/common";
1920
import { Component, OnInit } from "@angular/core";
20-
import { NgFor, NgIf } from "@angular/common";
2121
import { FieldArrayType, FormlyFieldConfig, FormlyModule } from "@ngx-formly/core";
2222

23+
const COLUMN_KEYS = ["value", "attributeName", "attributeType"] as const;
24+
2325
@Component({
2426
selector: "texera-ui-udf-parameters",
25-
templateUrl: "./ui-udf-parameters.component.html",
26-
styleUrls: ["./ui-udf-parameters.component.scss"],
27-
imports: [NgIf, NgFor, FormlyModule],
27+
template:
28+
'<div class="ui-udf-param-row" *ngFor="let rowField of field.fieldGroup"><formly-field *ngFor="let childField of displayFields(rowField)" [field]="childField"></formly-field></div>',
29+
styles: [
30+
".ui-udf-param-row{display:grid;grid-template-columns:minmax(160px,250px) minmax(160px,250px) minmax(120px,1fr);gap:12px}:host ::ng-deep .ant-form-item{margin-bottom:0}:host ::ng-deep .ant-form-item-label{display:none}",
31+
],
32+
imports: [NgFor, FormlyModule],
2833
})
2934
export class UiUdfParametersComponent extends FieldArrayType implements OnInit {
3035
ngOnInit(): void {
31-
this.field.fieldGroup?.forEach(rowField => {
32-
this.configureDisabledState(this.getAttributeChild(rowField, "attributeName"), true);
33-
this.configureDisabledState(this.getAttributeChild(rowField, "attributeType"), true);
34-
this.configureDisabledState(this.getField(rowField, "value"), false);
35-
});
36+
this.field.fieldGroup?.forEach(rowField =>
37+
COLUMN_KEYS.forEach(key => this.setDisabled(this.child(rowField, key), key !== "value"))
38+
);
3639
}
3740

38-
private getField(rowField: FormlyFieldConfig, key: string): FormlyFieldConfig | undefined {
39-
return rowField.fieldGroup?.find(f => f.key === key);
41+
displayFields(rowField: FormlyFieldConfig): FormlyFieldConfig[] {
42+
return COLUMN_KEYS.map(key => this.child(rowField, key)).filter((field): field is FormlyFieldConfig => !!field);
4043
}
4144

42-
private getAttributeChild(rowField: FormlyFieldConfig, childKey: string): FormlyFieldConfig | undefined {
43-
const attributeGroup = this.getField(rowField, "attribute");
44-
return attributeGroup?.fieldGroup?.find(f => f.key === childKey);
45+
private child(rowField: FormlyFieldConfig, key: string): FormlyFieldConfig | undefined {
46+
if (key === "value") return rowField.fieldGroup?.find(field => field.key === key);
47+
return rowField.fieldGroup?.find(field => field.key === "attribute")?.fieldGroup?.find(field => field.key === key);
4548
}
4649

47-
private configureDisabledState(field: FormlyFieldConfig | undefined, disabled: boolean): void {
50+
private setDisabled(field: FormlyFieldConfig | undefined, disabled: boolean): void {
4851
if (!field) return;
49-
5052
field.props = { ...(field.props ?? {}), disabled };
51-
52-
// (`as any` so we don't get nagged by the @deprecated JSDoc)
53-
(field as any).templateOptions = { ...((field as any).templateOptions ?? {}), disabled };
54-
55-
const prevOnInit = field.hooks?.onInit;
56-
field.hooks = {
57-
...(field.hooks ?? {}),
58-
onInit: f => {
59-
prevOnInit?.(f);
60-
this.applyDisabledState(f, disabled);
61-
},
62-
};
63-
64-
this.applyDisabledState(field, disabled);
65-
}
66-
67-
private applyDisabledState(field: FormlyFieldConfig, disabled: boolean): void {
68-
if (field.formControl) {
69-
if (disabled) {
70-
field.formControl.disable({ emitEvent: false });
71-
} else {
72-
field.formControl.enable({ emitEvent: false });
73-
}
74-
}
53+
field.formControl?.[disabled ? "disable" : "enable"]({ emitEvent: false });
7554
}
76-
77-
// Disable Name
78-
getNameField(rowField: FormlyFieldConfig): FormlyFieldConfig | undefined {
79-
return this.getAttributeChild(rowField, "attributeName");
80-
}
81-
82-
// Disable Type
83-
getTypeField(rowField: FormlyFieldConfig): FormlyFieldConfig | undefined {
84-
return this.getAttributeChild(rowField, "attributeType");
85-
}
86-
87-
// Value editable
88-
getValueField(rowField: FormlyFieldConfig): FormlyFieldConfig | undefined {
89-
return this.getField(rowField, "value");
90-
}
91-
92-
trackByParamName = (index: number, param: any): string | number => {
93-
return param?.attribute?.attributeName ?? index;
94-
};
9555
}

0 commit comments

Comments
 (0)