fixup upload file

Author: skadefro

OpenFlowNodeRED/src/nodered/nodes/api.html

@@ -1515,6 +1515,16 @@
         <input type="hidden" id="node-input-mimeTypetype">
         <input style="width:70%" type="text" id="node-input-mimeType" placeholder="Mimetype of file">
     </div>
+    <div class="form-row">
+        <label><i class="fa fa-tag"></i> File Content</label>
+        <input type="hidden" id="node-input-contenttype">
+        <input style="width:70%" type="text" id="node-input-content" placeholder="Base64 encoded file content">
+    </div>
+    <div class="form-row">
+        <label><i class="fa fa-list"></i> DB Entity</label>
+        <input type="hidden" id="node-input-entitytype">
+        <input style="width:70%" type="text" id="node-input-entity">
+    </div>
     <div class="form-row">
         <label><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Node name">
@@ -1523,8 +1533,6 @@
 <script type="text/x-red" data-help-name="api upload file">
     Upload a file to API/GridFS<br>
     msg.payload should be a base64 encode string of the file.<br>
-    you can set filename using msg.filename<br>
-    you can set mimeType using msg.mimeType<br>
     to save data with the file set msg.metadata to and javascript object<br>
     </script>
 <script type="text/javascript">
@@ -1534,10 +1542,14 @@
         paletteLabel: 'upload',
         icon: "font-awesome/fa-upload",
         defaults: {
-            filename: { value: "", validate: validate("filenametype"), required: true },
+            filename: { value: "filename", validate: validate("filename"), required: true },
             filenametype: { value: "" },
-            mimeType: { value: "", validate: validate("mimeTypetype"), required: true },
+            content: { value: "payload", validate: validate("content"), required: true },
+            contenttype: { value: "" },
+            mimeType: { value: "", validate: RED.validators.typedInput("mimeTypetype") },
             mimeTypetype: { value: "" },
+            entity: { value: "result", validate: RED.validators.typedInput("mimeTypetype") },
+            entitytype: { value: "" },
             name: { value: "" }
         },
         inputs: 1,
@@ -1551,16 +1563,28 @@
         oneditprepare: function () {
             if (this.filenametype === 'val') $("#node-input-filenametype").val('str');
             $("#node-input-filename").typedInput({
-                default: 'str',
+                default: 'msg',
                 typeField: $("#node-input-filenametype"),
                 types: ['msg', 'str', 'flow', 'global', 'json']
             });
+            if (this.contenttype === 'val') $("#node-input-contenttype").val('str');
+            $("#node-input-content").typedInput({
+                default: 'msg',
+                typeField: $("#node-input-contenttype"),
+                types: ['msg']
+            });
             if (this.mimeTypetype === 'val') $("#node-input-mimeTypetype").val('str');
             $("#node-input-mimeType").typedInput({
                 default: 'str',
                 typeField: $("#node-input-mimeTypetype"),
                 types: ['msg', 'str', 'flow', 'global', 'json']
             });
+            if (this.entitytype === 'val') $("#node-input-entitytype").val('str');
+            $("#node-input-entity").typedInput({
+                default: 'msg',
+                typeField: $("#node-input-entitytype"),
+                types: ['msg']
+            });
         },
     });
 </script>

OpenFlowNodeRED/src/nodered/nodes/api_nodes.ts

@@ -1169,6 +1169,7 @@ export interface Iuploadload_file {
     filename: string;
     mimeType: string;
     name: string;
+    content: string;
 }
 export class upload_file {
     public node: Red = null;
@@ -1187,18 +1188,17 @@ export class upload_file {
             const jwt = msg.jwt;
             const filename = await Util.EvaluateNodeProperty<string>(this, msg, "filename");
             const mimeType = await Util.EvaluateNodeProperty<string>(this, msg, "mimeType");
+            const filecontent = await Util.EvaluateNodeProperty<string>(this, msg, "content");
             let priority: number = 1;
             if (!NoderedUtil.IsNullEmpty(msg.priority)) { priority = msg.priority; }
 
             this.node.status({ fill: "blue", shape: "dot", text: "Saving file" });
-            const file = await NoderedUtil.SaveFile(filename, mimeType, msg.metadata, msg.payload, jwt, priority);
+            const file = await NoderedUtil.SaveFile(filename, mimeType, msg.metadata, filecontent, jwt, priority);
             if (!NoderedUtil.IsNullEmpty(file.error)) { throw new Error(file.error); }
-            msg.filename = file.filename;
-            msg.id = file.id;
-            msg.mimeType = file.mimeType;
-            msg.metadata = file.metadata;
-            msg.payload = file;
 
+            if (!NoderedUtil.IsNullEmpty(this.config.filename)) Util.SetMessageProperty(msg, this.config.filename, file.filename);
+            if (!NoderedUtil.IsNullEmpty(this.config.mimeType)) Util.SetMessageProperty(msg, this.config.mimeType, file.mimeType);
+            if (!NoderedUtil.IsNullEmpty(this.config.content)) Util.SetMessageProperty(msg, this.config.content, file);
             this.node.send(msg);
             this.node.status({});
         } catch (error) {