Merge pull request #4684 from activepieces/fix/sort-pieces-by-origina…

…l-order fix: sort inputs by original order intended by the action/trigger creator
activepieces · May 14, 2024 · 79bf734 · 79bf734
2 parents f77c4c8 + 1aa72b0
commit 79bf734
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/...ontrols/src/lib/components/new-piece-properties-form/piece-properties-form.component.html b/...ontrols/src/lib/components/new-piece-properties-form/piece-properties-form.component.html
@@ -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 (
@@ -179,6 +179,7 @@
         @case (PropertyType.MARKDOWN) {
           @if (property.value.description) {
             <ap-markdown
+            [fullWidth]="true"
               [data]="
                 property.value.description
                   | replaceMarkdownConsts

diff --git a/...-controls/src/lib/components/new-piece-properties-form/piece-properties-form.component.ts b/...-controls/src/lib/components/new-piece-properties-form/piece-properties-form.component.ts
@@ -59,7 +59,6 @@ export class PiecePropertiesFormComponent
     valid: boolean;
   }>();
   readonly PropertyType = PropertyType;
-  sortedPropertiesByRequired: PiecePropertyMap;
   emitNewChanges$?: Observable<unknown>;
   stepChanged$ = new BehaviorSubject('');
   constructor(private fb: UntypedFormBuilder) {
@@ -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,