fix-8985: [Badge wizard] Fields section always expands when clicking saving. (#9001)

Author: Hieu Lam - TMA

app/components/forms/wizard/badge-field-form.js

@@ -91,10 +91,10 @@ export default Component.extend(FormMixin, {
 
   actions: {
     toggleSetting() {
-      if (!this.isExpanded) {
-        this.set('isExpanded', true);
+      if (!this.data.is_field_expanded) {
+        this.set('data.is_field_expanded', true);
       } else {
-        this.set('isExpanded', false);
+        this.set('data.is_field_expanded', false);
       }
     },
     removeForm() {

app/components/forms/wizard/badge-step.js

@@ -100,24 +100,25 @@ export default Component.extend(FormMixin, EventWizardMixin, {
           form.badgeFields.forEach(field => {
             if (!field.is_deleted) {
               badgeFields.pushObject(this.store.createRecord('badge-field-form', {
-                badge_field_id   : field.id,
-                badge_id         : field.badge_id,
-                field_identifier : field.field_identifier,
-                custom_field     : field.custom_field,
-                sample_text      : field.sample_text,
-                font_size        : field.font_size,
-                font_name        : field.font_name,
-                font_color       : field.font_color,
-                text_rotation    : field.text_rotation,
-                margin_top       : field.margin_top,
-                margin_bottom    : field.margin_bottom,
-                margin_left      : field.margin_left,
-                margin_right     : field.margin_right,
-                font_weight      : field.font_weight,
-                text_alignment   : field.text_alignment,
-                text_type        : field.text_type,
-                is_deleted       : field.is_deleted,
-                qr_custom_field  : field.qr_custom_field
+                badge_field_id    : field.id,
+                badge_id          : field.badge_id,
+                field_identifier  : field.field_identifier,
+                custom_field      : field.custom_field,
+                sample_text       : field.sample_text,
+                font_size         : field.font_size,
+                font_name         : field.font_name,
+                font_color        : field.font_color,
+                text_rotation     : field.text_rotation,
+                margin_top        : field.margin_top,
+                margin_bottom     : field.margin_bottom,
+                margin_left       : field.margin_left,
+                margin_right      : field.margin_right,
+                font_weight       : field.font_weight,
+                text_alignment    : field.text_alignment,
+                text_type         : field.text_type,
+                is_deleted        : field.is_deleted,
+                qr_custom_field   : field.qr_custom_field,
+                is_field_expanded : field.is_field_expanded
               }));
               field = null;
             }

app/models/badge-field-form.js

@@ -11,24 +11,25 @@ export default ModelBase.extend({
   /**
    * Attributes
    */
-  badge_field_id   : attr('number'),
-  badge_id         : attr('string'),
-  field_identifier : attr('string'),
-  custom_field     : attr('string'),
-  sample_text      : attr('string'),
-  font_size        : attr('number'),
-  font_name        : attr('string'),
-  font_color       : attr('string'),
-  text_rotation    : attr('number'),
-  margin_top       : attr('number'),
-  margin_bottom    : attr('number'),
-  margin_left      : attr('number'),
-  margin_right     : attr('number'),
-  font_weight      : attr('number'),
-  text_alignment   : attr('string', { defaultValue: 'center' }),
-  text_type        : attr('string'),
-  is_deleted       : attr('boolean'),
-  qr_custom_field  : attr(),
+  badge_field_id    : attr('number'),
+  badge_id          : attr('string'),
+  field_identifier  : attr('string'),
+  custom_field      : attr('string'),
+  sample_text       : attr('string'),
+  font_size         : attr('number'),
+  font_name         : attr('string'),
+  font_color        : attr('string'),
+  text_rotation     : attr('number'),
+  margin_top        : attr('number'),
+  margin_bottom     : attr('number'),
+  margin_left       : attr('number'),
+  margin_right      : attr('number'),
+  font_weight       : attr('number'),
+  text_alignment    : attr('string', { defaultValue: 'center' }),
+  text_type         : attr('string'),
+  is_deleted        : attr('boolean'),
+  qr_custom_field   : attr(),
+  is_field_expanded : attr('boolean', { defaultValue: true }),
   /**
    * Relationships
    */

app/templates/components/forms/wizard/badge-field-form.hbs

@@ -14,7 +14,7 @@
     </h3>
     <div class="btn-row">
       <button type="button" class="ui compact icon button right floated" {{action 'toggleSetting' }}>
-      {{#if this.isExpanded}}
+      {{#if @data.is_field_expanded }}
         <i class="angle up icon" />
       {{else}}
         <i class="angle down icon" />
@@ -26,7 +26,7 @@
     </div>
   </div>
 
-  {{#if this.isExpanded}}
+  {{#if @data.is_field_expanded }}
   <div class="badge-form-body-field">
     <h3 class="background-color-title padding-left-1rem margin-left-revert-1rem">
       {{t 'Setting'}}