[BUGFIX] Set IDs on Record Data when mutating DS Model (#6775) (#6778)

emberjs · Nov 21, 2019 · c5f8580 · c5f8580
1 parent b101be1
commit c5f8580
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/packages/-ember-data/tests/unit/model-test.js b/packages/-ember-data/tests/unit/model-test.js
@@ -351,6 +351,13 @@ module('unit/model - Model', function(hooks) {
       assert.equal(idChange, 0);
       person._internalModel.setId('john');
       assert.equal(idChange, 1);
+      let recordData = recordDataFor(person);
+      assert.equal(
+        recordData.getResourceIdentifier().id,
+        'john',
+        'new id should be set on the identifier on record data.'
+      );
+      assert.equal(recordData.id, 'john', 'new id should be correctly set on the record data itself.');
       assert.equal(person.get('id'), 'john', 'new id should be correctly set.');
     });
 

diff --git a/packages/store/addon/-private/system/model/internal-model.ts b/packages/store/addon/-private/system/model/internal-model.ts
@@ -745,7 +745,9 @@ export default class InternalModel {
       return this._updatePromiseProxyFor('hasMany', key, { promise, content: manyArray });
     } else {
       assert(
-        `You looked up the '${key}' relationship on a '${this.type.modelName}' with id ${this.id} but some of the associated records were not loaded. Either make sure they are all loaded together with the parent record, or specify that the relationship is async ('hasMany({ async: true })')`,
+        `You looked up the '${key}' relationship on a '${this.type.modelName}' with id ${
+          this.id
+        } but some of the associated records were not loaded. Either make sure they are all loaded together with the parent record, or specify that the relationship is async ('hasMany({ async: true })')`,
         !manyArray.anyUnloaded()
       );
 
@@ -1267,7 +1269,11 @@ export default class InternalModel {
     this.id = id;
 
     if (didChange && id !== null) {
-      this.store.setRecordId(this.modelName, id, this.clientId as string);
+      this.store.setRecordId(this.modelName, id, this.clientId);
+      // internal set of ID to get it to RecordData from DS.Model
+      if (this._recordData.__setId) {
+        this._recordData.__setId(id);
+      }
     }
 
     if (didChange && this.hasRecord) {

diff --git a/packages/store/addon/-private/system/model/record-data.ts b/packages/store/addon/-private/system/model/record-data.ts
@@ -411,6 +411,13 @@ export default class RecordDataDefault implements RelationshipRecordData {
     }
   }
 
+  // internal set coming from the model
+  __setId(id: string) {
+    if (this.id !== id) {
+      this.id = id;
+    }
+  }
+
   getAttr(key: string): string {
     if (key in this._attributes) {
       return this._attributes[key];

diff --git a/packages/store/addon/-private/ts-interfaces/record-data.ts b/packages/store/addon/-private/ts-interfaces/record-data.ts
@@ -60,4 +60,7 @@ export default interface RecordData {
   isDeletionCommitted?(): boolean;
 
   setIsDeleted?(isDeleted: boolean): void;
+
+  // Private and experimental
+  __setId?(id: string): void;
 }