@ruiapp/rapid-core 0.1.71 → 0.1.73

package/src/dataAccess/propertyMapper.ts

@@ -1,27 +1,28 @@
-import { RpdDataModel } from "~/types";
-import { isRelationProperty } from "../helpers/metaHelper";
-
-export function mapPropertyNameToColumnName(model: RpdDataModel, propertyName: string) {
-  if (!model.properties) {
-    return propertyName;
-  }
-
-  const property = model.properties.find((item) => item.code === propertyName);
-  if (!property) {
-    return propertyName;
-  }
-
-  if (isRelationProperty(property) && property.relation === "one") {
-    return property.targetIdColumnName!;
-  }
-
-  return property.columnName || property.code;
-}
-
-export function mapPropertyNamesToColumnNames(model: RpdDataModel, propertyNames: string[]) {
-  if (!propertyNames || !propertyNames.length) {
-    return [];
-  }
-
-  return propertyNames.map((fieldName) => mapPropertyNameToColumnName(model, fieldName));
-}
+import { RpdDataModel } from "~/types";
+import { getEntityPropertyByCode, isOneRelationProperty } from "../helpers/metaHelper";
+import { IRpdServer } from "~/core/server";
+
+export function mapPropertyNameToColumnName(server: IRpdServer, model: RpdDataModel, propertyName: string) {
+  if (!model.properties) {
+    return propertyName;
+  }
+
+  const property = getEntityPropertyByCode(server, model, propertyName);
+  if (!property) {
+    return propertyName;
+  }
+
+  if (isOneRelationProperty(property)) {
+    return property.targetIdColumnName!;
+  }
+
+  return property.columnName || property.code;
+}
+
+export function mapPropertyNamesToColumnNames(server: IRpdServer, model: RpdDataModel, propertyNames: string[]) {
+  if (!propertyNames || !propertyNames.length) {
+    return [];
+  }
+
+  return propertyNames.map((fieldName) => mapPropertyNameToColumnName(server, model, fieldName));
+}

package/src/helpers/metaHelper.ts

@@ -61,3 +61,16 @@ export function getEntityProperty(server: IRpdServer, model: RpdDataModel, predi
 
   return property;
 }
+
+export function getEntityPropertyByFieldName(server: IRpdServer, model: RpdDataModel, fieldName: string) {
+  let property = getEntityPropertyByCode(server, model, fieldName);
+  if (!property) {
+    property = getEntityProperty(server, model, (item) => item.relation === "one" && item.targetIdColumnName === fieldName);
+  }
+
+  if (!property) {
+    property = getEntityProperty(server, model, (item) => item.columnName === fieldName);
+  }
+
+  return property;
+}

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

@@ -1,28 +1,33 @@
-import path from "path";
-import { readFile } from "~/utilities/fsUtility";
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
-
-export const code = "downloadFile";
-
-export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
-  const { server, applicationConfig, routerContext, input } = ctx;
-  const { request, response } = routerContext;
-
-  const dataAccessor = ctx.server.getDataAccessor({
-    singularCode: "ecm_storage_object",
-  });
-
-  const storageObject = await dataAccessor.findById(input.fileId);
-  if (!storageObject) {
-    ctx.output = { error: new Error("Storage object not found.") };
-    return;
-  }
-
-  const fileKey = storageObject.key;
-  const filePathName = path.join(server.config.localFileStoragePath, fileKey);
-  const attachmentFileName = input.fileName || path.basename(fileKey);
-
-  response.body = await readFile(filePathName);
-  response.headers.set("Content-Disposition", `attachment; filename="${encodeURIComponent(attachmentFileName)}"`);
-}
+import path from "path";
+import { readFile } from "~/utilities/fsUtility";
+import { ActionHandlerContext } from "~/core/actionHandler";
+import { RapidPlugin } from "~/core/server";
+
+export const code = "downloadFile";
+
+export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
+  const { server, applicationConfig, routerContext, input } = ctx;
+  const { request, response } = routerContext;
+  //TODO: only public files can download by this handler
+
+  let fileKey: string = input.fileKey;
+
+  if (!fileKey && input.fileId) {
+    const dataAccessor = ctx.server.getDataAccessor({
+      singularCode: "ecm_storage_object",
+    });
+
+    const storageObject = await dataAccessor.findById(input.fileId);
+    if (!storageObject) {
+      ctx.output = { error: new Error("Storage object not found.") };
+      return;
+    }
+
+    fileKey = storageObject.key;
+  }
+  const filePathName = path.join(server.config.localFileStoragePath, fileKey);
+  const attachmentFileName = input.fileName || path.basename(fileKey);
+
+  response.body = await readFile(filePathName);
+  response.headers.set("Content-Disposition", `attachment; filename="${encodeURIComponent(attachmentFileName)}"`);
+}