Skip to content

Commit

Permalink
chore: Move computed to tracked properties
Browse files Browse the repository at this point in the history
  • Loading branch information
iamareebjamal committed Apr 5, 2020
1 parent 17fe4c9 commit b81bdea
Show file tree
Hide file tree
Showing 32 changed files with 39 additions and 65 deletions.
3 changes: 2 additions & 1 deletion app/components/create-session-message.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { tracked } from '@glimmer/tracking';
import classic from 'ember-classic-decorator';
import { computed } from '@ember/object';
import Component from '@ember/component';

@classic
export default class CreateSessionMessage extends Component {
isMessageVisible = true;
@tracked isMessageVisible = true;

@computed(
'session.isAuthenticated',
Expand Down
3 changes: 2 additions & 1 deletion app/components/events/view/overview/manage-roles.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { tracked } from '@glimmer/tracking';
import classic from 'ember-classic-decorator';
import { classNames } from '@ember-decorators/component';
import { action, computed } from '@ember/object';
Expand All @@ -6,7 +7,7 @@ import Component from '@ember/component';
@classic
@classNames('ui', 'fluid', 'card')
export default class ManageRoles extends Component {
roleType = 'accepted';
@tracked roleType = 'accepted';

@computed('data.roleInvites.@each', 'roleType')
get roleInvites() {
Expand Down
4 changes: 2 additions & 2 deletions app/components/explore/side-bar.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { tracked } from '@glimmer/tracking';
import classic from 'ember-classic-decorator';
import Component from '@ember/component';
import moment from 'moment';
Expand All @@ -13,7 +14,7 @@ export default class SideBar extends Component {
customStartDate = moment().toISOString();

customEndDate = null;
showFilters = false;
@tracked showFilters = false;
isMapVisible = true;

@computed('category', 'sub_category', 'event_type', 'startDate', 'endDate', 'location', 'ticket_type', 'cfs')
Expand All @@ -28,7 +29,6 @@ export default class SideBar extends Component {

showAllTypes = not('event_type');

@computed()
get dateRanges() {
return getDateRanges.bind(this)();
}
Expand Down
3 changes: 1 addition & 2 deletions app/components/forms/user-payment-info-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Component from '@ember/component';
import FormMixin from 'open-event-frontend/mixins/form';
import { validPhoneNumber } from 'open-event-frontend/utils/validators';
import { pick, orderBy } from 'lodash-es';
import { action, computed } from '@ember/object';
import { action } from '@ember/object';
import { countries } from 'open-event-frontend/utils/dictionary/demography';

@classic
Expand Down Expand Up @@ -92,7 +92,6 @@ export default class UserPaymentInfoForm extends Component.extend(FormMixin) {
};
}

@computed()
get countries() {
return orderBy(countries, 'name');
}
Expand Down
5 changes: 2 additions & 3 deletions app/components/modals/event-delete-modal.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { tracked } from '@glimmer/tracking';
import classic from 'ember-classic-decorator';
import { computed } from '@ember/object';
import ModalBase from 'open-event-frontend/components/modals/modal-base';

@classic
export default class EventDeleteModal extends ModalBase {
isSmall = true;
confirmName = '';
@tracked confirmName = '';

@computed('confirmName')
get isNameDifferent() {
return this.eventName ? this.confirmName !== this.eventName : true;
}
Expand Down
3 changes: 2 additions & 1 deletion app/components/modals/event-transfer-modal.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { tracked } from '@glimmer/tracking';
import classic from 'ember-classic-decorator';
import { computed } from '@ember/object';
import ModalBase from 'open-event-frontend/components/modals/modal-base';

@classic
export default class EventTransferModal extends ModalBase {
isSmall = true;
confirmEventName = '';
@tracked confirmEventName = '';

@computed('confirmEventName', 'eventName')
get isNameDifferent() {
Expand Down
5 changes: 2 additions & 3 deletions app/components/modals/user-delete-modal.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { tracked } from '@glimmer/tracking';
import classic from 'ember-classic-decorator';
import { computed } from '@ember/object';
import ModalBase from 'open-event-frontend/components/modals/modal-base';

@classic
export default class UserDeleteModal extends ModalBase {
isSmall = true;
confirmEmail = '';
@tracked confirmEmail = '';

@computed('confirmEmail')
get isEmailDifferent() {
return this.userEmail ? this.confirmEmail !== this.userEmail : true;
}
Expand Down
8 changes: 3 additions & 5 deletions app/components/tabbed-navigation.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { tracked } from '@glimmer/tracking';
import classic from 'ember-classic-decorator';
import { classNames } from '@ember-decorators/component';
import { action, computed } from '@ember/object';
Expand All @@ -7,14 +8,11 @@ import Component from '@ember/component';
@classic
@classNames('tabbed-navigation')
export default class TabbedNavigation extends Component {
item = null;
@tracked item = null;

@computed('session.currentRouteName', 'item')
get currentRoute() {
const path = this.session.currentRouteName;
if (path) {
return this.item;
}
return this.session.currentRouteName && this.item;
}

didInsertElement() {
Expand Down
3 changes: 2 additions & 1 deletion app/components/unverified-user-message.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { tracked } from '@glimmer/tracking';
import classic from 'ember-classic-decorator';
import { action, computed } from '@ember/object';
import Component from '@ember/component';

@classic
export default class UnverifiedUserMessage extends Component {
isMessageVisible = true;
@tracked isMessageVisible = true;
isMailSent = false;

@computed(
Expand Down
3 changes: 2 additions & 1 deletion app/components/widgets/forms/image-upload.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { tracked } from '@glimmer/tracking';
import classic from 'ember-classic-decorator';
import { action, computed } from '@ember/object';
import $ from 'jquery';
Expand All @@ -7,7 +8,7 @@ import { v4 } from 'ember-uuid';

@classic
export default class ImageUpload extends Component {
selectedImage = null;
@tracked selectedImage = null;
allowDragDrop = true;
requiresDivider = false;

Expand Down
7 changes: 3 additions & 4 deletions app/components/widgets/forms/radio-button.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { tracked } from '@glimmer/tracking';
import classic from 'ember-classic-decorator';
import { attributeBindings, tagName } from '@ember-decorators/component';
import { observes } from '@ember-decorators/object';
import { computed } from '@ember/object';
import $ from 'jquery';
import Component from '@ember/component';
import { once } from '@ember/runloop';
Expand All @@ -11,10 +11,9 @@ import { once } from '@ember/runloop';
@attributeBindings('type', 'htmlChecked:checked', 'value', 'name', 'disabled')
export default class RadioButton extends Component {
type = 'radio';
value = null;
checked = null;
@tracked value = null;
@tracked checked = null;

@computed('value', 'checked')
get htmlChecked() {
return this.value === this.checked;
}
Expand Down
5 changes: 3 additions & 2 deletions app/components/widgets/steps-indicator.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { tracked } from '@glimmer/tracking';
import classic from 'ember-classic-decorator';
import { observes } from '@ember-decorators/object';
import Component from '@ember/component';
Expand All @@ -6,9 +7,9 @@ import { map, findIndex } from 'lodash-es';

@classic
export default class StepsIndicator extends Component {
enableAll = true;
@tracked enableAll = true;
autoSteps = false;
currentStep = 1;
@tracked currentStep = 1;

@computed('currentStep')
get currentIndex() {
Expand Down
2 changes: 0 additions & 2 deletions app/controllers/account/billing/invoices/list.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import Controller from '@ember/controller';
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
import { computed } from '@ember/object';

export default class extends Controller.extend(EmberTableControllerMixin) {
@computed()
get columns() {
let columns = [];
if (this.model.params.invoice_status === 'upcoming') {
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/admin/events/list.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Controller from '@ember/controller';
import { computed, action } from '@ember/object';
import { action } from '@ember/object';
import { or } from '@ember/object/computed';
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';

Expand All @@ -8,7 +8,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) {

@or('authManager.currentUser.isSuperAdmin', 'authManager.currentUser.isAdmin') hasRestorePrivileges;

@computed()
get columns() {
return [
{
Expand Down
2 changes: 0 additions & 2 deletions app/controllers/admin/messages/list.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Controller from '@ember/controller';
import { computed } from '@ember/object';
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';

export default class extends Controller.extend(EmberTableControllerMixin) {
Expand All @@ -9,7 +8,6 @@ sort_by = 'time';

sort_dir = 'ASC';

@computed()
get columns() {
return [
{
Expand Down
2 changes: 0 additions & 2 deletions app/controllers/admin/reports/system-logs/activity-logs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Controller from '@ember/controller';
import { computed } from '@ember/object';
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';


Expand All @@ -8,7 +7,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
sort_by = 'time';
sort_dir = 'ASC';

@computed()
get columns() {
return [
{
Expand Down
2 changes: 0 additions & 2 deletions app/controllers/admin/reports/system-logs/mail-logs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Controller from '@ember/controller';
import { computed } from '@ember/object';
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';


Expand All @@ -8,7 +7,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
sort_by = 'time';
sort_dir = 'ASC';

@computed()
get columns() {
return [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import Controller from '@ember/controller';
import { computed } from '@ember/object';
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';


export default class extends Controller.extend(EmberTableControllerMixin) {
per_page = 100;
sort_by = 'received-at';
sort_dir = 'ASC';
@computed()
get columns() {
return [
{
Expand Down
2 changes: 0 additions & 2 deletions app/controllers/admin/sales/invoices.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import Controller from '@ember/controller';
import { computed } from '@ember/object';
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';


export default class extends Controller.extend(EmberTableControllerMixin) {

@computed()
get columns() {
return [
{
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/admin/sessions/list.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import Controller from '@ember/controller';
import { computed, action } from '@ember/object';
import { action } from '@ember/object';
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';

export default class extends Controller.extend(EmberTableControllerMixin) {
@computed()
get columns() {
return [
{
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/admin/settings/billing.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import Controller from '@ember/controller';
import { timezones } from 'open-event-frontend/utils/dictionary/date-time';
import { countries } from 'open-event-frontend/utils/dictionary/demography';
import { action, computed } from '@ember/object';
import { action } from '@ember/object';
import { paymentCountries } from 'open-event-frontend/utils/dictionary/payment';
import { orderBy, filter } from 'lodash-es';


export default class extends Controller {
timezones = timezones;
@computed()
get countries() {
return orderBy(filter(countries, country => paymentCountries.includes(country.code)), 'name');
}
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/admin/users/list.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import Controller from '@ember/controller';
import { computed, action } from '@ember/object';
import { action } from '@ember/object';
import { or } from '@ember/object/computed';
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';


export default class extends Controller.extend(EmberTableControllerMixin) {
@or('authManager.currentUser.isSuperAdmin', 'authManager.currentUser.isAdmin') hasRestorePrivileges;

@computed()
get columns() {
return [
{
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/admin/users/view/events/list.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import Controller from '@ember/controller';
import { computed, action } from '@ember/object';
import { action } from '@ember/object';
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
import { or } from '@ember/object/computed';

export default class extends Controller.extend(EmberTableControllerMixin) {

@or('authManager.currentUser.isSuperAdmin', 'authManager.currentUser.isAdmin') hasRestorePrivileges;

@computed()
get columns() {
return [
{
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/events/import.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Controller from '@ember/controller';
import { run } from '@ember/runloop';
import { action, computed } from '@ember/object';
import { action } from '@ember/object';

export default class extends Controller {
importStatus = '';
Expand All @@ -9,7 +9,6 @@ export default class extends Controller {
file = false;
fileName = '';

@computed()
get columns() {
return [
{
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/events/list.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import Controller from '@ember/controller';
import { computed, action } from '@ember/object';
import { action } from '@ember/object';
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';

export default class extends Controller.extend(EmberTableControllerMixin) {

@computed()
get columns() {
return [
{
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/events/view/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import Controller from '@ember/controller';
import { computed, action } from '@ember/object';
import { action } from '@ember/object';
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';

export default class extends Controller.extend(EmberTableControllerMixin) {

@computed()
get columns() {
return [
{
Expand Down
Loading

0 comments on commit b81bdea

Please sign in to comment.