fix(store): clear or remove records only for null value

hybridsjs · Jul 12, 2024 · a3e0a0b · a3e0a0b
1 parent 0e92b27
commit a3e0a0b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/src/store.js b/src/store.js
@@ -722,17 +722,22 @@ function setupModel(Model, nested) {
           const localConfig = bootstrap(defaultValue, true);
 
           return (model, data, lastModel) => {
-            const record = data[key];
-            const result =
-              lastModel && lastModel[key] ? { ...lastModel[key] } : {};
-
-            if (record === null || record === undefined) {
+            if (data[key] === null) {
               model[key] = {};
               return;
             }
 
+            const record = data[key] || {};
+            let result = {};
+
+            if (lastModel) {
+              for (const id of Object.keys(lastModel[key])) {
+                result[id] = lastModel[key][id];
+              }
+            }
+
             for (const id of Object.keys(record)) {
-              if (record[id] === null || record[id] === undefined) {
+              if (record[id] === null) {
                 delete result[id];
                 continue;
               }

diff --git a/test/spec/store.js b/test/spec/store.js
@@ -1169,6 +1169,7 @@ describe("store:", () => {
       beforeEach(() => {
         Model = {
           id: true,
+          other: true,
           values: store.record(""),
         };
       });
@@ -1213,6 +1214,15 @@ describe("store:", () => {
             expect(model.values).toEqual({});
           });
       });
+
+      it("keeps the values if another property is updated", () => {
+        return store
+          .set(Model, { values: { a: "b", c: "d" } })
+          .then((model) => store.set(model, { other: "test" }))
+          .then((model) => {
+            expect(model.values).toEqual({ a: "b", c: "d" });
+          });
+      });
     });
 
     describe("for nested model value", () => {