Skip to content

fix: Only show country dropdown without autocomplete #5652

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 25 commits into from
Nov 20, 2020
Merged

fix: Only show country dropdown without autocomplete #5652

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8bc8dd9
Show Payment countries only
Nov 15, 2020
3fd3e20
Merge branch 'development' into only-countries-5438
Nov 15, 2020
30fa5eb
autoComplete-off
Nov 17, 2020
c00e2dc
Merge branch 'development' into only-countries-5438
Nov 17, 2020
80f4e08
Revert Changes
Nov 17, 2020
fb31c0a
Removed Autocomplete
Nov 17, 2020
6bcbe8d
Merge branch 'development' into only-countries-5438
Nov 17, 2020
2e1db2e
Fixed Bug
Nov 17, 2020
3b0145f
only-countries
Nov 18, 2020
0c82dd4
Merge branch 'development' into only-countries-5438
Nov 18, 2020
68114a6
Merge branch 'development' into only-countries-5438
Nov 18, 2020
78bfcf1
Added country-dropdown comp
Nov 18, 2020
33d55e0
Field required
Nov 18, 2020
3a60beb
Merge branch 'development' into only-countries-5438
Nov 18, 2020
70b332c
code-cleanup
Nov 18, 2020
7245faa
Merge branch 'development' into only-countries-5438
Nov 19, 2020
4bcd9e8
Improved code
Nov 19, 2020
7f735e7
Update country-dropdown.ts
Nov 19, 2020
bb6f3aa
Improved code-1
Nov 19, 2020
f45bce3
Code cleanup
Nov 19, 2020
0007745
Improved code-2
Nov 19, 2020
f688a9c
Merge branch 'development' into only-countries-5438
Nov 19, 2020
002f4dd
Added id
Nov 20, 2020
6f25411
Merge branch 'only-countries-5438' of https://github.com/daretobediff…
Nov 20, 2020
20cdc1a
f
iamareebjamal Nov 20, 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
14 changes: 14 additions & 0 deletions app/components/country-dropdown.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import Component from '@glimmer/component';
import { orderBy, filter } from 'lodash-es';
import { paymentCountries } from 'open-event-frontend/utils/dictionary/payment';
import { countries } from 'open-event-frontend/utils/dictionary/demography';

