Merge pull request #5151 from emberjs/reduce-duplicate-signals-to-rec…

…ord-array-manager-on-record-push

[CLEANUP] PERF prevent duplicate recordArrayManager signals on push o…

addon/-private/system/model/internal-model.js

@@ -366,7 +366,6 @@ export default class InternalModel {
 
   resetRecord() {
     this._record = null;
-    this.dataHasInitialized = false;
     this.isReloading = false;
     this.error = null;
     this.currentState = RootState.empty;
@@ -598,18 +597,6 @@ export default class InternalModel {
     if (this.hasRecord) {
       this._record._notifyProperties(changedKeys);
     }
-    this.didInitializeData();
-  }
-
-  becameReady() {
-    this.store.recordArrayManager.recordWasLoaded(this);
-  }
-
-  didInitializeData() {
-    if (!this.dataHasInitialized) {
-      this.becameReady();
-      this.dataHasInitialized = true;
-    }
   }
 
   get isDestroyed() {
@@ -644,7 +631,6 @@ export default class InternalModel {
   */
   loadedData() {
     this.send('loadedData');
-    this.didInitializeData();
   }
 
   /*
@@ -791,14 +777,6 @@ export default class InternalModel {
       this.didCleanError();
     }
 
-    //Eventually rollback will always work for relationships
-    //For now we support it only out of deleted state, because we
-    //have an explicit way of knowing when the server acked the relationship change
-    if (this.isDeleted()) {
-      //TODO: Should probably move this to the state machine somehow
-      this.becameReady();
-    }
-
     if (this.isNew()) {
       this.removeFromInverseRelationships(true);
     }

addon/-private/system/store.js

@@ -2017,9 +2017,15 @@ Store = Service.extend({
     heimdall.increment(_load);
     let internalModel = this._internalModelForId(data.type, data.id);
 
+    let isUpdate = internalModel.currentState.isEmpty === false;
+
     internalModel.setupData(data);
 
-    this.recordArrayManager.recordDidChange(internalModel);
+    if (isUpdate) {
+      this.recordArrayManager.recordDidChange(internalModel);
+    } else {
+      this.recordArrayManager.recordWasLoaded(internalModel);
+    }
 
     return internalModel;
   },