Only remove deleted records form record arrays when saved #3539

bmac · 2015-07-13T15:20:42Z

No description provided.

Before this commit records were deleted from record arrays just after deleting them, but before they were commited. This can be an issue if you want to keep records visible in the UI until they're actually removed.

ianstarz · 2015-07-13T15:52:48Z

packages/ember-data/lib/system/record-array-manager.js

-        this._recordWasDeleted(record);
+    this.changedRecords.forEach((internalModel) => {
+      if (get(internalModel, 'record.isDestroyed') || get(internalModel, 'record.isDestroying') ||
+           (get(internalModel, 'currentState.stateName') === 'root.deleted.saved')) {


igorT · 2015-07-14T20:27:57Z

packages/ember-data/lib/system/model/states.js

@@ -661,6 +661,7 @@ var RootState = {
      // TODO: More robust semantics around save-while-in-flight
      willCommit: Ember.K,
      didCommit: function(internalModel) {
+        internalModel.disconnectRelationships();


Entering the deleted.saved state should handle this most likely

…eteRecord - Removed disconnectRelationship method calls from model/states.js - Removed reconnectRelationships from modle/internal-model.js - Remove one-sided disconnect and reconnect relationship methods - Removed method definitions in internal-model for: - disconnectRelationships - reconnectRelationships - Removed method definitions in relationship for: - disconnect - reconnect - addRecordToInverse - Fixed incorrect tests

bmac · 2015-07-14T21:29:42Z

@igorT I have updated this pr based on your feedback.

bmac · 2015-07-14T21:32:01Z

@ianstarz Igor explained why its a good idea to remove disconnectRelationships/reconnectRelationships so I ended up pulling your commit from #3247 into this pr.

ianstarz · 2015-07-14T21:33:12Z

👍 that's great! I'm glad it could be useful

igorT · 2015-07-15T20:12:44Z

packages/ember-data/lib/system/model/states.js

@@ -685,6 +681,7 @@ var RootState = {
      isDirty: false,

      setup: function(internalModel) {
+        internalModel.clearRelationships();


We also do this on dematerialize, so it will be called twice now?

Should I remove the internalModel.clearRelationships(); from the unloadRecord methods?

Hm, I would rely on it there, and not here, but I think we can fix that later when I merge the unload refactor

bmac · 2015-07-17T12:49:29Z

ping @igorT

Only remove deleted records form record arrays when saved

This commit: 1. Allows one to rollback belongsTo and hasMany relationships. 2. Reintroduces dirtyRecordFor*Change hooks on the adapter that allow one to customize when a record becomes dirty. 3. Added 'removeDeletedFromRelationshipsPriorToSave' flag to Adapter that allows one to opt back into the old deleted record from many array behavior (pre emberjs#3539). Known issues: 1. Rolling back a hasMany relationship from the parent side of the relationship does not work (doing the same from the child side works fine). See test that is commented out below as well as the discussion at the end of emberjs#2881#issuecomment-204634262 This was previously emberjs#2881 and is related to emberjs#3698

This commit: 1. Allows one to rollback belongsTo and hasMany relationships. 2. Reintroduces dirtyRecordFor*Change hooks on the adapter that allow one to customize when a record becomes dirty. 3. Added 'removeDeletedFromRelationshipsPriorToSave' flag to Adapter that allows one to opt back into the old deleted record from many array behavior (pre emberjs#3539). 4. Adds bin/build.js to build a standalone version of ember-data. Known issues: 1. Rolling back a hasMany relationship from the parent side of the relationship does not work (doing the same from the child side works fine). See test that is commented out below as well as the discussion at the end of emberjs#2881#issuecomment-204634262 This was previously emberjs#2881 and is related to emberjs#3698

This is a backport of a major breaking change in Ember Data 2.0. emberjs#3539

This commit: 1. Allows one to rollback belongsTo and hasMany relationships. 2. Added 'shouldRemoveDeletedFromRelationshipsPriorToSave' flag to Adapter that allows one to opt back into the old deleted record from many array behavior (pre emberjs#3539). 3. Adds bin/build.js to build a standalone version of ember-data. Known issues: 1. Rolling back a hasMany relationship from the parent side of that relationship does not work (doing the same from the child side works fine). See test that is commented out below as well as the discussion at the end of emberjs#2881#issuecomment-204634262 This was previously emberjs#2881 and is related to emberjs#3698

drogus and others added 2 commits July 13, 2015 10:51

Don't remove records from record arrays before commiting

529f959

Before this commit records were deleted from record arrays just after deleting them, but before they were commited. This can be an issue if you want to keep records visible in the UI until they're actually removed.

Clean up logic to only remove records in the 'deleted.saved' state.

a570eca

bmac mentioned this pull request Jul 13, 2015

Dont remove deleted but uncommited records from record arrays #3247

Closed

ianstarz reviewed Jul 13, 2015
View reviewed changes

igorT mentioned this pull request Jul 14, 2015

[Meta Issue] Shipping 2.0 beta.1 checklist #3321

Closed

15 tasks

igorT reviewed Jul 14, 2015
View reviewed changes

bmac force-pushed the rebase-3247 branch from 89bf57a to d2ba097 Compare July 14, 2015 21:29

igorT reviewed Jul 15, 2015
View reviewed changes

igorT added a commit that referenced this pull request Jul 18, 2015

Merge pull request #3539 from bmac/rebase-3247

55b1e65

Only remove deleted records form record arrays when saved

igorT merged commit 55b1e65 into emberjs:master Jul 18, 2015

wecc mentioned this pull request Aug 20, 2015

Deleted records are not accessible #1737

Closed

bmac deleted the rebase-3247 branch August 20, 2015 17:48

mmpestorich mentioned this pull request Sep 30, 2017

Rollback Relationships #4361

Closed

mmun pushed a commit to Addepar/ember-data that referenced this pull request Oct 12, 2021

Only remove deleted records form record arrays when saved

a0a50c3

This is a backport of a major breaking change in Ember Data 2.0. emberjs#3539

mmun pushed a commit to Addepar/ember-data that referenced this pull request Oct 12, 2021

Only remove deleted records form record arrays when saved

91c5538

This is a backport of a major breaking change in Ember Data 2.0. emberjs#3539

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Only remove deleted records form record arrays when saved #3539

Only remove deleted records form record arrays when saved #3539

bmac commented Jul 13, 2015

ianstarz Jul 13, 2015

igorT Jul 14, 2015

bmac commented Jul 14, 2015

bmac commented Jul 14, 2015

ianstarz commented Jul 14, 2015

igorT Jul 15, 2015

bmac Jul 15, 2015

igorT Jul 18, 2015

bmac commented Jul 17, 2015

Only remove deleted records form record arrays when saved #3539

Only remove deleted records form record arrays when saved #3539

Conversation

bmac commented Jul 13, 2015

ianstarz Jul 13, 2015

Choose a reason for hiding this comment

igorT Jul 14, 2015

Choose a reason for hiding this comment

bmac commented Jul 14, 2015

bmac commented Jul 14, 2015

ianstarz commented Jul 14, 2015

igorT Jul 15, 2015

Choose a reason for hiding this comment

bmac Jul 15, 2015

Choose a reason for hiding this comment

igorT Jul 18, 2015

Choose a reason for hiding this comment

bmac commented Jul 17, 2015