@adminforth/import-export 1.4.6 → 1.4.8

package/.woodpecker/buildSlackNotify.sh

@@ -4,8 +4,10 @@ set -x
 
 COMMIT_SHORT_SHA=$(echo $CI_COMMIT_SHA | cut -c1-8)
 
+STATUS=${1}  
 
-if [ "$CI_STEP_STATUS" = "success" ]; then
+
+if [ "$STATUS" = "success" ]; then
   MESSAGE="Did a build without issues on \`$CI_REPO_NAME/$CI_COMMIT_BRANCH\`. Commit: _${CI_COMMIT_MESSAGE}_ (<$CI_COMMIT_URL|$COMMIT_SHORT_SHA>)"
 
   curl  -s -X POST -H "Content-Type: application/json" -d '{

package/.woodpecker/release.yml

@@ -16,27 +16,42 @@ steps:
     commands:
       - infisical export --domain https://vault.devforth.io/api --format=dotenv-export --env="prod" > /woodpecker/deploy.vault.env
 
-  release:
+  build:
     image: node:20
     when:
       - event: push
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
     commands:
       - apt update && apt install -y rsync
-      - export $(cat /woodpecker/deploy.vault.env | xargs)
+      - . /woodpecker/deploy.vault.env   
       - npm clean-install
       - /bin/bash ./.woodpecker/buildRelease.sh
       - npm audit signatures
+
+  release:
+    image: node:20
+    when:
+      - event:
+          - push
+        branch:
+          - main
+    commands:
+      - . /woodpecker/deploy.vault.env
       - npx semantic-release
 
   slack-on-failure:
+    image: curlimages/curl
     when:
       - event: push
-        status: [failure, success]
-      - event: push
+        status: [failure]
+    commands:
+      - . /woodpecker/deploy.vault.env
+      - /bin/sh ./.woodpecker/buildSlackNotify.sh failure
+      
+  slack-on-success: 
     image: curlimages/curl
+    when:
+      - event: push
+        status: [success]
     commands:
-      - export $(cat /woodpecker/deploy.vault.env | xargs)
-      - /bin/sh ./.woodpecker/buildSlackNotify.sh
-
+      - . /woodpecker/deploy.vault.env
+      - /bin/sh ./.woodpecker/buildSlackNotify.sh success

package/dist/index.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { AdminForthPlugin, suggestIfTypo, AdminForthFilterOperators, Filters } from "adminforth";
+import { AdminForthPlugin, suggestIfTypo, AdminForthFilterOperators, Filters, AdminForthDataTypes } from "adminforth";
 export default class ImportExport extends AdminForthPlugin {
     constructor(options) {
         super(options, import.meta.url);
@@ -66,9 +66,24 @@ export default class ImportExport extends AdminForthPlugin {
                 });
                 // csv export
                 const columns = this.resourceConfig.columns.filter((col) => !col.virtual);
-                const escapeCSV = (value) => {
-                    if (value === null || value === undefined)
+                const escapeCSV = (value, column) => {
+                    if (value === null || value === undefined) {
                         return '""';
+                    }
+                    if ((column === null || column === void 0 ? void 0 : column.type) === AdminForthDataTypes.FLOAT
+                        || (column === null || column === void 0 ? void 0 : column.type) === AdminForthDataTypes.INTEGER) {
+                        // no quotes for numbers
+                        return String(value);
+                    }
+                    if ((column === null || column === void 0 ? void 0 : column.type) === AdminForthDataTypes.BOOLEAN) {
+                        // no quotes for boolean values
+                        if (value === true) {
+                            return 'true';
+                        }
+                        else if (value === false) {
+                            return 'false';
+                        }
+                    }
                     const str = String(value);
                     if (str.includes(',') || str.includes('"') || str.includes('\n')) {
                         return `"${str.replace(/"/g, '""')}"`;
@@ -76,7 +91,7 @@ export default class ImportExport extends AdminForthPlugin {
                     return `"${str}"`;
                 };
                 let csv = data.data.map((row) => {
-                    return columns.map((col) => escapeCSV(row[col.name])).join(',');
+                    return columns.map((col) => escapeCSV(row[col.name], col)).join(',');
                 }).join('\n');
                 // add headers
                 const headers = columns.map((col) => escapeCSV(col.name)).join(',');

package/index.ts

@@ -1,4 +1,4 @@
-import { AdminForthPlugin, suggestIfTypo, AdminForthFilterOperators, Filters } from "adminforth";
+import { AdminForthPlugin, suggestIfTypo, AdminForthFilterOperators, Filters, AdminForthDataTypes } from "adminforth";
 import type { IAdminForth, IHttpServer, AdminForthResourceColumn, AdminForthComponentDeclaration, AdminForthResource } from "adminforth";
 import type { PluginOptions } from './types.js';
 
@@ -69,8 +69,23 @@ export default class ImportExport extends AdminForthPlugin {
         // csv export
         const columns = this.resourceConfig.columns.filter((col) => !col.virtual);
         
-        const escapeCSV = (value: any) => {
-          if (value === null || value === undefined) return '""';
+        const escapeCSV = (value: any, column?: AdminForthResourceColumn) => {
+          if (value === null || value === undefined) {
+            return '""';
+          }
+          if (column?.type === AdminForthDataTypes.FLOAT 
+              || column?.type === AdminForthDataTypes.INTEGER) {
+            // no quotes for numbers
+            return String(value);
+          }
+          if (column?.type === AdminForthDataTypes.BOOLEAN) {
+            // no quotes for boolean values
+            if (value === true) {
+              return 'true';
+            } else if (value === false) {
+              return 'false';
+            }
+          }
           const str = String(value);
           if (str.includes(',') || str.includes('"') || str.includes('\n')) {
             return `"${str.replace(/"/g, '""')}"`;
@@ -79,7 +94,7 @@ export default class ImportExport extends AdminForthPlugin {
         };
 
         let csv = data.data.map((row) => {
-          return columns.map((col) => escapeCSV(row[col.name])).join(',');
+          return columns.map((col) => escapeCSV(row[col.name], col)).join(',');
         }).join('\n');
 
         // add headers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/import-export",
-  "version": "1.4.6",
+  "version": "1.4.8",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",