Skip to content
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

Jump to bottom

fix: sort inputs by original order intended by the action/trigger creator #4684

Merged
merged 2 commits into from
May 14, 2024
Merged

fix: sort inputs by original order intended by the action/trigger creator #4684

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
f6e7714
chore: view inputs by their original order
AbdulTheActivePiecer May 13, 2024
1aa72b0
chore: give markdown full width in pieces form
AbdulTheActivePiecer May 13, 2024
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
3 changes: 2 additions & 1 deletion ...ontrols/src/lib/components/new-piece-properties-form/piece-properties-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<form [formGroup]="form" class="ap-flex ap-flex-col">
@for (
property of sortedPropertiesByRequired | objectToArray;
property of propertiesMap | objectToArray;
track property.key
) {
@if (
Expand Down Expand Up @@ -179,6 +179,7 @@
@case (PropertyType.MARKDOWN) {
@if (property.value.description) {
<ap-markdown
[fullWidth]="true"
[data]="
property.value.description
| replaceMarkdownConsts
Expand Down
18 changes: 0 additions & 18 deletions ...-controls/src/lib/components/new-piece-properties-form/piece-properties-form.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ export class PiecePropertiesFormComponent
valid: boolean;
}>();
readonly PropertyType = PropertyType;
sortedPropertiesByRequired: PiecePropertyMap;
emitNewChanges$?: Observable<unknown>;
stepChanged$ = new BehaviorSubject('');
constructor(private fb: UntypedFormBuilder) {
Expand All @@ -85,26 +84,9 @@ export class PiecePropertiesFormComponent
}

private initializeForm() {
this.sortPropertiesByRequired();
this.buildForm();
}

private sortPropertiesByRequired() {
const requiredProperties: PiecePropertyMap = {};
const optionalProperties: PiecePropertyMap = {};
Object.entries(this.propertiesMap).forEach(([key, value]) => {
if (value.required || value.type === PropertyType.MARKDOWN) {
requiredProperties[key] = value;
} else {
optionalProperties[key] = value;
}
});
this.sortedPropertiesByRequired = {
...requiredProperties,
...optionalProperties,
};
}

private buildForm() {
createFormControlsWithTheirValidators(
this.fb,
Expand Down
Loading