frappe-ui 0.0.109 → 0.0.111

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frappe-ui",
-  "version": "0.0.109",
+  "version": "0.0.111",
   "description": "A set of components and utilities for rapid UI development",
   "main": "./src/index.js",
   "scripts": {

package/src/resources/documentResource.js

@@ -6,6 +6,7 @@ import {
   revertRowInListResource,
 } from './listResource'
 import { getLocal, saveLocal } from './local'
+import { onDocUpdate } from './realtime'
 
 let documentCache = reactive({})
 
@@ -165,8 +166,8 @@ export function createDocumentResource(options, vm) {
   }
 
   if (options.realtime && vm.$socket) {
-    vm.$socket.on('list_update', (data) => {
-      if (data.doctype == out.doctype && data.name == out.name) {
+    onDocUpdate(vm.$socket, out.doctype, (name) => {
+      if (name == out.name) {
         out.get.fetch()
       }
     })

package/src/resources/listResource.js

@@ -1,6 +1,7 @@
 import { reactive } from 'vue'
 import { getCacheKey, createResource } from './resources'
 import { saveLocal, getLocal } from './local'
+import { onDocUpdate } from './realtime'
 
 let listCache = reactive({})
 let resourcesByDocType = {}
@@ -32,6 +33,7 @@ export function createListResource(options, vm) {
     parent: options.parent,
     debug: options.debug || 0,
     originalData: null,
+    dataMap: {},
     data: null,
     previous,
     hasPreviousPage: false,
@@ -180,6 +182,7 @@ export function createListResource(options, vm) {
     reload,
     setData,
     transform,
+    getRow,
   })
 
   function update(updatedOptions) {
@@ -227,6 +230,15 @@ export function createListResource(options, vm) {
       data = data.call(vm, out.data)
     }
     out.data = transform(data)
+
+    if (Array.isArray(out.data)) {
+      out.dataMap = {}
+      for (let row of out.data) {
+        if (!row.name) continue
+        let key = row.name.toString()
+        out.dataMap[key] = row
+      }
+    }
   }
 
   function previous() {
@@ -239,13 +251,15 @@ export function createListResource(options, vm) {
     out.list.fetch()
   }
 
+  function getRow(name) {
+    let key = name.toString()
+    return out.dataMap[key]
+  }
+
   if (options.realtime && vm.$socket) {
-    vm.$socket.on('list_update', (data) => {
-      if (
-        data.doctype === out.doctype &&
-        out.originalData?.find((d) => d.name === data.name)
-      ) {
-        out.fetchOne.submit(data.name)
+    onDocUpdate(vm.$socket, out.doctype, (name) => {
+      if (out.originalData?.find((d) => d.name === name)) {
+        out.fetchOne.submit(name)
       }
     })
   }
@@ -302,7 +316,7 @@ export function deleteRowInListResource(doctype, docname) {
   for (let resource of resources) {
     if (resource.originalData) {
       resource.originalData = resource.originalData.filter(
-        (row) => row.name.toString() !== docname
+        (row) => row.name.toString() !== docname.toString()
       )
       resource.data = resource.transform(resource.originalData)
     }

package/src/resources/realtime.js

@@ -0,0 +1,15 @@
+export function onDocUpdate(socket, doctype, callback) {
+  subscribe(socket, doctype)
+  socket.on('list_update', (data) => {
+    if (data.doctype == doctype) {
+      callback(data.name)
+    }
+  })
+}
+
+let subscribed = {}
+function subscribe(socket, doctype) {
+  if (subscribed[doctype]) return
+  socket.emit('doctype_subscribe', doctype)
+  subscribed[doctype] = true
+}

package/src/resources/resources.js

@@ -86,9 +86,7 @@ export function createResource(options, vm) {
       try {
         invalidMessage = await validateFunction.call(vm, out.params)
         if (invalidMessage && typeof invalidMessage == 'string') {
-          let error = new Error(invalidMessage)
-          handleError(error, errorFunctions)
-          return
+          throw new Error(invalidMessage)
         }
       } catch (error) {
         handleError(error, errorFunctions)