@galadrim/galadmin 0.1.99 → 0.1.101

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galadrim/galadmin",
-  "version": "0.1.99",
+  "version": "0.1.101",
   "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/src/api.ts

@@ -257,18 +257,15 @@ export default (db, config, user) => {
 
     const formattedValueToFunction = {}
 
-    function getFormattedValue(column, record) {
+    async function getFormattedValue(column, record) {
         let value;
         try {
 
             record.options = column.options
-            if (column.formattedValueOptimized) {
-                if (!formattedValueToFunction[column.formattedValueOptimized]) {
-                    eval("formattedValueToFunction[column.formattedValueOptimized] = " + column.formattedValueOptimized);
-                }
-                value = formattedValueToFunction[column.formattedValueOptimized](record)
-            } else if (column.formattedValue) {
+            if (column.formattedValue) {
                 value = evalExpression(column.formattedValue, record)
+            } else if (column.formatValue) {
+                value = await column.formatValue(record)
             } else if (column.dataType == "tinyint") {
                 value = record[column.name] == 1 ? "Oui" : "Non"
             } else {
@@ -359,7 +356,7 @@ export default (db, config, user) => {
                     if (columns[j].dataType == 'textarea') {
                         output += '"'
                     }
-                    output += getFormattedValue(columns[j], el)
+                    output += await getFormattedValue(columns[j], el)
                     if (columns[j].dataType == 'textarea') {
                         output += '"'
                     }
@@ -462,18 +459,14 @@ export default (db, config, user) => {
                     }
                 }
 
-                console.log('columns', columns)
-
-                let queryString = "INSERT INTO ?? (" + panel.createConfig.recordIdKey + ", " +columns.map(x => "`" + x + "`").join(", ") + ") VALUES";
+                let queryString = "INSERT INTO ?? (`" + panel.createConfig.recordIdKey + "`, " + columns.map(x => "`" + x + "`").join(", ") + ") VALUES";
                 for (let record of records) {
-                    console.log('record', record)
                     queryString += " (" + fields.recordId[0] + ", " + columns.map(x => formatValueForInsertion(record[x])).join(", ") + "),";
                 }
                 queryString = queryString.slice(0, -1) + " ON DUPLICATE KEY UPDATE";
                 for (let column of columns) {
                     queryString += " `" + column + "` = VALUES(`" + column + "`),"
                 }
-                console.log(queryString)
                 const { err, rows: r } = await db.query(queryString.slice(0, -1), [panel.tableName])
                 if (err) {
                     console.error(err)

package/src/front/build/asset-manifest.json

@@ -1,17 +1,17 @@
 {
   "files": {
     "main.css": "/_HOMEPAGE_/static/css/main.f5549e80.css",
-    "main.js": "/_HOMEPAGE_/static/js/main.bcdd7d54.js",
+    "main.js": "/_HOMEPAGE_/static/js/main.32c8043a.js",
     "static/media/gt-eesti-medium.woff": "/_HOMEPAGE_/static/media/gt-eesti-medium.a48c02fa57e83ab6ddcd.woff",
     "static/media/gt-eesti-regular.woff": "/_HOMEPAGE_/static/media/gt-eesti-regular.304a7ae06ee4a4d5d04a.woff",
     "static/media/logo.png": "/_HOMEPAGE_/static/media/logo.e407b9ca7e302466a07d.png",
     "static/media/cubano.woff": "/_HOMEPAGE_/static/media/cubano.4eaa47ef94222121a371.woff",
     "index.html": "/_HOMEPAGE_/index.html",
     "main.f5549e80.css.map": "/_HOMEPAGE_/static/css/main.f5549e80.css.map",
-    "main.bcdd7d54.js.map": "/_HOMEPAGE_/static/js/main.bcdd7d54.js.map"
+    "main.32c8043a.js.map": "/_HOMEPAGE_/static/js/main.32c8043a.js.map"
   },
   "entrypoints": [
     "static/css/main.f5549e80.css",
-    "static/js/main.bcdd7d54.js"
+    "static/js/main.32c8043a.js"
   ]
 }

package/src/front/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="fr"><head><script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.min.js"></script><script src="https://momentjs.com/downloads/moment-timezone-with-data-10-year-range.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/locale/fr.js"></script><script async="async" defer="defer" src="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.8.0/spectrum.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/air-datepicker/2.2.3/js/datepicker.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/air-datepicker/2.2.3/js/i18n/datepicker.fr.min.js"></script><script async="async" defer="defer" src="https://cdnjs.cloudflare.com/ajax/libs/downloadjs/1.4.8/download.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.4.0/Chart.min.js"></script><script async="async" defer="defer" src="https://cdn.jsdelivr.net/npm/sweetalert"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/quill/1.3.6/quill.min.js"></script><script src="https://sdk.amazonaws.com/js/aws-sdk-2.606.0.min.js"></script><script src="https://kit.fontawesome.com/75b28933ed.js" crossorigin="anonymous" async="async" defer="defer"></script><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/air-datepicker/2.2.3/css/datepicker.min.css"/><link rel="stylesheet" href="/_HOMEPAGE_/spectrum.css"/><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/quill/1.3.6/quill.snow.min.css"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta charset="utf-8"/><link rel="icon" href="/_HOMEPAGE_/favicon.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/_HOMEPAGE_/manifest.json"/><title>Back-office</title><script defer="defer" src="/_HOMEPAGE_/static/js/main.bcdd7d54.js"></script><link href="/_HOMEPAGE_/static/css/main.f5549e80.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="fr"><head><script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.min.js"></script><script src="https://momentjs.com/downloads/moment-timezone-with-data-10-year-range.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/locale/fr.js"></script><script async="async" defer="defer" src="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.8.0/spectrum.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/air-datepicker/2.2.3/js/datepicker.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/air-datepicker/2.2.3/js/i18n/datepicker.fr.min.js"></script><script async="async" defer="defer" src="https://cdnjs.cloudflare.com/ajax/libs/downloadjs/1.4.8/download.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.4.0/Chart.min.js"></script><script async="async" defer="defer" src="https://cdn.jsdelivr.net/npm/sweetalert"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/quill/1.3.6/quill.min.js"></script><script src="https://sdk.amazonaws.com/js/aws-sdk-2.606.0.min.js"></script><script src="https://kit.fontawesome.com/75b28933ed.js" crossorigin="anonymous" async="async" defer="defer"></script><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/air-datepicker/2.2.3/css/datepicker.min.css"/><link rel="stylesheet" href="/_HOMEPAGE_/spectrum.css"/><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/quill/1.3.6/quill.snow.min.css"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta charset="utf-8"/><link rel="icon" href="/_HOMEPAGE_/favicon.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/_HOMEPAGE_/manifest.json"/><title>Back-office</title><script defer="defer" src="/_HOMEPAGE_/static/js/main.32c8043a.js"></script><link href="/_HOMEPAGE_/static/css/main.f5549e80.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>