@saltcorn/server 0.8.5 → 0.8.6-beta.1

package/locales/en.json

@@ -1150,5 +1150,8 @@
 	"Tenant Base URL": "Tenant Base URL",
 	"Base hostname for newly created tenants. If unset, defaults to hostname": "Base hostname for newly created tenants. If unset, defaults to hostname",
 	"Redirect unathorized": "Redirect unathorized",
-	"If tenant creation is not authorized, redirect to this URL": "If tenant creation is not authorized, redirect to this URL"
+	"If tenant creation is not authorized, redirect to this URL": "If tenant creation is not authorized, redirect to this URL",
+	"Import table %s": "Import table %s",
+	"Import CSV": "Import CSV",
+	"Show configuration object": "Show configuration object"
 }

package/locales/pl.json

@@ -1122,5 +1122,36 @@
 	"Mem usage": "Zużycie pamięci",
 	"The field that will be shown to the user when choosing a value": "Pole jakie będzie pokazane użytkownikowi przy wyborze wartości",
 	"String value must match regular expression": "Wartość ciągu musi odpowiadać wyrażeniu regularnemu",
-	"Modules up-to-date. Please restart server": "Moduły zaktualizowane. Proszę zresetować serwer"
+	"Modules up-to-date. Please restart server": "Moduły zaktualizowane. Proszę zresetować serwer",
+	"Install git plugins": "Zainstaluj wtyczki git",
+	"Set available npm modules": "Ustaw dostępne moduły npm",
+	"Only store modules can be installed on tenant instances": "Tylko moduły ze sklepu mogą być zainstalowane na instancjach tenantów",
+	"Unsafe modules": "Moduly niezabezpieczone",
+	"Notifications": "Powiadomienia",
+	"No notifications": "Bez powiadomień",
+	"In user menu": "W menu użytkownika",
+	"Show notifications in the user menu": "Pokaż powiadomienia w menu użytkownika",
+	"Notification settings": "Ustawienia powiadomień",
+	"PWA": "PWA",
+	"Progressive Web Application": "Progresywna Aplikacja Webowa",
+	"Display": "Wyświetlanie",
+	"Progressive Web Application enabled": "Progresywna Aplikacja Webowa włączona",
+	"Saltcorn test email": "E-mail testowy Saltcorn",
+	"Hello from Saltcorn": "Cześć od Saltcorn",
+	"Set colors": "Ustaw kolory",
+	"Theme color": "Kolor motywu",
+	"Background color": "Kolor tła",
+	"Table provider": "Dostawca tabeli",
+	"Database table": "Tabela bazy danych",
+	"Configure provider": "Skonfiguruj dostawcę",
+	"In scope:": "W ramach:",
+	"SSL expiry": "Wygaśnięcie SSL",
+	"A page with this name already exists": "Strona z tą nazwą już istnieje",
+	"Tenant Base URL": "Bazowy URL tenanta",
+	"Base hostname for newly created tenants. If unset, defaults to hostname": "Bazowa nazwa hosta dla nowo utworzonych tenantów. Jeżeli nie ustawione, domyślnie do nazwy hosta",
+	"Redirect unathorized": "Przekierowanie nieautoryzowane",
+	"If tenant creation is not authorized, redirect to this URL": "Jeżeli utworzenie tenanta nie jest autoryzowane, przekieruj do tego URL",
+	"Import table %s": "Importuj tabelę %s",
+	"Import CSV": "Importuj CSV",
+	"Show configuration object": "Pokaż obiekt konfiguracji"
 }

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.5",
+  "version": "0.8.6-beta.1",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.8.5",
-    "@saltcorn/builder": "0.8.5",
-    "@saltcorn/data": "0.8.5",
-    "@saltcorn/admin-models": "0.8.5",
-    "@saltcorn/filemanager": "0.8.5",
-    "@saltcorn/markup": "0.8.5",
-    "@saltcorn/sbadmin2": "0.8.5",
+    "@saltcorn/base-plugin": "0.8.6-beta.1",
+    "@saltcorn/builder": "0.8.6-beta.1",
+    "@saltcorn/data": "0.8.6-beta.1",
+    "@saltcorn/admin-models": "0.8.6-beta.1",
+    "@saltcorn/filemanager": "0.8.6-beta.1",
+    "@saltcorn/markup": "0.8.6-beta.1",
+    "@saltcorn/sbadmin2": "0.8.6-beta.1",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/routes/files.js