export default class CountryDropdown extends Component {
get countries() { // eslint-disable-line @typescript-eslint/explicit-module-boundary-types
return orderBy(countries, 'name');
}

get paymentCountries() { // eslint-disable-line @typescript-eslint/explicit-module-boundary-types
return orderBy(filter(countries, country => paymentCountries.includes(country.code)), 'name');
}
}
23 changes: 23 additions & 0 deletions app/templates/components/country-dropdown.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<form class="field">
<label class={{if @required 'required'}}>{{t @placeholder}}</label>
<UiDropdown
@class="search selection"
@selected={{@val}}
@forceSelection={{false}}
@fullTextSearch={{true}}>
<Input
@type="hidden"
@autocomplete="no"
@value={{@val}} />
<i class="dropdown icon"></i>
<div class="default text">{{t 'Select country'}}</div>
<div class="menu">
{{#each (if @paymentCountries this.paymentCountries this.countries) as |country|}}
<div class="item" data-value="{{country.name}}">
<i class="{{lowercase country.code}} flag"></i>
{{country.name}}
</div>
{{/each}}
</div>
</UiDropdown>
</form>
20 changes: 4 additions & 16 deletions app/templates/components/forms/admin/settings/billing.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,10 @@
<label class="required" for="adminBillingPaypalEmail">{{t 'Paypal Email'}}</label>
<Input @type="email" @id="adminBillingPaypalEmail" @value={{this.model.adminBillingPaypalEmail}} />
</div>
<div class="field">
<label class="required">{{t 'Country'}}</label>
<UiDropdown @class="search selection" @selected={{this.model.adminBillingCountry}} @forceSelection={{false}} @fullTextSearch={{true}}>
<Input @type="hidden" @autocomplete="no" @id="adminBillingCountry" @value={{this.model.adminBillingCountry}} />
<i class="dropdown icon"></i>
<div class="default text">{{t 'Select country'}}</div>
<div class="menu">
{{#each this.countries as |country|}}
<div class="item" data-value="{{country.name}}">
<i class="{{lowercase country.code}} flag"></i>
{{country.name}}
</div>
{{/each}}
</div>
</UiDropdown>
</div>
<CountryDropdown
@required={{true}}
@placeholder={{'Country'}}
@val={{this.model.adminBillingCountry}} />
<div class="field">
<label for="adminBillingTaxInfo">{{t 'Tax ID'}}</label>
<Input @type="text" @id="adminBillingTaxInfo" @value={{this.model.adminBillingTaxInfo}} />
Expand Down
26 changes: 5 additions & 21 deletions app/templates/components/forms/admin/settings/ticket-fees-form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,27 +52,11 @@
{{#each this.ticketFees as |ticketFee|}}
<div class="ui five column very relaxed grid">
<div class="ui field three wide column">
<label class="required">{{t 'Select country'}}</label>
<UiDropdown
@class="search selection"
@selected={{ticketFee.country}}
@forceSelection={{false}}
@fullTextSearch={{true}}>
<Input
@type="hidden"
@autocomplete="no"
@value={{ticketFee.country}} />
<i class="dropdown icon"></i>
<div class="default text">{{t 'Select country'}}</div>
<div class="menu">
{{#each this.paymentCountries as |paymentCountry|}}
<div class="item" data-value="{{paymentCountry.name}}">
<i class="{{lowercase paymentCountry.code}} flag"></i>
{{paymentCountry.name}}
</div>
{{/each}}
</div>
</UiDropdown>
<CountryDropdown
@required={{true}}
@paymentCountries={{true}}
@placeholder={{'Select country'}}
@val={{ticketFee.country}} />
</div>
<div class="ui field four wide column">
<label class="required">{{t 'Select currency'}}</label>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/forms/orders/order-form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</div>
{{#each this.allFields.attendee as |field|}}
{{#if field.isIncluded}}
<div class="field">
<form class="field">
<label class="{{if field.isRequired 'required'}}" for="name">{{field.name}}</label>
{{#if (is-input-field field.type) }}
{{#if field.isLongText}}
Expand Down Expand Up @@ -140,7 +140,7 @@
</div>
</UiDropdown>
{{/if}}
</div>
</form>
{{/if}}
{{/each}}
{{/each}}
Expand Down
8 changes: 4 additions & 4 deletions app/templates/components/forms/session-speaker-form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
{{#if this.addNewSpeaker}}
{{#each this.allFields.speaker as |field|}}
{{#if field.isIncluded}}
<div class="field">
<form class="field">
<label class="{{if field.isRequired 'required'}}" for="name">{{field.name}}</label>
{{#if (is-input-field field.type) }}
{{#if field.isLongText}}
Expand Down Expand Up @@ -242,7 +242,7 @@
</UiDropdown>
{{/if}}
{{/if}}
</div>
</form>
{{/if}}
{{/each}}
{{/if}}
Expand All @@ -256,7 +256,7 @@
{{/if}}
{{#each this.allFields.speaker as |field|}}
{{#if field.isIncluded}}
<div class="field">
<form class="field">
<label class="{{if field.isRequired 'required'}}" for="name">{{field.name}}</label>
{{#if (is-input-field field.type) }}
{{#if field.isLongText}}
Expand Down Expand Up @@ -364,7 +364,7 @@
</UiDropdown>
{{/if}}
{{/if}}
</div>
</form>
{{/if}}
{{/each}}
{{/if}}
Expand Down
28 changes: 4 additions & 24 deletions app/templates/components/forms/user-payment-info-form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,30 +54,10 @@
@id="state"
@value={{this.userBillingInfo.billingState}} />
</div>
<div class="field">
<label >{{t 'Country'}}</label>
<UiDropdown
@class="search selection"
@selected={{this.userBillingInfo.billingCountry}}
@forceSelection={{false}}
@fullTextSearch={{true}}>
<Input
@type="hidden"
@autocomplete="no"
@id="country"
@value={{this.userBillingInfo.billingCountry}} />
<i class="dropdown icon"></i>
<div class="default text">{{t 'Select country'}}</div>
<div class="menu">
{{#each this.countries as |country|}}
<div class="item" data-value="{{country.name}}">
<i class="{{lowercase country.code}} flag"></i>
{{country.name}}
</div>
{{/each}}
</div>
</UiDropdown>
</div>
<CountryDropdown
@placeholder={{'Country'}}
@val={{this.userBillingInfo.billingCountry}}
@id={{'country'}} />
<div class="field">
<label for="taxID">{{t 'Tax ID or Business ID'}}</label>
<Input
Expand Down
29 changes: 5 additions & 24 deletions app/templates/components/forms/wizard/basic-details-step.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,30 +315,11 @@
<div class="field">
<h4>{{t 'Add Payment Details'}}</h4>
<div class="two fields">
<div class="field">
<label class="required">{{t 'Select country'}}</label>
<UiDropdown
@class="search selection"
@selected={{this.data.event.paymentCountry}}
@forceSelection={{false}}
@fullTextSearch={{true}}>
<Input
@type="hidden"
@autocomplete="no"
@id="payment_country"
@value={{this.data.event.paymentCountry}} />
<i class="dropdown icon"></i>
<div class="default text">{{t 'Select country'}}</div>
<div class="menu">
{{#each this.paymentCountries as |paymentCountry|}}
<div class="item" data-value="{{paymentCountry.name}}">
<i class="{{lowercase paymentCountry.code}} flag"></i>
{{paymentCountry.name}}
</div>
{{/each}}
</div>
</UiDropdown>
</div>
<CountryDropdown
@required={{true}}
@paymentCountries={{true}}
@placeholder={{'Select country'}}
@val={{this.data.event.paymentCountry}} />
<div class="field">
<label class="required">{{t 'Select currency'}}</label>
<UiDropdown
Expand Down
20 changes: 4 additions & 16 deletions app/templates/components/modals/tax-info-modal.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,10 @@
</div>
<div class="y-scrollable scrollable-modal content">
<form class="ui form" autocomplete="off" {{action 'updateTaxInfo' on='submit' preventDefault=true}}>
<div class="field">
<label class="required">{{t 'Choose country'}}</label>
<UiDropdown @class="search selection" @selected={{this.tax.country}} @forceSelection={{false}} @fullTextSearch={{true}}>
<Input @type="hidden" @autocomplete="tax-country" @id="tax_country" @value={{this.tax.country}} />
<i class="dropdown icon"></i>
<div class="default text">{{t 'Select country'}}</div>
<div class="menu">
{{#each this.countries as |country|}}
<div class="item" data-value="{{country.name}}">
<i class="{{lowercase country.code}} flag"></i>
{{country.name}}
</div>
{{/each}}
</div>
</UiDropdown>
</div>
<CountryDropdown
@required={{true}}
@placeholder={{'Choose country'}}
@val={{this.tax.country}} />
<div class="field">
<label class="required">{{t 'Tax name'}}</label>
<Input @type="text" @id="tax_name" @value={{this.tax.name}} />
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/widgets/forms/billing-info.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
@id="zip_code"
@value={{this.data.zipcode}} />
</div>
<div class="field">
<form class="field">
<label class="required">{{t 'Select country'}}</label>
<UiDropdown
@class="search selection"
Expand All @@ -61,4 +61,4 @@
{{/each}}
</div>
</UiDropdown>
</div>
</form>