checkpoint

eveffer · eveffer · commit 7544b46f186e · 2025-09-16T16:01:15.000+03:00
diff --git a/src/data-import/csv-utils.ts b/src/data-import/csv-utils.ts
@@ -37,8 +37,13 @@ function parseCSV(data: string) {
     currentLine += char;
     i++;
   }
+  let unnamed = 1;
   const headers: Array<string> = (lines[0] || []).map((header) => {
-    const snake = convertString(header.trim(), "snake").replace(/_+/g, "_");
+    let snake = convertString(header.trim(), "snake").replace(/_+/g, "_");
+    if (!snake) {
+      snake = `unnamed_${unnamed}`;
+      unnamed++;
+    }
     return convertString(snake, "camel");
   });
   const records: Array<Record<string, unknown>> = [];
diff --git a/src/data-import/data-import.ts b/src/data-import/data-import.ts
@@ -4,11 +4,29 @@ import { csvUtils } from "./csv-utils.ts";
 import type { GenericEntry } from "../orm/entry/entry-base.ts";
 import type { Entry } from "../orm/entry/entry.ts";
 import { handlePgError, isPgError } from "../orm/db/postgres/pgError.ts";
+import { dateUtils } from "@inspatial/cloud/utils";
 
 export const dataImport = defineEntry("dataImport", {
   label: "",
   description: "",
+  titleField: "title",
+  defaultListFields: [
+    "title",
+    "entryType",
+    "status",
+    "importType",
+    "totalRecords",
+    "successfulRecords",
+    "failedRecords",
+  ],
   fields: [{
+    key: "title",
+    label: "Title",
+    type: "DataField",
+    required: true,
+    readOnly: true,
+    defaultValue: "",
+  }, {
     key: "csv",
     label: "",
     type: "FileField",
@@ -26,10 +44,12 @@ export const dataImport = defineEntry("dataImport", {
     label: "Status",
     type: "ChoicesField",
     choices: [
-      { key: "pending", label: "Pending" },
-      { key: "processing", label: "Processing" },
-      { key: "completed", label: "Completed" },
-      { key: "failed", label: "Failed" },
+      { key: "pending", label: "Pending", color: "primary" },
+      { key: "processing", label: "Processing", color: "warning" },
+      { key: "readyForImport", label: "Ready to Import", color: "info" },
+      { key: "importing", label: "Importing", color: "warning" },
+      { key: "completed", label: "Completed", color: "success" },
+      { key: "failed", label: "Failed", color: "error" },
     ],
     defaultValue: "pending",
     readOnly: true,
@@ -77,11 +97,20 @@ export const dataImport = defineEntry("dataImport", {
     type: "IntField",
     defaultValue: 0,
     readOnly: true,
+  }, {
+    key: "sampleData",
+    label: "Sample Data",
+    type: "JSONField",
+    readOnly: true,
   }, {
     key: "errorMessage",
     label: "Error Message",
     type: "TextField",
     readOnly: true,
+  }, {
+    key: "importColumns",
+    type: "ListField",
+    readOnly: true,
   }],
 });
 
@@ -92,6 +121,17 @@ dataImport.addHook("validate", {
     const result = orm.getEntryType(entryType as EntryName);
   },
 });
+dataImport.addHook("beforeUpdate", {
+  name: "generateTitle",
+  description: "Generates the title from the create date and entry type",
+  handler({ dataImport }) {
+    const date = dateUtils.getPrettyDate(dataImport.$createdAt, {
+      format: "yyyy-mm-dd",
+      showTime: true,
+    });
+    dataImport.$title = `Import ${dataImport.$entryType__title} - ${date}`;
+  },
+});
 dataImport.addChild("columnMap", {
   fields: [{
     key: "columnName",
@@ -115,6 +155,7 @@ dataImport.addChild("columnMap", {
   }],
 });
 dataImport.addAction("getContent", {
+  private: true,
   async action({ dataImport, orm }) {
     if (!dataImport.$csv) {
       return { success: false, message: "No CSV file provided" };
@@ -128,13 +169,29 @@ dataImport.addAction("getContent", {
   },
 });
 dataImport.addAction("processInfo", {
+  label: "Process CSV",
+  description:
+    "Reads the contents of the uploaded CSV and creates the column map and sets the total row count available for import.",
   async action({ dataImport, orm }) {
-    const result = await dataImport.runAction("getContent") as {
+    dataImport.$errorMessage = "";
+    dataImport.$totalRecords = null;
+    dataImport.$successfulRecords = null;
+    dataImport.$failedRecords = null;
+    dataImport.$status = "processing";
+    await dataImport.save();
+
+    const result = await dataImport.runAction("getContent").catch((e) => {
+      return {
+        success: false,
+        message: e instanceof Error ? e.message : "Unknown error",
+      };
+    }) as {
       success: boolean;
       message?: string;
       headers?: Array<string>;
       records?: Array<Record<string, unknown>>;
     };
+
     if (!result.success) {
       dataImport.$status = "failed";
       await dataImport.save();
@@ -153,6 +210,10 @@ dataImport.addAction("processInfo", {
       ) => [key, `${dataImport.$entryType}:${key}`]),
     );
     const firstRecord = new Map<string, any>(Object.entries(records[0] || {}));
+
+    const sampleData = records.slice(0, 10);
+    dataImport.$sampleData = { data: sampleData };
+
     const columnMapData = headers.map((header) => ({
       columnName: header,
       exampleData: (firstRecord.get(header) || "").toString().slice(0, 255),
@@ -161,10 +222,14 @@ dataImport.addAction("processInfo", {
 
     dataImport.$columnMap.update(columnMapData);
     dataImport.$totalRecords = records.length;
+    dataImport.$status = "readyForImport";
+    dataImport.$importColumns = headers;
     await dataImport.save();
   },
 });
 dataImport.addAction("import", {
+  label: "Run Import",
+  description: "Imports the data from the CSV based on the current settings.",
   async action({ dataImport, orm }) {
     const dataMap = dataImport.$columnMap.data.filter((col) => col.mapTo).map(
       (col) => ({
diff --git a/src/files/actions/upload-file.ts b/src/files/actions/upload-file.ts
@@ -1,29 +1,19 @@
-import { CloudAPIAction } from "~/api/cloud-action.ts";
+import { defineAPIAction } from "~/api/cloud-action.ts";
 import MimeTypes from "../mime-types/mime-types.ts";
 import { joinPath } from "~/utils/path-utils.ts";
 import type { CloudFile, GlobalCloudFile } from "#types/models.ts";
-export const uploadFile = new CloudAPIAction("upload", {
+
+export const uploadFile = defineAPIAction("upload", {
   label: "Upload File",
   raw: true,
-  params: [{
-    key: "global",
-    type: "BooleanField",
-  }, {
-    key: "publicFile",
-    type: "BooleanField",
-  }, {
-    key: "optimizeImage",
-    type: "BooleanField",
-  }, {
-    key: "optimizeWidth",
-    type: "IntField",
-  }, {
-    key: "optimizeHeight",
-    type: "IntField",
-  }, {
-    key: "optimizeFormat",
-    type: "DataField",
-  }],
+  params: [
+    { key: "global", type: "BooleanField" },
+    { key: "publicFile", type: "BooleanField" },
+    { key: "optimizeImage", type: "BooleanField" },
+    { key: "optimizeWidth", type: "IntField" },
+    { key: "optimizeHeight", type: "IntField" },
+    { key: "optimizeFormat", type: "DataField" },
+  ],
   async action(
     {
       inCloud,
diff --git a/src/orm/field/fields/list-field.ts b/src/orm/field/fields/list-field.ts
@@ -14,6 +14,11 @@ export default new ORMFieldConfig("ListField", {
     return true;
   },
   dbSave(value, _fieldDef) {
+    if (Array.isArray(value)) {
+      value = JSON.stringify(value);
+    } else {
+      value = JSON.stringify([]);
+    }
     return value;
   },
 });
diff --git a/src/types/models.ts b/src/types/models.ts
@@ -4952,6 +4952,12 @@ export interface ApiGroupPermission
 }
 
 type DataImportFields = {
+  /**
+   * **Title** (DataField)
+   * @type {string}
+   * @required true
+   */
+  title: string;
   /**
    * **Csv** (FileField)
    * @type {string}
@@ -4967,9 +4973,16 @@ type DataImportFields = {
   entryType: string;
   /**
    * **Status** (ChoicesField)
-   * @type {'pending' | 'processing' | 'completed' | 'failed'}
-   */
-  status?: "pending" | "processing" | "completed" | "failed" | null;
+   * @type {'pending' | 'processing' | 'readyForImport' | 'importing' | 'completed' | 'failed'}
+   */
+  status?:
+    | "pending"
+    | "processing"
+    | "readyForImport"
+    | "importing"
+    | "completed"
+    | "failed"
+    | null;
   /**
    * **Import Type** (ChoicesField)
    * @type {'create' | 'update' | 'upsert'}
@@ -4998,11 +5011,21 @@ type DataImportFields = {
    * @type {number}
    */
   failedRecords?: number | null;
+  /**
+   * **Sample Data** (JSONField)
+   * @type {Record<string, unknown>}
+   */
+  sampleData?: Record<string, unknown> | null;
   /**
    * **Error Message** (TextField)
    * @type {string}
    */
   errorMessage?: string | null;
+  /**
+   * **Import Columns** (ListField)
+   * @type {Array<string>}
+   */
+  importColumns?: Array<string> | null;
   /**
    * **ID** (IDField)
    * @type {string}
@@ -5067,6 +5090,12 @@ type DataImportFields = {
 export interface DataImport extends EntryBase<"dataImport", DataImportFields> {
   _name: "dataImport";
   __fields__: DataImportFields;
+  /**
+   * **Title** (DataField)
+   * @type {string}
+   * @required true
+   */
+  $title: string;
   /**
    * **Csv** (FileField)
    * @type {string}
@@ -5082,9 +5111,16 @@ export interface DataImport extends EntryBase<"dataImport", DataImportFields> {
   $entryType: string;
   /**
    * **Status** (ChoicesField)
-   * @type {'pending' | 'processing' | 'completed' | 'failed'}
-   */
-  $status?: "pending" | "processing" | "completed" | "failed" | null;
+   * @type {'pending' | 'processing' | 'readyForImport' | 'importing' | 'completed' | 'failed'}
+   */
+  $status?:
+    | "pending"
+    | "processing"
+    | "readyForImport"
+    | "importing"
+    | "completed"
+    | "failed"
+    | null;
   /**
    * **Import Type** (ChoicesField)
    * @type {'create' | 'update' | 'upsert'}
@@ -5113,11 +5149,21 @@ export interface DataImport extends EntryBase<"dataImport", DataImportFields> {
    * @type {number}
    */
   $failedRecords?: number | null;
+  /**
+   * **Sample Data** (JSONField)
+   * @type {Record<string, unknown>}
+   */
+  $sampleData?: Record<string, unknown> | null;
   /**
    * **Error Message** (TextField)
    * @type {string}
    */
   $errorMessage?: string | null;
+  /**
+   * **Import Columns** (ListField)
+   * @type {Array<string>}
+   */
+  $importColumns?: Array<string> | null;
   /**
    * **ID** (IDField)
    * @type {string}
diff --git a/src/utils/date-utils.ts b/src/utils/date-utils.ts
@@ -35,7 +35,8 @@ export type DateFormat =
   | "compact"
   | "y/m/d"
   | "full"
-  | "dd.mm.yy";
+  | "dd.mm.yy"
+  | "yyyy-mm-dd";
 
 function formatTime(value: string | undefined, options: {
   showSeconds?: boolean;
@@ -123,6 +124,18 @@ function getPrettyDate(value: string | number | undefined, options?: {
     const year = date.getFullYear();
     return `${day}/${month}/${year}`;
   };
+  const formatymd = (date: Date, withTime?: boolean) => {
+    const day = padZeros(date.getDate());
+    const month = padZeros(date.getMonth() + 1);
+    const year = date.getFullYear();
+    return `${year}-${month}-${day} ${
+      withTime
+        ? ` at ${padZeros(date.getHours())}:${padZeros(date.getMinutes())}${
+          options?.showSeconds ? `:${padZeros(date.getSeconds())}` : ""
+        }`
+        : ""
+    }`;
+  };
   const formatCompact = (date: Date) => {
     const now = new Date();
     const currentYear = now.getFullYear();
@@ -173,6 +186,8 @@ function getPrettyDate(value: string | number | undefined, options?: {
         month: "2-digit",
         year: "2-digit",
       }).replace(/\//g, ".");
+    case "yyyy-mm-dd":
+      return formatymd(date, options?.showTime);
     default: {
       const day = padZeros(date.getDate());
       const month = padZeros(date.getMonth() + 1);
