Persist file name when exits

mendixlabs · Jan 2, 2019 · c71c35b · c71c35b
1 parent a372f2b
commit c71c35b
Show file tree

Hide file tree

Showing 4 changed files with 215 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "signature",
   "widgetName": "Signature",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A signature pad for capturing signatures",
   "scripts": {
     "build": "grunt release",
@@ -76,7 +76,7 @@
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "^2.0.13",
     "mendix-client": "^7.15.3",
-    "mendix-widget-build-script": "^1.0.0",
+    "mendix-widget-build-script": "^1.0.3",
     "node-sass": "^4.9.4",
     "pre-commit": "^1.2.2",
     "raw-loader": "^0.5.1",

diff --git a/src/components/SignatureContainer.ts b/src/components/SignatureContainer.ts
@@ -95,7 +95,7 @@ class SignatureContainer extends Component<SignatureContainerProps, SignatureCon
 
     private saveDocument(callback: () => void) {
         if (this.base64Uri && this.state.hasSignature) {
-            mx.data.saveDocument(this.props.mxObject.getGuid(), this.generateFileName(), { },
+            mx.data.saveDocument(this.props.mxObject.getGuid(), this.generateFileName(this.props.mxObject), { },
                 Utils.convertUrlToBlob(this.base64Uri),
                 callback,
                 error => mx.ui.error("Error saving signature: " + error.message)
@@ -105,7 +105,11 @@ class SignatureContainer extends Component<SignatureContainerProps, SignatureCon
         }
     }
 
-    private generateFileName(): string {
+    private generateFileName(mxObject: mendix.lib.MxObject): string {
+        const currentName = mxObject.get("Name") as string;
+        if (currentName) {
+            return currentName;
+        }
         return `signature${Math.floor(Math.random() * 1000000)}.png`;
     }
 

diff --git a/src/package.xml b/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="Signature" version="1.0.1" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="Signature" version="1.0.2" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="Signature.xml" />
         </widgetFiles>