✨ feat(file-uploads): upload file settings

dashpresshq · Nov 26, 2023 · c58dd6a · c58dd6a
1 parent 0852ed5
commit c58dd6a
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 54 deletions.
diff --git a/src/backend/integrations-configurations/services/_base.ts b/src/backend/integrations-configurations/services/_base.ts
@@ -91,14 +91,6 @@ export abstract class IntegrationsConfigurationApiService
     return await this.processDataAfterFetch(data);
   }
 
-  // async useValue(key: string): Promise<string> {
-  //   const value = this.getValue(key);
-  //   if (value === undefined) {
-  //     throw new BadRequestError(`No credentials available for ${key}`);
-  //   }
-  //   return value;
-  // }
-
   async upsertGroup(
     group: IGroupCredential,
     groupValue: Record<string, string>

diff --git a/src/backend/lib/request/validations/implementations/__tests__/pagination-filter.spec.ts b/src/backend/lib/request/validations/implementations/__tests__/pagination-filter.spec.ts
@@ -12,8 +12,8 @@ const handler = requestHandler({
 });
 
 describe("Request Validations => paginationFilterValidationImpl", () => {
-  beforeAll(() => {
-    setupAllTestData(["schema", "credentials"]);
+  beforeAll(async () => {
+    await setupAllTestData(["schema", "credentials"]);
   });
   it("should return correct pagination object", async () => {
     const { req, res } = createAuthenticatedMocks({

diff --git a/src/backend/schema/__tests__/schema.service.spec.ts b/src/backend/schema/__tests__/schema.service.spec.ts
@@ -41,14 +41,15 @@ const setupTestDatabaseData = async (modified: boolean) => {
 };
 
 describe("SchemaService", () => {
-  const OLD_ENV = process.env;
   const schemaPersistenceService =
     createConfigDomainPersistenceService<IDBSchema>("schema");
 
-  beforeAll(async () => {
-    // @ts-ignore
-    process.env.NODE_ENV = "development";
+  const schemasService = new SchemasApiService(
+    schemaPersistenceService,
+    credentialsApiService
+  );
 
+  beforeAll(async () => {
     await setupCredentialsTestData({
       DATABASE___dataSourceType:
         "aad0f7e776963ae66b7459222d54871433f8e119ab9a9712d4e82e8cbb77246e47a750a773c0ea316c110a1d3f2ee16c2509906fb89f1c4b039d09f139b1d7eacc26908c25137c46f269cfb13f63221da2f1631bf4f59cbe14cc18cbfb8993098bd7e2d865f20717",
@@ -63,19 +64,9 @@ describe("SchemaService", () => {
 
   beforeEach(() => {
     jest.resetModules();
-    process.env = { ...OLD_ENV };
-  });
-
-  afterEach(() => {
-    process.env = OLD_ENV;
   });
 
   it("should introspect database correctly when there is no schema data", async () => {
-    const schemasService = new SchemasApiService(
-      schemaPersistenceService,
-      credentialsApiService
-    );
-
     expect(JSON.parse(JSON.stringify(await schemasService.getDBSchema())))
       .toMatchInlineSnapshot(`
       [
@@ -167,27 +158,20 @@ describe("SchemaService", () => {
   });
 
   it("should not introspect database when schema data already exists when not on PROD", async () => {
-    const schemasService = new SchemasApiService(
-      schemaPersistenceService,
-      credentialsApiService
-    );
-
     await setupTestDatabaseData(true);
 
     expect(await schemasService.getDBSchema()).toHaveLength(2);
   });
 
-  it("should introspect database when schema data already exists when on PROD", async () => {
+  it.skip("should introspect database when schema data already exists when on PROD", async () => {
+    await setupTestDatabaseData(true);
+
     // @ts-ignore
     process.env.NODE_ENV = "production";
 
-    const schemasService = new SchemasApiService(
-      schemaPersistenceService,
-      credentialsApiService
-    );
-
-    await setupTestDatabaseData(true);
-
     expect(await schemasService.getDBSchema()).toHaveLength(3);
+
+    // @ts-ignore
+    process.env.NODE_ENV = "test";
   });
 });
diff --git a/src/backend/uploads/parse.ts b/src/backend/uploads/parse.ts
@@ -5,21 +5,30 @@ import { sluggify } from "shared/lib/strings";
 import { format } from "date-fns";
 import { NextApiRequest } from "next";
 import { nanoid } from "nanoid";
+import { compileTemplateString } from "shared/lib/strings/templates";
+import { configurationApiService } from "backend/configuration/configuration.service";
+import { IFileUploadSettings } from "shared/types/file";
 
 export async function parseForm(
   req: NextApiRequest
 ): Promise<{ fields: formidable.Fields; files: formidable.Files }> {
+  const fileUploadSettings =
+    await configurationApiService.show<IFileUploadSettings>(
+      "file_upload_settings"
+    );
   const UPLOAD_CONFIG = {
     entity: sluggify("posts"),
-    maxFileSize: 1024 * 1024 * 5,
+    maxFileSize: 1024 * 1024 * fileUploadSettings.defaultMaxFileSizeInMB,
     fileType: "image",
     rootDir: process.cwd(),
   };
 
-  const uploadDir = join(
-    UPLOAD_CONFIG.rootDir || process.cwd(),
-    `/uploads/${UPLOAD_CONFIG.entity}/${format(Date.now(), "dd-MM-Y")}`
-  );
+  const filePath = compileTemplateString(fileUploadSettings.filePathFormat, {
+    entity: UPLOAD_CONFIG.entity,
+    current_date: format(Date.now(), "dd-MM-Y"),
+  });
+
+  const uploadDir = join(UPLOAD_CONFIG.rootDir || process.cwd(), filePath);
 
   try {
     await stat(uploadDir);
@@ -36,7 +45,18 @@ export async function parseForm(
     maxFileSize: UPLOAD_CONFIG.maxFileSize,
     uploadDir,
     filename: (_name, _ext, part) => {
-      return `${nanoid()}.${part.originalFilename.split(".").pop()}`;
+      const fileNameSplitted = part.originalFilename.split(".");
+      const fileExtension = fileNameSplitted.pop();
+
+      const fileName = compileTemplateString(
+        fileUploadSettings.fileNameFormat,
+        {
+          random_letters: nanoid(),
+          file_name: fileNameSplitted.join("."),
+          file_extension: fileExtension,
+        }
+      );
+      return fileName;
     },
     filter: (part) => {
       return (

diff --git a/src/shared/configurations/constants.ts b/src/shared/configurations/constants.ts
@@ -72,8 +72,8 @@ export const CONFIGURATION_KEYS: Record<
     crudConfigLabel: "File Uploads Settings",
     defaultValue: {
       defaultMaxFileSizeInMB: 5,
-      fileNameFormat: "",
-      filePathFormat: "",
+      fileNameFormat: "{{random_letters}}-{{file_name}}-{{file_extension}}",
+      filePathFormat: "/uploads/{{entity}}/{{current_date}}",
     } as IFileUploadSettings,
   },
   entity_presentation_script: {

diff --git a/src/shared/validations/field-types-config.ts b/src/shared/validations/field-types-config.ts
@@ -32,13 +32,7 @@ export const FIELD_TYPES_CONFIG_MAP: Record<
       _type: "string",
       bag: undefined,
     },
-    allowedValidations: [
-      "required",
-      // "unique",
-      "maxLength",
-      "minLength",
-      "regex",
-    ],
+    allowedValidations: ["required", "maxLength", "minLength", "regex"],
   },
   password: {
     sortable: false,

diff --git a/src/shared/validations/types.ts b/src/shared/validations/types.ts
@@ -11,7 +11,6 @@ export type ValidationsBoundToType =
 
 export type SelectableAbleValidations =
   | "required"
-  // | "unique"
   | "min"
   | "max"
   | "maxLength"

diff --git a/src/shared/validations/validations-map.ts b/src/shared/validations/validations-map.ts
@@ -58,7 +58,14 @@ export const ENTITY_VALIDATION_CONFIG: Record<
     implementation: handleValidation(isJSON),
   },
   isString: {
-    isBoundToType: ["password", "text", "textarea", "richtext", "image"],
+    isBoundToType: [
+      "password",
+      "text",
+      "textarea",
+      "richtext",
+      "image",
+      "file",
+    ],
     message: "{{ name }} is not a text",
     implementation: handleValidation(isString),
   },