@saltcorn/server 1.1.2-beta.16 → 1.1.2-beta.18

package/locales/en.json

@@ -1554,5 +1554,8 @@
 	"Search syntax": "Search syntax",
 	"Maximum role": "Maximum role",
 	"Module dependencies": "Module dependencies",
-	"Prompt": "Prompt"
+	"Prompt": "Prompt",
+	"Clean modules and restart": "Clean modules and restart",
+	"Modules cleaned, server restarting...": "Modules cleaned, server restarting...",
+	"Delete table+views+triggers": "Delete table+views+triggers"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.1.2-beta.16",
+  "version": "1.1.2-beta.18",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
@@ -8,14 +8,14 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.735.0",
     "@dr.pogodin/csurf": "^1.14.1",
-    "@saltcorn/base-plugin": "1.1.2-beta.16",
-    "@saltcorn/builder": "1.1.2-beta.16",
-    "@saltcorn/data": "1.1.2-beta.16",
-    "@saltcorn/admin-models": "1.1.2-beta.16",
-    "@saltcorn/filemanager": "1.1.2-beta.16",
-    "@saltcorn/markup": "1.1.2-beta.16",
-    "@saltcorn/plugins-loader": "1.1.2-beta.16",
-    "@saltcorn/sbadmin2": "1.1.2-beta.16",
+    "@saltcorn/base-plugin": "1.1.2-beta.18",
+    "@saltcorn/builder": "1.1.2-beta.18",
+    "@saltcorn/data": "1.1.2-beta.18",
+    "@saltcorn/admin-models": "1.1.2-beta.18",
+    "@saltcorn/filemanager": "1.1.2-beta.18",
+    "@saltcorn/markup": "1.1.2-beta.18",
+    "@saltcorn/plugins-loader": "1.1.2-beta.18",
+    "@saltcorn/sbadmin2": "1.1.2-beta.18",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",

package/routes/admin.js

@@ -117,6 +117,7 @@ const { get_help_markup } = require("../help/index.js");
 const Docker = require("dockerode");
 const npmFetch = require("npm-registry-fetch");
 const Tag = require("@saltcorn/data/models/tag");
+const PluginInstaller = require("@saltcorn/plugins-loader/plugin_installer.js");
 const MarkdownIt = require("markdown-it"),
   md = new MarkdownIt();
 
@@ -841,7 +842,8 @@ const autoBackupForm = (req) => {
         label: req.__("Backup now"),
         id: "btnBackupNow",
         class: "btn btn-outline-secondary",
-        onclick: "ajax_post('/admin/auto-backup-now');press_store_button(this);",
+        onclick:
+          "ajax_post('/admin/auto-backup-now');press_store_button(this);",
       },
     ],
     fields: [
@@ -1565,6 +1567,7 @@ const cleanNodeModules = async () => {
     throw new Error(
       `'${topSaltcornDir}' is not a Saltcorn installation directory`
     );
+  await PluginInstaller.cleanPluginsDirectory();
 };
 
 const doInstall = async (req, res, version, deepClean, runPull) => {

package/routes/plugins.js

@@ -495,6 +495,17 @@ const store_actions_dropdown = (req) => {
           '<i class="far fa-arrow-alt-circle-up"></i>&nbsp;' +
             req.__("Upgrade installed modules")
         ),
+      db.getTenantSchema() === db.connectObj.default_schema &&
+        a(
+          {
+            class: "dropdown-item",
+            href: `/plugins/reinstall-all`,
+            onClick: `notifyAlert('${req.__("Upgrading modules...")}', true)`,
+          },
+          '<i class="fas fa-pump-medical"></i>&nbsp;' +
+            req.__("Clean modules and restart")
+        ),
+
       (db.getTenantSchema() === db.connectObj.default_schema ||
         tenants_install_git) &&
         a(
@@ -558,7 +569,7 @@ const plugin_store_html = (items, req) => {
       },
       {
         besides: items.map(store_item_html(req)),
-        gy:3,
+        gy: 3,
         widths: items.map(() => 4),
       },
     ],
@@ -1397,6 +1408,30 @@ router.get(
   })
 );
 
