Merge pull request #602 from Gaurav0/upgrade_ember_data_2_18

Upgrade ember data to 2.18

Author: Gaurav0

app/components/file-tree.js

@@ -10,6 +10,10 @@ export default Ember.Component.extend({
     const files = this.get('model.files') || [];
 
     return files.reduce((accumulator, file) => {
+      if (!file) {
+        return accumulator;
+      }
+
       const path = file.get('filePath');
       const splitPath = path.split('/');
       const splitPathZeroBasedLength = splitPath.length - 1;

app/mixins/files.js

@@ -1,5 +1,8 @@
 import Ember from "ember";
 import ErrorMessages from "../utils/error-messages";
+import { pushDeletion } from "../utils/push-deletion";
+
+const { run } = Ember;
 
 export default Ember.Mixin.create({
   hasPath(filePath) {
@@ -16,7 +19,10 @@ export default Ember.Mixin.create({
       }
 
       fileProperties.filePath = filePath;
-      let file = this.get('store').createRecord('gistFile', fileProperties);
+
+      let store = this.get('store');
+      run(() => pushDeletion(store, 'gist-file', filePath));
+      let file = store.createRecord('gistFile', fileProperties);
 
       this.get('model.files').pushObject(file);
       this.get('notify').info(`File ${file.get('filePath')} was added`);

app/routes/gist/edit.js

@@ -1,11 +1,12 @@
 import Ember from "ember";
 import GistRoute from "ember-twiddle/routes/gist-base-route";
+import { pushDeleteAll } from "ember-twiddle/utils/push-deletion";
 
-const { get } = Ember;
+const { get, run } = Ember;
 
 export default GistRoute.extend({
   model(params) {
-    this.get('store').unloadAll('gistFile');
+    run(() => pushDeleteAll(this.get('store'), 'gist-file'));
 
     return this.get('store').find('gist', params.gistId);
   },

app/routes/gist/edit/revision.js

@@ -1,14 +1,19 @@
+import Ember from 'ember';
 import GistEditRoute from "../edit";
+import { pushDeleteAll } from "ember-twiddle/utils/push-deletion";
+
+const { run } = Ember;
 
 export default GistEditRoute.extend({
 
   templateName: 'gist',
 
   model(params) {
-    this.get('store').unloadAll('gistFile');
+    let store = this.get('store');
+    run(() => pushDeleteAll(store, 'gist-file'));
     const gistParams = this.paramsFor('gist.edit');
 
-    return this.get('store').queryRecord('gist-revision', {
+    return store.queryRecord('gist-revision', {
       gistId: gistParams.gistId,
       revId: params.revId
     });
@@ -23,8 +28,9 @@ export default GistEditRoute.extend({
 
   actions: {
     showCurrentVersion() {
-      this.get('store').unloadAll('gistFile');
-      this.store.find('gist', this.paramsFor('gist.edit').gistId).then((model) => {
+      const store = this.get('store');
+      run(() => pushDeleteAll(store, 'gist-file'));
+      store.find('gist', this.paramsFor('gist.edit').gistId).then((model) => {
         this.transitionTo('gist.edit', model);
       });
     }

app/routes/gist/new.js

@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import GistRoute from "ember-twiddle/routes/gist-base-route";
+import { pushDeleteAll } from "ember-twiddle/utils/push-deletion";
 
 const { inject, run } = Ember;
 
@@ -13,7 +14,7 @@ export default GistRoute.extend({
     if (params.copyCurrentTwiddle) {
       store.peekAll('gistFile').setEach('gist', model);
     } else {
-      store.unloadAll('gistFile');
+      run(() => pushDeleteAll(store, 'gist-file'));
       let files = model.get('files');
       let emberCli = this.get('emberCli');
       files.pushObject(emberCli.generate('controllers/application'));

app/services/ember-cli.js

@@ -5,8 +5,9 @@ import blueprints from '../lib/blueprints';
 import Ember from 'ember';
 import moment from 'moment';
 import _template from "lodash/template";
+import { pushDeletion } from 'ember-twiddle/utils/push-deletion';
 
-const { computed, inject, RSVP, $, testing } = Ember;
+const { computed, inject, RSVP, run, $, testing } = Ember;
 const twiddleAppName = 'twiddle';
 const oldTwiddleAppNames = ['demo-app', 'app'];
 const hbsPlugin = new HbsPlugin(Babel);
@@ -162,7 +163,9 @@ export default Ember.Service.extend({
   },
 
   generate(type) {
-    return this.get('store').createRecord('gistFile', this.buildProperties(type));
+    let store = this.get('store');
+    run(() => pushDeletion(store, 'gist-file', type));
+    return store.createRecord('gistFile', this.buildProperties(type));
   },
 
   buildProperties(type, replacements) {
@@ -331,27 +334,27 @@ export default Ember.Service.extend({
             url: 'https://cdnjs.cloudflare.com/ajax/libs/qunit/2.3.2/qunit.js',
             dataType: 'text'
           }).then(function(script) {
-            var oldQUnit;
-            if (window.QUnit) {
-              oldQUnit = window.QUnit;
-            }
-            window.QUnit = {
-              config: {
-                autostart: false
-              }
-            }
-            eval(script);
-            if (!oldQUnit) {
-              oldQUnit = window.QUnit;
-            }
-            if (window.testModule) {
-              window.require(window.testModule);
-            }
-            window.QUnit.start = function() {};
-            window.QUnit.done(function() {
-              window.QUnit = oldQUnit;
-            });
             Ember.run(function() {
+              var oldQUnit;
+              if (window.QUnit) {
+                oldQUnit = window.QUnit;
+              }
+              window.QUnit = {
+                config: {
+                  autostart: false
+                }
+              }
+              eval(script);
+              if (!oldQUnit) {
+                oldQUnit = window.QUnit;
+              }
+              if (window.testModule) {
+                window.require(window.testModule);
+              }
+              window.QUnit.start = function() {};
+              window.QUnit.done(function() {
+                window.QUnit = oldQUnit;
+              });
               oldQUnit.start();
             });
           });
@@ -400,9 +403,11 @@ export default Ember.Service.extend({
 
   checkRequiredFiles(out, gist) {
     requiredFiles.forEach(filePath => {
-      var file = gist.get('files').findBy('filePath', filePath);
-      if(!file) {
-        gist.get('files').pushObject(this.get('store').createRecord('gistFile', {
+      let file = gist.get('files').findBy('filePath', filePath);
+      if (!file) {
+        let store = this.get('store');
+        run(() => pushDeletion(store, 'gist-file', filePath));
+        gist.get('files').pushObject(store.createRecord('gistFile', {
           filePath: filePath,
           content: blueprints[filePath]
         }));

app/utils/push-deletion.js

@@ -0,0 +1,44 @@
+// Taken from https://github.com/travis-ci/travis-web/pull/1173/files
+export function removeInternalModels(store, type, id) {
+  let recordMap = store._internalModelsFor(type);
+  let internalModel = recordMap.get(id);
+  if (internalModel) {
+    recordMap.remove(internalModel, id);
+  }
+}
+
+// Taken from https://gist.github.com/runspired/96618af26fb1c687a74eb30bf15e58b6/
+export function pushDeletion(store, type, id) {
+  let record = store.peekRecord(type, id);
+
+  if (record !== null) {
+    let relationships = {};
+    let hasRelationships = false;
+
+    record.eachRelationship((name, { kind }) => {
+      hasRelationships = true;
+      relationships[name] = {
+        data: kind === 'hasMany' ? [] : null
+      };
+    });
+
+    if (hasRelationships && !record.get('isDeleted')) {
+      store.push({
+        data: {
+          type,
+          id,
+          relationships
+        }
+      });
+    }
+
+    record.unloadRecord();
+
+    removeInternalModels(store, type, id);
+  }
+}
+
+export function pushDeleteAll(store, type) {
+  let records = store.peekAll(type);
+  records.forEach(record => pushDeletion(store, type, record.get('id')));
+}

package.json

@@ -59,11 +59,11 @@
     "ember-cli-test-loader": "^1.1.1",
     "ember-cli-uglify": "^2.1.0",
     "ember-concurrency": "~0.8.17",
-    "ember-data": "~2.12.2",
+    "ember-data": "^2.18.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^2.0.0",
     "ember-git-version": "~0.1.2",
-    "ember-inflector": "^1.12.1",
+    "ember-inflector": "~2.0.0",
     "ember-load": "~0.0.12",
     "ember-load-initializers": "^1.0.0",
     "ember-lodash": "^4.18.0",