@saltcorn/server 0.9.4-beta.21 → 0.9.4-beta.23

package/locales/en.json

@@ -1381,5 +1381,6 @@
 	"Allow self signed": "Allow self signed",
 	"Open a connection to TLS server with self-signed or invalid TLS certificate": "Open a connection to TLS server with self-signed or invalid TLS certificate",
 	"Allow self-signed": "Allow self-signed",
-	"Optionally associate a table with this trigger": "Optionally associate a table with this trigger"
+	"Optionally associate a table with this trigger": "Optionally associate a table with this trigger",
+	"Delete table": "Delete table"
 }

package/package.json

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

package/public/saltcorn-common.js

@@ -1154,27 +1154,6 @@ async function common_done(res, viewname, isWeb = true) {
     await handle(res.notify_success, (text) =>
       notifyAlert({ type: "success", text: text })
     );
-  if (res.eval_js) await handle(res.eval_js, eval_it);
-
-  if (res.reload_page) {
-    (isWeb ? location : parent).reload(); //TODO notify to cookie if reload or goto
-  }
-  if (res.download) {
-    await handle(res.download, (download) => {
-      const dataurl = `data:${
-        download.mimetype || "application/octet-stream"
-      };base64,${download.blob}`;
-      fetch(dataurl)
-        .then((res) => res.blob())
-        .then((blob) => {
-          const link = document.createElement("a");
-          link.href = window.URL.createObjectURL(blob);
-          if (download.filename) link.download = download.filename;
-          else link.target = "_blank";
-          link.click();
-        });
-    });
-  }
   if (res.set_fields && viewname) {
     const form = $(`form[data-viewname="${viewname}"]`);
     if (form.length === 0 && set_state_fields) {
@@ -1203,6 +1182,35 @@ async function common_done(res, viewname, isWeb = true) {
       });
     }
   }
+
+  if (res.download) {
+    await handle(res.download, (download) => {
+      const dataurl = `data:${
+        download.mimetype || "application/octet-stream"
+      };base64,${download.blob}`;
+      fetch(dataurl)
+        .then((res) => res.blob())
+        .then((blob) => {
+          const link = document.createElement("a");
+          link.href = window.URL.createObjectURL(blob);
+          if (download.filename) link.download = download.filename;
+          else link.target = "_blank";
+          link.click();
+        });
+    });
+  }
+
+  if (res.popup) {
+    ajax_modal(res.popup);
+  }
+  if (res.suppressed) {
+    notifyAlert({
+      type: "warning",
+      text: res.suppressed,
+    });
+  }
+  if (res.eval_js) await handle(res.eval_js, eval_it);
+
   if (res.goto && !isWeb)
     // TODO ch
     notifyAlert({
@@ -1224,14 +1232,8 @@ async function common_done(res, viewname, isWeb = true) {
         location.reload();
     }
   }
-  if (res.popup) {
-    ajax_modal(res.popup);
-  }
-  if (res.suppressed) {
-    notifyAlert({
-      type: "warning",
-      text: res.suppressed,
-    });
+  if (res.reload_page) {
+    (isWeb ? location : parent).reload(); //TODO notify to cookie if reload or goto
   }
 }
 

package/routes/tables.js

@@ -995,6 +995,13 @@ router.get(
                 req,
                 true
               ),
+            table.name !== "users" &&
+              post_dropdown_item(
+                `/table/delete/${table.id}`,
+                '<i class="fas fa-trash"></i>&nbsp;' + req.__("Delete table"),
+                req,
+                true
+              ),
           ])
         )
     );