Skip to content

fix: Attendee form questions order in order-form #5880

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

Merged
merged 5 commits into from
Dec 11, 2020
Merged

fix: Attendee form questions order in order-form #5880

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
014f6d7
maintaining order of order-form by using order By
maze-runnar Dec 3, 2020
bbc0410
f
maze-runnar Dec 3, 2020
064a41e
-
maze-runnar Dec 3, 2020
bee5c68
logic++
maze-runnar Dec 3, 2020
1aea926
f
maze-runnar Dec 3, 2020
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
5 changes: 4 additions & 1 deletion app/components/forms/orders/order-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,10 @@ export default Component.extend(FormMixin, {
},

allFields: computed('fields', function() {
return groupBy(this.fields.toArray(), field => field.get('form'));
const requiredFixed = this.fields.toArray().slice(0, 3);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no guarantee that only first three fields are fixed fields, the logic is flawed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is for firstName, lastName and email. They are always at top?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But they'll not always be 3

const customFields = orderBy(this.fields.toArray().slice(3), ['isComplex', 'name'], ['asc', 'asc']);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by default all values are sorted in ascending order

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no they are not in a way in attendee form.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean orderBy funtion by default I think sort all values in ascending order so no need to pass ['asc', 'asc']

const finalFields = requiredFixed.concat(customFields);
return groupBy(finalFields, field => field.get('form'));
}),

genders : orderBy(genders, 'name'),
Expand Down
2 changes: 1 addition & 1 deletion app/models/social-link.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default ModelBase.extend({
}),

buttonColor: computed('normalizedName', function() {
return buttonColor[this.normalizedName] ;
return buttonColor[this.normalizedName];
})

});