@@ -14,7 +14,12 @@ const resizer = require("resize-with-sharp-or-jimp");
 const db = require("@saltcorn/data/db");
 
 const { renderForm } = require("@saltcorn/markup");
-const { isAdmin, error_catcher, setTenant } = require("./utils.js");
+const {
+  isAdmin,
+  error_catcher,
+  setTenant,
+  is_relative_url,
+} = require("./utils.js");
 const { h1, div, text } = require("@saltcorn/markup/tags");
 const { editRoleForm, fileUploadForm } = require("../markup/forms.js");
 const { strictParseInt } = require("@saltcorn/data/plugin-helper");
@@ -441,6 +446,7 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const serve_path = req.params[0];
+    const { redirect } = req.query;
     const f = await File.findOne(serve_path);
     if (!f) {
       req.flash("error", "File not found");
@@ -460,7 +466,12 @@ router.post(
       }
       req.flash("error", result.error);
     }
-    res.redirect(`/files?dir=${encodeURIComponent(f.current_folder)}`);
+    if (!req.xhr)
+      res.redirect(
+        (is_relative_url(redirect) && redirect) ||
+          `/files?dir=${encodeURIComponent(f.current_folder)}`
+      );
+    else res.json({ success: true });
   })
 );
 

package/routes/tables.js

