@ruiapp/rapid-core 0.1.75 → 0.1.77

package/dist/index.js

@@ -412,27 +412,27 @@ class QueryBuilder {
         const { entity } = options;
         let command = "INSERT INTO ";
         command += this.quoteTable(model);
-        const propertyNames = Object.keys(entity);
+        const columnNames = Object.keys(entity);
         let values = "";
-        propertyNames.forEach((propertyName, index) => {
+        columnNames.forEach((columnName, index) => {
             if (index) {
                 values += ", ";
             }
             let property = null;
             if (model) {
-                property = lodash.find(model.properties, (e) => e.code === propertyName);
+                property = lodash.find(model.properties, (e) => (e.columnName || e.code) === columnName);
             }
             const columnType = property ? pgPropertyTypeColumnMap[property.type] : null;
             if (columnType === "jsonb") {
-                params.push(JSON.stringify(entity[propertyName]));
+                params.push(JSON.stringify(entity[columnName]));
                 values += `$${params.length}::jsonb`;
             }
             else {
-                params.push(entity[propertyName]);
+                params.push(entity[columnName]);
                 values += `$${params.length}`;
             }
         });
-        command += ` (${propertyNames.map(this.quoteObject).join(", ")})`;
+        command += ` (${columnNames.map(this.quoteObject).join(", ")})`;
         command += ` VALUES (${values}) RETURNING *`;
         return {
             command,
@@ -452,23 +452,23 @@ class QueryBuilder {
         let command = "UPDATE ";
         command += this.quoteTable(model);
         command += " SET ";
-        const propertyNames = Object.keys(entity);
-        propertyNames.forEach((propertyName, index) => {
+        const columnNames = Object.keys(entity);
+        columnNames.forEach((columnName, index) => {
             if (index) {
                 command += ", ";
             }
-            command += `${this.quoteObject(propertyName)}=`;
+            command += `${this.quoteObject(columnName)}=`;
             let property = null;
             if (model) {
-                property = lodash.find(model.properties, (e) => (e.columnName || e.code) === propertyName);
+                property = lodash.find(model.properties, (e) => (e.columnName || e.code) === columnName);
             }
             const columnType = property ? pgPropertyTypeColumnMap[property.type] : null;
             if (columnType === "jsonb") {
-                params.push(JSON.stringify(entity[propertyName]));
+                params.push(JSON.stringify(entity[columnName]));
                 command += `$${params.length}::jsonb`;
             }
             else {
-                params.push(entity[propertyName]);
+                params.push(entity[columnName]);
                 command += `$${params.length}`;
             }
         });
@@ -5928,9 +5928,10 @@ var downloadDocumentActionHandler = /*#__PURE__*/Object.freeze({
 
 const code$7 = "downloadFile";
 async function handler$7(plugin, ctx, options) {
-    const { server, applicationConfig, routerContext, input } = ctx;
+    const { server, applicationConfig, routerContext } = ctx;
     const { request, response } = routerContext;
     //TODO: only public files can download by this handler
+    const input = ctx.input;
     let fileKey = input.fileKey;
     if (!fileKey && input.fileId) {
         const dataAccessor = ctx.server.getDataAccessor({
@@ -5946,7 +5947,8 @@ async function handler$7(plugin, ctx, options) {
     const filePathName = path__default["default"].join(server.config.localFileStoragePath, fileKey);
     const attachmentFileName = input.fileName || path__default["default"].basename(fileKey);
     response.body = await readFile(filePathName);
-    response.headers.set("Content-Disposition", `attachment; filename="${encodeURIComponent(attachmentFileName)}"`);
+    const dispositionType = input.inline ? "inline" : "attachment";
+    response.headers.set("Content-Disposition", `${dispositionType}; filename="${encodeURIComponent(attachmentFileName)}"`);
 }
 
 var downloadFileActionHandler = /*#__PURE__*/Object.freeze({

package/dist/plugins/fileManage/actionHandlers/downloadFile.d.ts

@@ -1,4 +1,10 @@
 import { ActionHandlerContext } from "../../../core/actionHandler";
 import { RapidPlugin } from "../../../core/server";
+export type DownloadFileInput = {
+    fileId?: string;
+    fileKey?: string;
+    fileName?: string;
+    inline?: boolean;
+};
 export declare const code = "downloadFile";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.1.75",
+  "version": "0.1.77",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/plugins/fileManage/actionHandlers/downloadFile.ts

@@ -3,13 +3,22 @@ import { readFile } from "~/utilities/fsUtility";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { RapidPlugin } from "~/core/server";
 
+export type DownloadFileInput = {
+  fileId?: string;
+  fileKey?: string;
+  fileName?: string;
+  inline?: boolean;
+};
+
 export const code = "downloadFile";
 
 export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
-  const { server, applicationConfig, routerContext, input } = ctx;
+  const { server, applicationConfig, routerContext } = ctx;
   const { request, response } = routerContext;
   //TODO: only public files can download by this handler
 
+  const input: DownloadFileInput = ctx.input;
+
   let fileKey: string = input.fileKey;
 
   if (!fileKey && input.fileId) {
@@ -29,5 +38,7 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
   const attachmentFileName = input.fileName || path.basename(fileKey);
 
   response.body = await readFile(filePathName);
-  response.headers.set("Content-Disposition", `attachment; filename="${encodeURIComponent(attachmentFileName)}"`);
+
+  const dispositionType = input.inline ? "inline" : "attachment";
+  response.headers.set("Content-Disposition", `${dispositionType}; filename="${encodeURIComponent(attachmentFileName)}"`);
 }

package/src/queryBuilder/queryBuilder.ts

@@ -277,28 +277,28 @@ export default class QueryBuilder {
 
     command += this.quoteTable(model);
 
-    const propertyNames: string[] = Object.keys(entity);
+    const columnNames: string[] = Object.keys(entity);
     let values = "";
-    propertyNames.forEach((propertyName, index) => {
+    columnNames.forEach((columnName, index) => {
       if (index) {
         values += ", ";
       }
 
       let property: RpdDataModelProperty | null = null;
       if (model) {
-        property = find(model.properties, (e: RpdDataModelProperty) => e.code === propertyName);
+        property = find(model.properties, (e: RpdDataModelProperty) => (e.columnName || e.code) === columnName);
       }
       const columnType: DataAccessPgColumnTypes | null = property ? pgPropertyTypeColumnMap[property.type] : null;
       if (columnType === "jsonb") {
-        params.push(JSON.stringify(entity[propertyName]));
+        params.push(JSON.stringify(entity[columnName]));
         values += `$${params.length}::jsonb`;
       } else {
-        params.push(entity[propertyName]);
+        params.push(entity[columnName]);
         values += `$${params.length}`;
       }
     });
 
-    command += ` (${propertyNames.map(this.quoteObject).join(", ")})`;
+    command += ` (${columnNames.map(this.quoteObject).join(", ")})`;
     command += ` VALUES (${values}) RETURNING *`;
 
     return {
@@ -322,24 +322,24 @@ export default class QueryBuilder {
     command += this.quoteTable(model);
 
     command += " SET ";
-    const propertyNames: string[] = Object.keys(entity);
-    propertyNames.forEach((propertyName, index) => {
+    const columnNames: string[] = Object.keys(entity);
+    columnNames.forEach((columnName, index) => {
       if (index) {
         command += ", ";
       }
 
-      command += `${this.quoteObject(propertyName)}=`;
+      command += `${this.quoteObject(columnName)}=`;
 
       let property: RpdDataModelProperty | null = null;
       if (model) {
-        property = find(model.properties, (e: RpdDataModelProperty) => (e.columnName || e.code) === propertyName);
+        property = find(model.properties, (e: RpdDataModelProperty) => (e.columnName || e.code) === columnName);
       }
       const columnType: DataAccessPgColumnTypes | null = property ? pgPropertyTypeColumnMap[property.type] : null;
       if (columnType === "jsonb") {
-        params.push(JSON.stringify(entity[propertyName]));
+        params.push(JSON.stringify(entity[columnName]));
         command += `$${params.length}::jsonb`;
       } else {
-        params.push(entity[propertyName]);
+        params.push(entity[columnName]);
         command += `$${params.length}`;
       }
     });