frappe-ui 0.0.61 → 0.0.62

package/package.json

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

package/src/resources/documentResource.js

@@ -99,29 +99,40 @@ export function createDocumentResource(options, vm) {
     setDoc,
   })
 
-  for (let method in options.whitelistedMethods) {
-    let methodName = options.whitelistedMethods[method]
-    out[method] = createResource(
+  for (let methodKey in options.whitelistedMethods) {
+    let methodOptions = options.whitelistedMethods[methodKey]
+    if (typeof methodOptions == 'string') {
+      methodOptions = {
+        method: methodOptions,
+      }
+    }
+    let { method, onSuccess, ...otherOptions } = methodOptions
+    out[methodKey] = createResource(
       {
         method: 'run_doc_method',
         makeParams(values) {
           return {
             dt: out.doctype,
             dn: out.name,
-            method: methodName,
+            method: method,
             args: JSON.stringify(values),
           }
         },
         onSuccess(data) {
           if (data.docs) {
             for (let doc of data.docs) {
-              if (doc.doctype === out.doctype && doc.name === out.name) {
+              if (
+                doc.doctype === out.doctype &&
+                doc.name.toString() === out.name.toString()
+              ) {
                 out.doc = transform(doc)
                 break
               }
             }
           }
+          onSuccess?.call(vm, out.doc)
         },
+        ...otherOptions,
       },
       vm
     )

package/src/resources/plugin.js

@@ -74,6 +74,10 @@ let createMixin = (mixinOptions) => ({
     $getDocumentResource(doctype, name) {
       return getCachedDocumentResource(doctype, name)
     },
+    $getDoc(doctype, name) {
+      let resource = this.$getDocumentResource(doctype, name)
+      return resource ? resource.doc : null
+    },
     $getListResource(cacheKey) {
       return getCachedListResource(cacheKey)
     },

package/src/resources/resources.js

@@ -74,13 +74,11 @@ export function createResource(options, vm, getResource) {
       try {
         invalidMessage = await validateFunction.call(vm, out.params)
         if (invalidMessage && typeof invalidMessage == 'string') {
-          out.loading = false
           let error = new Error(invalidMessage)
           handleError(error, errorFunctions)
           return
         }
       } catch (error) {
-        out.loading = false
         handleError(error, errorFunctions)
         return
       }
@@ -131,6 +129,7 @@ export function createResource(options, vm, getResource) {
   }
 
   function handleError(error, errorFunctions) {
+    out.loading = false
     if (out.previousData) {
       out.data = out.previousData
     }