fix checks for Model instance.isFeathersVuexInstance

hamiltoes · hamiltoes · commit b8bb433d6d3e · 2020-04-10T13:48:01.000+12:00
diff --git a/src/service-module/service-module.actions.ts b/src/service-module/service-module.actions.ts
@@ -318,7 +318,10 @@ export default function makeServiceActions(service: Service<any>) {
 
       const isIdOk = id !== null && id !== undefined
 
-      if (service.FeathersVuexModel && !item.isFeathersVuexInstance) {
+      if (
+        service.FeathersVuexModel &&
+        !(item instanceof service.FeathersVuexModel)
+      ) {
         item = new service.FeathersVuexModel(item)
       }
 
diff --git a/src/service-module/service-module.mutations.ts b/src/service-module/service-module.mutations.ts
@@ -71,7 +71,7 @@ export default function makeServiceMutations() {
         if (state.ids.includes(id)) {
           // Completely replace the item
           if (replaceItems) {
-            if (Model && !item.isFeathersVuexInstance) {
+            if (Model && !(item instanceof Model)) {
               item = new Model(item)
             }
             Vue.set(state.keyedById, id, item)

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,10 @@ export default function makeServiceActions(service: Service<any>) {`
`318`	`318`
`319`	`319`	`const isIdOk = id !== null && id !== undefined`
`320`	`320`
`321`		`- if (service.FeathersVuexModel && !item.isFeathersVuexInstance) {`
	`321`	`+ if (`
	`322`	`+ service.FeathersVuexModel &&`
	`323`	`+ !(item instanceof service.FeathersVuexModel)`
	`324`	`+ ) {`
`322`	`325`	`item = new service.FeathersVuexModel(item)`
`323`	`326`	`}`
`324`	`327`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ export default function makeServiceMutations() {`
`71`	`71`	`if (state.ids.includes(id)) {`
`72`	`72`	`// Completely replace the item`
`73`	`73`	`if (replaceItems) {`
`74`		`- if (Model && !item.isFeathersVuexInstance) {`
	`74`	`+ if (Model && !(item instanceof Model)) {`
`75`	`75`	`item = new Model(item)`
`76`	`76`	`}`
`77`	`77`	`Vue.set(state.keyedById, id, item)`