Ember Form For - Changes Required for Ember upgrade 3.28

addon/components/fields-for.js

@@ -1,10 +1,6 @@
-import Ember from 'ember';
 import layout from '../templates/components/fields-for';
-
-const {
-  Component,
-  set
-} = Ember;
+import Component from '@ember/component';
+import { set } from '@ember/object';
 
 const FieldsForComponent = Component.extend({
   layout,

addon/components/form-controls/button.js

@@ -1,8 +1,8 @@
-import Ember from 'ember';
 import DynamicAttributeBindings from 'ember-one-way-controls/-private/dynamic-attribute-bindings';
 import layout from '../../templates/components/form-controls/button';
-
-const { Component, get, set, inject: { service } } = Ember;
+import Component from '@ember/component';
+import { get, set } from '@ember/object';
+import { inject as service } from '@ember/service';
 
 const Button = Component.extend(DynamicAttributeBindings, {
   layout,

addon/components/form-controls/submit.js

@@ -1,9 +1,12 @@
-import Ember from 'ember';
-import EmberObject from '@ember/object';
 import Button from './button';
 import layout from 'ember-form-for/templates/components/form-controls/submit';
 
-const { computed: { alias }, PromiseProxyMixin, RSVP, computed, observer } = Ember;
+import { computed } from '@ember/object';
+import { alias } from '@ember/object/computed';
+import { resolve } from 'rsvp';
+import { observer } from '@ember/object';
+import ObjectProxy from '@ember/object/proxy';
+import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 
 const SubmitButton = Button.extend({
   layout,
@@ -31,10 +34,10 @@ const SubmitButton = Button.extend({
     // PromiseProxyMixin allows us to use .isPending in the templates
     // RSVP.Promise is required to handle situation when submit function
     // returns non-promise.
-    this.set('activePromise', EmberObject.extend(PromiseProxyMixin).create({
-      promise: new RSVP.Promise((resolve) => {
-        resolve(this.get('submit')());
-      })
+    // Updated as per ember docs https://api.emberjs.com/ember/3.28/classes/PromiseProxyMixin
+    let ObjectPromiseProxy = ObjectProxy.extend(PromiseProxyMixin);
+    this.set('activePromise', ObjectPromiseProxy.create({
+      promise: resolve(this.get('submit')())
     }));
     return false;
   },

addon/components/form-errors.js

@@ -1,11 +1,6 @@
-import Ember from 'ember';
 import layout from '../templates/components/form-errors';
-
-const {
-  Component,
-  computed,
-  get
-} = Ember;
+import Component from '@ember/component';
+import { computed, get } from '@ember/object';
 
 export default Component.extend({
   layout,

addon/components/form-field.js

@@ -1,23 +1,19 @@
 import Ember from 'ember';
 import layout from '../templates/components/form-field';
 
+import Component from '@ember/component';
+import { assert } from '@ember/debug';
+import { computed, get, set } from '@ember/object';
+import { notEmpty, or, reads } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import { isEmpty, isPresent } from '@ember/utils';
+import { dasherize } from '@ember/string';
 import { humanize } from '../utils/strings';
+import { guidFor } from '@ember/object/internals';
+import { observer } from '@ember/object';
 
 const {
-  Component,
-  String: { dasherize },
-  assert,
-  computed,
-  computed: { notEmpty, or, reads },
-  get,
-  getWithDefault,
-  guidFor,
-  inject: { service },
-  isEmpty,
-  isPresent,
-  mixin,
-  observer,
-  set
+  mixin
 } = Ember;
 
 const FormFieldComponent = Component.extend({
@@ -164,14 +160,16 @@ const FormFieldComponent = Component.extend({
   },
 
   value: computed('rawValue', function() {
-    let serializeValue = getWithDefault(this, 'serializeValue', (value) => value);
+    let serializeValue = get(this, 'serializeValue');
+    serializeValue = serializeValue !== undefined ? serializeValue : (value) => value;
     return serializeValue(get(this, 'rawValue'));
   }),
 
   actions: {
     processUpdate(object, propertyName, value) {
       let rawValue = get(this, 'rawValue');
-      let deserializeValue = getWithDefault(this, 'deserializeValue', (value) => value);
+      let deserializeValue = get(this, 'deserializeValue');
+      deserializeValue = deserializeValue !== undefined ? deserializeValue : (value) => value;
       get(this, 'update')(object, propertyName, deserializeValue(value, rawValue));
     }
   }

addon/components/form-fields/checkbox-field.js

@@ -1,10 +1,7 @@
-import Ember from 'ember';
 import layout from '../../templates/components/form-fields/checkbox-field';
+import Component from '@ember/component';
+import { set } from '@ember/object';
 
-const {
-  Component,
-  set
-} = Ember;
 
 const CheckboxFieldComponent = Component.extend({
   tagName: '',

addon/components/form-fields/checkbox-group.js

@@ -1,10 +1,7 @@
-import Ember from 'ember';
 import layout from '../../templates/components/form-fields/checkbox-group';
 
-const {
-  Component,
-  get
-} = Ember;
+import Component from '@ember/component';
+import { get } from '@ember/object';
 
 const CheckboxGroupComponent = Component.extend({
   tagName: '',

addon/components/form-fields/checkbox-group/option.js

@@ -1,17 +1,13 @@
-import Ember from 'ember';
 import layout from '../../../templates/components/form-fields/checkbox-group/option';
 
 import { humanize } from '../../../utils/strings';
 
-const {
-  Component,
-  String: { dasherize },
-  computed,
-  computed: { or },
-  get,
-  inject: { service },
-  isPresent
-} = Ember;
+import Component from '@ember/component';
+import { computed, get } from '@ember/object';
+import { or } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import { isPresent } from '@ember/utils';
+import { dasherize } from '@ember/string';
 
 export default Component.extend({
   tagName: '',

addon/components/form-fields/custom-field.js

@@ -1,10 +1,6 @@
-import Ember from 'ember';
 import layout from '../../templates/components/form-fields/custom-field';
-
-const {
-  Component,
-  set
-} = Ember;
+import Component from '@ember/component';
+import { set } from '@ember/object';
 
 const CustomFieldComponent = Component.extend({
   tagName: '',

addon/components/form-fields/date-field.js

@@ -1,8 +1,6 @@
-import Ember from 'ember';
 import TextField from './text-field';
 import { toDateString } from '../../utils/date';
-
-const { isEmpty } = Ember;
+import { isEmpty } from '@ember/utils';
 
 export default TextField.extend({
   type: 'date',

addon/components/form-fields/hidden-field.js

@@ -1,10 +1,7 @@
-import Ember from 'ember';
 import layout from '../../templates/components/form-fields/hidden-field';
 
-const {
-  Component,
-  set
-} = Ember;
+import Component from '@ember/component';
+import { set } from '@ember/object';
 
 const HiddenFieldComponent = Component.extend({
   tagName: '',

addon/components/form-fields/radio-field.js

@@ -1,18 +1,13 @@
-import Ember from 'ember';
 import layout from '../../templates/components/form-fields/radio-field';
 
 import { humanize } from '../../utils/strings';
 
-const {
-  Component,
-  String: { dasherize },
-  computed,
-  computed: { or },
-  get,
-  inject: { service },
-  isPresent,
-  set
-} = Ember;
+import Component from '@ember/component';
+import { computed, get, set } from '@ember/object';
+import { or } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import { isPresent } from '@ember/utils';
+import { dasherize } from '@ember/string';
 
 const RadioFieldComponent = Component.extend({
   tagName: '',

addon/components/form-fields/radio-group.js

@@ -1,10 +1,6 @@
-import Ember from 'ember';
 import layout from '../../templates/components/form-fields/radio-group';
-
-const {
-  Component,
-  set
-} = Ember;
+import Component from '@ember/component';
+import { set } from '@ember/object';
 
 const RadioGroupComponent = Component.extend({
   tagName: '',

addon/components/form-fields/select-field.js

@@ -1,10 +1,6 @@
-import Ember from 'ember';
 import layout from '../../templates/components/form-fields/select-field';
-
-const {
-  Component,
-  set
-} = Ember;
+import Component from '@ember/component';
+import { set } from '@ember/object';
 
 const SelectFieldComponent = Component.extend({
   tagName: '',

addon/components/form-fields/text-field.js

@@ -1,7 +1,7 @@
-import Ember from 'ember';
 import layout from '../../templates/components/form-fields/text-field';
 
-const { Component, set, get } = Ember;
+import Component from '@ember/component';
+import { set, get } from '@ember/object';
 
 const TextFieldComponent = Component.extend({
   tagName: '',

addon/components/form-fields/textarea-field.js

@@ -1,10 +1,7 @@
-import Ember from 'ember';
 import layout from '../../templates/components/form-fields/textarea-field';
 
-const {
-  Component,
-  set
-} = Ember;
+import Component from '@ember/component';
+import { set } from '@ember/object';
 
 const TextareaFieldComponent = Component.extend({
   tagName: '',

addon/components/form-for.js

@@ -1,14 +1,9 @@
-import Ember from 'ember';
 import layout from '../templates/components/form-for';
-
-const {
-  Component,
-  get,
-  inject: { service },
-  isPresent,
-  run: { schedule },
-  set
-} = Ember;
+import Component from '@ember/component';
+import { get, set } from '@ember/object';
+import { inject as service } from '@ember/service';
+import { isPresent } from '@ember/utils';
+import { schedule } from '@ember/runloop';
 
 const FormForComponent = Component.extend({
   layout,

addon/components/form-for/custom-tag.js

@@ -1,9 +1,6 @@
 import Ember from 'ember';
 import layout from '../../templates/components/form-for/custom-tag';
-
-const {
-  Component
-} = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({
   layout,

addon/components/form-hint.js

@@ -1,12 +1,7 @@
-import Ember from 'ember';
+import Component from '@ember/component';
+import { computed, get } from '@ember/object';
 import layout from '../templates/components/form-hint';
 
-const {
-  Component,
-  computed,
-  get
-} = Ember;
-
 export default Component.extend({
   tagName: '',
   layout,

addon/components/form-label.js

@@ -1,9 +1,5 @@
-import Ember  from 'ember';
 import layout from '../templates/components/form-label';
-
-const {
-  Component
-} = Ember;
+import Component from '@ember/component';
 
 const FormLabelComponent = Component.extend({
   tagName: 'label',

addon/helpers/contains.js

@@ -1,10 +1,5 @@
-import Ember from 'ember';
-
-const {
-  A: emberArray,
-  Helper: { helper },
-  isArray
-} = Ember;
+import { A as emberArray, isArray } from '@ember/array';
+import { helper } from '@ember/component/helper';
 
 export function contains([haystack, needle]) {
   if (isArray(haystack)) {

addon/helpers/form-for/humanize.js

@@ -1,9 +1,5 @@
-import Ember from 'ember';
 import { humanize } from '../../utils/strings';
-
-const {
-  Helper: { helper }
-} = Ember;
+import { helper } from '@ember/component/helper';
 
 export function formForHumanize([string]) {
   return humanize(string);

addon/helpers/form-for/merge-custom-form-field.js

@@ -1,8 +1,5 @@
 import Ember from 'ember';
-
-const {
-  Helper: { helper }
-} = Ember;
+import { helper } from '@ember/component/helper';
 
 export function formForMergeCustomFormField([formFieldsHash], { name, component }) {
   formFieldsHash[name] = component;

addon/helpers/is-equal.js

@@ -1,8 +1,4 @@
-import Ember from 'ember';
 import isEqual from '../utils/is-equal';
-
-const {
-  Helper: { helper }
-} = Ember;
+import { helper } from '@ember/component/helper';
 
 export default helper(([a, b]) => isEqual(a, b));