sdc_client 0.158.6 → 0.158.7

package/test/model.test.js

@@ -38,16 +38,16 @@ class MockModelSocketServer {
   constructor() {
     this.records = {
       Author: [
-        { pk: 1, id: 1, fields: {name: "Ada Lovelace", age: 36, book_set: [11]} },
-        { pk: 2, id: 2, fields: {name: "Grace Hopper", age: 85, book_set: [21, 22]} },
+        { id: 1, pk: 1, fields: {name: "Ada Lovelace", age: 36, book_set: [11]} },
+        { id: 2, pk: 2, fields: {name: "Grace Hopper", age: 85, book_set: [21, 22]} },
       ],
       Book: [
-        { pk: 11, id: 11, fields: {title: "Notes", author: 1 }},
-        { pk: 21, id: 21, fields: {title: "Compiler Notes", author: 2 }},
-        { pk: 22, id: 22, fields: {title: "COBOL", author: 2 }},
+        { id: 11, pk: 11, fields: {title: "Notes", author: 1 }},
+        { id: 21, pk: 21, fields: {title: "Compiler Notes", author: 2 }},
+        { id: 22, pk: 22, fields: {title: "COBOL", author: 2 }},
       ],
       BookContent: [],
-      SdcUser: [{ pk: 7, id: 7, fields: {username: "tester" }}],
+      SdcUser: [{ id: 7, pk: 7, fields: {username: "tester" }}],
     };
   }
 
@@ -111,7 +111,7 @@ class MockModelSocketServer {
 
   saveRow(modelName, data) {
     const records = this.records[modelName];
-    const id = data.pk ?? data.id;
+    const id = data.id ?? data.id;
     const idx = records.findIndex((row) => row.id === id);
 
     records[idx].fields = {
@@ -294,12 +294,10 @@ describe("model fixtures", () => {
     expect(books.socket.sentMessages.at(-1)).toMatchObject({
       event_type: "save",
       args: {
-        pk: 21,
         data: {
           id: 21,
           title: "Compiler Notes Revised",
-          author: 2,
-          pk: 21,
+          author: 2
         },
       },
     });

package/test/models/Author.js

@@ -66,7 +66,7 @@ export default class Author extends SdcModel {
   }
 
   setValues(data = {}) {
-    data.id ??= data.pk ?? null;
+    data.id ??= data.id ?? null;
     try {
     this.book_set.setFilter({ author:  data.id });
     this.book_set = data.book_set || [];

package/test/models/Book.js

@@ -52,7 +52,7 @@ export default class Book extends SdcModel {
   }
 
   setValues(data = {}) {
-    data.id ??= data.pk ?? null;
+    data.id ??= data.id ?? null;
     try {
       this.id = data.id ?? null;
     } catch {} 

package/test/models/BookContent.js

@@ -54,7 +54,7 @@ export default class BookContent extends SdcModel {
   }
 
   setValues(data = {}) {
-    data.id ??= data.pk ?? null;
+    data.id ??= data.id ?? null;
     try {
       this.id = data.id ?? null;
     } catch {} 

package/test/models/SdcUser.js

@@ -38,7 +38,7 @@ export default class SdcUser extends SdcModel {
 
   setValues(data = {}) {
     try {
-      this.id = data.id ?? data.pk ?? null;
+      this.id = data.id ?? data.id ?? null;
     } catch {}
     try {
       this.username = data.username ?? null;

package/test/utils.js

@@ -39,9 +39,6 @@ export class TestCtrA extends AbstractSDC {
     sayB() {
         return 'B'
     }
-
-    onInit() {
-    }
 }
 
 export class TestList extends AbstractSDC {
@@ -52,11 +49,12 @@ export class TestList extends AbstractSDC {
         this.number = 0;
     }
 
-    onInit(number = 10) {
+    onInit({ number = 10 }) {
         this.number = number;
     }
 
     onLoad(html) {
+        this.onInit(this.params)
         $(html).append('<div><this.listview></this.listview></div>');
         return super.onLoad(html);
     }
@@ -78,11 +76,12 @@ export class TestItem extends AbstractSDC {
         this.events.unshift({});
     }
 
-    onInit(idx) {
+    onInit({ idx }) {
         this.idx = idx;
     }
 
     onLoad(html) {
+        this.onInit(this.params);
         $(html).append(`<input name="i_${this.idx}" />`);
         return super.onLoad(html);
     }

package/test/view.test.js

@@ -149,6 +149,7 @@ describe('Controller reconcile', () => {
         await new Promise((resolve) => setTimeout(resolve, 1000))
         const newList = $('body').find('input').toArray();
         expect(newList.length).toBe(5);
+
         newList.forEach((x, i) => {
             expect(x).toBe(oldList[i]);
         });