+/**
+ * @name get/upgrade
+ * @function
+ * @memberof module:routes/plugins~pluginsRouter
+ * @function
+ */
+router.get(
+  "/reinstall-all",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    //TODO make this post
+    const schema = db.getTenantSchema();
+    if (schema === db.connectObj.default_schema) {
+      await PluginInstaller.cleanPluginsDirectory();
+      req.flash("success", req.__(`Modules cleaned, server restarting...`));
+      setTimeout(() => {
+        if (process.send) getState().processSend("RestartServer");
+        else process.exit(0);
+      }, 1000);
+    }
+    res.redirect(`/plugins`);
+  })
+);
+
 /**
  * @name get/upgrade-plugin/:name
  * @function

package/routes/tables.js

@@ -800,7 +800,9 @@ router.get(
     let fieldCard;
     const primaryKeys = fields.filter((f) => f.primary_key);
     const nPrimaryKeys = primaryKeys.length;
-    const nonSerialPKS = primaryKeys.some((f) => f.attributes?.NonSerial);
+    const nonSerialPKS = primaryKeys.some(
+      (f) => f.attributes?.NonSerial && f.type?.name === "Integer"
+    );
 
     if (fields.length === 0) {
       fieldCard = [
@@ -864,11 +866,13 @@ router.get(
         { hover: true }
       );
       fieldCard = [
-        (nPrimaryKeys > 1 || nonSerialPKS) &&
+        (nPrimaryKeys !== 1 || nonSerialPKS) &&
+          !table.external &&
+          !table.provider_name &&
           div(
             { class: "alert alert-danger", role: "alert" },
             i({ class: "fas fa-exclamation-triangle" }),
-            "This table has composite or non-defaulted primary keys, which are not supported in Saltcorn. A procedure to introduce a single autoincrementing primary key is available.",
+            "This table has composite, non-defaulted integer, or no primary keys, which are not supported in Saltcorn. A procedure to introduce a single autoincrementing primary key is available.",
             post_btn(
               `/table/repair-composite-primary/${table.id}`,
               "Add autoincrementing primary key",
@@ -1115,6 +1119,15 @@ router.get(
                 req,
                 true
               ),
+            req.user.role_id === 1 &&
+              table.name !== "users" &&
+              post_dropdown_item(
+                `/table/delete-with-trig-views/${table.id}`,
+                '<i class="fas fa-trash"></i>&nbsp;' +
+                  req.__("Delete table+views+triggers"),
+                req,
+                true
+              ),
           ])
         )
     );
@@ -1276,6 +1289,50 @@ router.post(
   })
 );
 
+//delete-with-trig-views
+/**
+ * Delete Table Route Handler definition
+ * /delete:/id, where id is table id in _sc_tables
+ * @name post/delete/:id
+ * @function
+ * @memberof module:routes/tables~tablesRouter
+ * @function
+ */
+router.post(
+  "/delete-with-trig-views/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const t = Table.findOne({ id });
+    if (!t) {
+      req.flash("error", `Table not found`);
+      res.redirect(`/table`);
+      return;
+    }
+    if (t.name === "users") {
+      req.flash("error", req.__(`Cannot delete users table`));
+      res.redirect(`/table`);
+      return;
+    }
+    const views = await View.find(
+      t.id ? { table_id: t.id } : { exttable_name: t.name }
+    );
+    for (const view of views) await view.delete();
+    if (t.id) {
+      const triggers = await Trigger.find({ table_id: t.id });
+      for (const trig of triggers) await trig.delete();
+    }
+    try {
+      await t.delete();
+      req.flash("success", req.__(`Table %s deleted`, t.name));
+      res.redirect(`/table`);
+    } catch (err) {
+      req.flash("error", err.message);
+      res.redirect(`/table`);
+    }
+  })
+);
+
 /**
  * Delete Table Route Handler definition
  * /delete:/id, where id is table id in _sc_tables