MAINT: Upgrade to ember 2.16 LTS (#66)

app/app.js

@@ -1,11 +1,9 @@
-import Ember from 'ember';
+import Application from '@ember/application';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-let App;
-
-App = Ember.Application.extend({
+const App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver

app/authenticators/application.js

@@ -1,9 +1,11 @@
-import Ember from 'ember';
+import { Promise } from 'rsvp';
+import $ from 'jquery';
+import { get } from '@ember/object';
+import { isEmpty } from '@ember/utils';
+import { run } from '@ember/runloop';
 import BaseAuthenticator from 'ember-simple-auth/authenticators/base';
 import config from '../config/environment';
 
-const { RSVP: { Promise }, $, get, isEmpty, run } = Ember;
-
 export default BaseAuthenticator.extend({
   serverTokenEndpoint: `${config.APP.API_HOST}/api/auth/login/`,
   tokenAttributeName: 'data.attributes.auth-token',

app/authorizers/application.js

@@ -1,8 +1,7 @@
-import Ember from 'ember';
+import { isEmpty } from '@ember/utils';
+import { get } from '@ember/object';
 import BaseAuthorizer from 'ember-simple-auth/authorizers/base';
 
-const { isEmpty, get } = Ember;
-
 export default BaseAuthorizer.extend({
   authorize(data, block) {
     const accessToken = get(data, 'data.attributes.auth-token');

app/components/action-button.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({
   tagName: 'a',

app/components/admin-section-list.js

@@ -1,5 +1,3 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({});

app/components/ccdb-filter.js

@@ -1,5 +1,3 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({ });

app/components/ccdb-pagination.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
-
-const { Component, computed: { alias }, computed } = Ember;
+import Component from '@ember/component';
+import { alias } from '@ember/object/computed';
+import { computed } from '@ember/object';
 
 export default Component.extend({
   // ARGS
@@ -8,7 +8,7 @@ export default Component.extend({
 
   // COMPUTED
   meta: alias('model.meta'),
-  links: alias('model.links'),
+  links: alias('meta.links'),
 
   currentPage: alias('meta.pagination.page'),
   totalRecords: alias('meta.pagination.count'),

app/components/ccdb-table.js

@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import Table from 'ember-light-table';
 
-const { Component } = Ember;
-
 export default Component.extend({
   // ARGS
   model: null,

app/components/collection/create-container.js

@@ -1,9 +1,8 @@
-import Ember from 'ember';
+import Component from '@ember/component';
+import { inject as service } from '@ember/service';
 import Changeset from 'ember-changeset';
 import lookupValidator from 'ember-changeset-validations';
 
-const { Component, inject: { service } } = Ember;
-
 export default Component.extend({
   store: service(),
 

app/components/collection/detail-container.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({
   // ARGS

app/components/collection/list-container.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({
   // ARGS

app/components/crud-form.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({
   // ARGS

app/components/form-content.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({
   tagName: 'form',

app/components/loading-spinner.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({
   classNames: ['spinner'],

app/components/validated-field.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
-
-const { Component, computed, get, isEmpty } = Ember;
+import Component from '@ember/component';
+import { get, computed } from '@ember/object';
+import { isEmpty } from '@ember/utils';
 
 export default Component.extend({
   classNames: ['form-group'],

app/controllers/application.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Controller, inject: { service } } = Ember;
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
 
 export default Controller.extend({
   session: service('session'),

app/controllers/collections/create.js

@@ -1,12 +1,11 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
+import { computed } from '@ember/object';
 import CollectionValidations from 'ccdb-web/validations/collection';
 import CollectionSpeciesValidations from 'ccdb-web/validations/collection-species';
 import CollectionMeasurementValidations from 'ccdb-web/validations/collection-measurement';
 import DatasheetValidations from 'ccdb-web/validations/datasheet';
 import ValidationMixin from 'ccdb-web/mixins/validation';
 
-const { Controller, computed } = Ember;
-
 export default Controller.extend(ValidationMixin, {
   CollectionValidations,
   CollectionSpeciesValidations,

app/controllers/collections/detail/edit.js

@@ -1,12 +1,11 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
+import { computed } from '@ember/object';
 import CollectionValidations from 'ccdb-web/validations/collection';
 import CollectionSpeciesValidations from 'ccdb-web/validations/collection-species';
 import CollectionMeasurementValidations from 'ccdb-web/validations/collection-measurement';
 import DatasheetValidations from 'ccdb-web/validations/datasheet';
 import ValidationMixin from 'ccdb-web/mixins/validation';
 
-const { Controller, computed } = Ember;
-
 export default Controller.extend(ValidationMixin, {
   CollectionValidations,
   CollectionSpeciesValidations,

app/controllers/collections/detail/index.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Controller } = Ember;
+import Controller from '@ember/controller';
 
 export default Controller.extend({
   actions: {

app/controllers/collections/index.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Controller, computed, get, set } = Ember;
+import Controller from '@ember/controller';
+import { set, get, computed } from '@ember/object';
 
 
 export default Controller.extend({

app/controllers/login.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Controller, inject: { service } } = Ember;
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
 
 export default Controller.extend({
   session: service(),

app/index.html

@@ -17,8 +17,8 @@
   <body>
     {{content-for "body"}}
 
-    <script src="{{rootURL}}assets/vendor.js"></script>
-    <script src="{{rootURL}}assets/ccdb-web.js"></script>
+    <script integrity="" src="{{rootURL}}assets/vendor.js"></script>
+    <script integrity="" src="{{rootURL}}assets/ccdb-web.js"></script>
 
     {{content-for "body-footer"}}
   </body>

app/mixins/file-upload.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Mixin, isArray } = Ember;
+import Mixin from '@ember/object/mixin';
+import { isArray } from '@ember/array';
 const { keys } = Object;
 
 // Portions borrowed from https://github.com/funtusov/ember-cli-form-data

app/mixins/validation.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
-
-const { Mixin, get, RSVP } = Ember;
+import Mixin from '@ember/object/mixin';
+import { get } from '@ember/object';
+import RSVP from 'rsvp';
 const { keys } = Object;
 const { isArray } = Array;
 

app/models/collection.js

@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import { mapBy } from '@ember/object/computed';
+import { computed } from '@ember/object';
 import DS from 'ember-data';
 
-const { computed } = Ember;
 const { Model, attr, belongsTo, hasMany } = DS;
 
 export default Model.extend({
@@ -24,11 +24,11 @@ export default Model.extend({
   envMeasurements:   hasMany('collection-measurement'),
 
   // computed
-  species: computed.mapBy('collectionSpecies', 'species'),
+  species: mapBy('collectionSpecies', 'species'),
 
-  speciesNames: computed.mapBy('species', 'commonName'),
+  speciesNames: mapBy('species', 'commonName'),
 
-  counts: computed.mapBy('collectionSpecies', 'count'),
+  counts: mapBy('collectionSpecies', 'count'),
 
   speciesAndCounts: computed('speciesNames', 'counts', function() {
     const speciesNames = this.get('speciesNames');

app/router.js

@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 
-const Router = Ember.Router.extend({
+const Router = EmberRouter.extend({
   location: config.locationType,
   rootURL: config.rootURL
 });

app/routes/application.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin';
 
-const { Route } = Ember;
-
 export default Route.extend(ApplicationRouteMixin, {});

app/routes/collections/create.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Route, RSVP } = Ember;
+import Route from '@ember/routing/route';
+import RSVP from 'rsvp';
 
 export default Route.extend({
   model() {

app/routes/collections/detail.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Route, RSVP } = Ember;
+import Route from '@ember/routing/route';
+import RSVP from 'rsvp';
 
 export default Route.extend({
   model(params) {

app/routes/collections/detail/edit.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Route, RSVP } = Ember;
+import Route from '@ember/routing/route';
+import RSVP from 'rsvp';
 
 export default Route.extend({
   model() {

app/routes/collections/index.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Route, RSVP } = Ember;
+import Route from '@ember/routing/route';
+import RSVP from 'rsvp';
 
 export default Route.extend({
   queryParams: {

app/routes/index.js

@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-const { Route } = Ember;
-
 export default Route.extend(AuthenticatedRouteMixin, {
   afterModel() {
     this.transitionTo('collections');

app/routes/login.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin';
 
-const { Route } = Ember;
-
 export default Route.extend(UnauthenticatedRouteMixin, {});

app/routes/logout.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Route, inject: { service }} = Ember;
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
 
 export default Route.extend({
   session: service('session'),

app/serializers/application.js

@@ -1,10 +1,16 @@
-import Ember from 'ember';
+import { capitalize } from '@ember/string';
 import DS from 'ember-data';
 
 const { JSONAPISerializer } = DS;
 
 export default JSONAPISerializer.extend({
   payloadTypeFromModelName(modelName) {
-    return modelName.split('-').map(key => Ember.String.capitalize(key)).join('');
-  }
+    return modelName.split('-').map(key => capitalize(key)).join('');
+  },
+
+  normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
+    let normalizedDocument = this._super(store, primaryModelClass, payload, id, requestType);
+    normalizedDocument.meta.links = normalizedDocument.links;
+    return normalizedDocument;
+  },
 });