@@ -17,6 +17,7 @@ const {
   link,
   settingsDropdown,
   post_delete_btn,
+  post_btn,
   post_dropdown_item,
 } = require("@saltcorn/markup");
 const {
@@ -52,7 +53,7 @@ const { getState } = require("@saltcorn/data/db/state");
 const { cardHeaderTabs } = require("@saltcorn/markup/layout_utils");
 const { tablesList } = require("./common_lists");
 const { InvalidConfiguration } = require("@saltcorn/data/utils");
-
+const path = require("path");
 /**
  * @type {object}
  * @const
@@ -1463,6 +1464,89 @@ router.post(
   })
 );
 
+const previewCSV = async ({ newPath, table, req, res, full }) => {
+  let parse_res;
+  try {
+    parse_res = await table.import_csv_file(newPath, {
+      recalc_stored: true,
+      no_table_write: true,
+    });
+  } catch (e) {
+    parse_res = { error: e.message };
+  }
+  if (parse_res.error) {
+    if (parse_res.error) req.flash("error", parse_res.error);
+    await fs.unlink(newPath);
+    res.redirect(`/table/${table.id}`);
+  } else {
+    const rows = parse_res.rows || [];
+    res.sendWrap(req.__(`Import table %s`, table.name), {
+      above: [
+        {
+          type: "breadcrumbs",
+          crumbs: [
+            { text: req.__("Tables"), href: "/table" },
+            { href: `/table/${table.id}`, text: table.name },
+            {
+              text: req.__("Import CSV"),
+            },
+          ],
+        },
+        {
+          type: "card",
+          title: req.__(`Import CSV`),
+          contents: div(
+            {
+              "data-csv-filename": path.basename(newPath),
+            },
+            p(parse_res.success),
+            post_btn(
+              `/files/delete/${path.basename(newPath)}?redirect=/table/${
+                table.id
+              }}`,
+              "Cancel",
+              req.csrfToken(),
+              {
+                btnClass: "btn-danger",
+                formClass: "d-inline me-2",
+                icon: "fa fa-times",
+              }
+            ),
+            post_btn(
+              `/table/finish_upload_to_table/${table.name}/${path.basename(
+                newPath
+              )}`,
+              "Proceed",
+              req.csrfToken(),
+              { icon: "fa fa-check", formClass: "d-inline" }
+            )
+          ),
+        },
+        {
+          type: "card",
+          title: req.__(`Preview`),
+          contents: div(
+            mkTable(
+              table.fields.map((f) => ({ label: f.name, key: f.name })),
+              full ? rows : rows.slice(0, 10)
+            ),
+            !full &&
+              rows.length > 10 &&
+              a(
+                {
+                  href: `/table/preview_full_csv_file/${
+                    table.name
+                  }/${path.basename(newPath)}`,
+                },
+                `See all ${rows.length} rows`
+              )
+          ),
+        },
+      ],
+    });
+  }
+};
+
 /**
  * Import Table Data from CSV POST handler
  * @name post/upload_to_table/:name,
@@ -1486,15 +1570,39 @@ router.post(
     const newPath = File.get_new_path();
     await req.files.file.mv(newPath);
     //console.log(req.files.file.data)
+    await previewCSV({ newPath, table, res, req });
+  })
+);
+
+router.get(
+  "/preview_full_csv_file/:name/:filename",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { name, filename } = req.params;
+    const table = await Table.findOne({ name });
+    const f = await File.findOne(filename);
+    await previewCSV({ newPath: f.location, table, res, req, full: true });
+  })
+);
+
+router.post(
+  "/finish_upload_to_table/:name/:filename",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { name, filename } = req.params;
+    const table = await Table.findOne({ name });
+    const f = await File.findOne(filename);
+
     try {
-      const parse_res = await table.import_csv_file(newPath, true);
+      const parse_res = await table.import_csv_file(f.location, {
+        recalc_stored: true,
+      });
       if (parse_res.error) req.flash("error", parse_res.error);
       else req.flash("success", parse_res.success);
     } catch (e) {
       req.flash("error", e.message);
     }
-
-    await fs.unlink(newPath);
+    await fs.unlink(f.location);
     res.redirect(`/table/${table.id}`);
   })
 );

package/routes/viewedit.js

@@ -15,6 +15,7 @@ const {
   script,
   text,
   domReady,
+  code,
   pre,
 } = require("@saltcorn/markup/tags");
 
@@ -325,6 +326,20 @@ router.get(
           ),
           contents: renderForm(form, req.csrfToken()),
         },
+        {
+          type: "card",
+
+          title: req.__("View configuration"),
+          contents: {
+            type: "tabs",
+            contents: [
+              pre(code(JSON.stringify(viewrow.configuration, null, 2))),
+            ],
+            tabsStyle: "Accordion",
+            startClosed: true,
+            titles: [req.__("Show configuration object")],
+          },
+        },
       ],
     });
   })

package/tests/table.test.js

@@ -156,13 +156,25 @@ Pencil, 0.5,2, t`;
   it("should upload csv to existing table", async () => {
     const csv = `author,Pages
 Joe Celko, 856
-Gordon Kane, 217`;
+Gordon Kane, 218`;
     const loginCookie = await getAdminLoginCookie();
     const app = await getApp({ disableCsrf: true });
+    let filename;
     await request(app)
       .post("/table/upload_to_table/books")
       .set("Cookie", loginCookie)
       .attach("file", Buffer.from(csv, "utf-8"))
+      .expect(toInclude(">Preview<"))
+      .expect(toInclude("Proceed"))
+      .expect((res) => {
+        filename = res.text.match(
+          /data-csv-filename\=\"([A-Za-z0-9 _\-]*)\"/
+        )[1];
+      });
+
+    await request(app)
+      .post(`/table/finish_upload_to_table/books/${filename}`)
+      .set("Cookie", loginCookie)
       .expect(toRedirect("/table/2"));
     await request(app)
       .get(`/table/2`)