Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update changed models in store after batchUpdate #274

Merged
merged 3 commits into from
Dec 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## [3.11.1-beta.2] - 2023-12-26
### Fixed
- Update changed models in store after batchUpdate.

## [3.11.0] - 2023-11-09
### Added
- Projections parameter for batchUpdate.
Expand Down
11 changes: 10 additions & 1 deletion addon/adapters/odata.js
Original file line number Diff line number Diff line change
Expand Up @@ -578,15 +578,18 @@ export default DS.RESTAdapter.extend({
return reject(errors);
}

const normalizedForPush = A();

models.forEach((model) => {
const modelDirtyType = model.get('dirtyType');
if (modelDirtyType === 'deleted') {
run(store, store.unloadRecord, model);
} else if (modelDirtyType === 'created' || modelDirtyType === 'updated' || model.hasChangedBelongsTo()) {
run(() => {
run(() => {
const id = model.get('id');
const normalized = getResponses[id];
if (!isNone(normalized)) {
normalizedForPush.addObject(normalized);
const internalModel = model._internalModel;
internalModel.adapterWillCommit();
internalModel.flushChangedAttributes();
Expand All @@ -600,6 +603,12 @@ export default DS.RESTAdapter.extend({
result.push(modelDirtyType === 'deleted' ? null : model);
});

run(() => {
normalizedForPush.forEach((record) => {
store.push(record);
});
});

return resolve(result);
} catch (error) {
// If an error is thrown then this situation is not processed and user will get not understandable result.
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-flexberry-data",
"version": "3.11.1-beta.1",
"version": "3.11.1-beta.2",
"description": "Support of database projections, JavaScript Query Language and working with several kinds of backends",
"keywords": [
"ember-addon",
Expand Down
2 changes: 1 addition & 1 deletion vendor/ember-flexberry-data/register-version.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/* globals Ember */
var version = '3.11.0';
var version = '3.11.1-beta.2';
Ember.libraries.register('Ember Flexberry Data', version);