@saltcorn/server 1.3.0-beta.2 → 1.3.0-beta.4

package/public/saltcorn.css

@@ -824,6 +824,14 @@ tr:hover span.add-tag {
   );
 }
 
+.prevwfroomrun i.fa-trash-alt {
+  display: none;
+}
+
+.prevwfroomrun:hover i.fa-trash-alt {
+  display: inline;
+}
+
 input[type="file"].file-has-existing {
   font-size: 0;
 }

package/public/saltcorn.js

@@ -538,7 +538,7 @@ function saveAndContinue(e, k, event) {
         form.append(
           `<input type="hidden" class="form-control  " name="id" value="${res.id}">`
         );
-        reloadEmbeddedEditOwnViews(form, res.id);
+        apply_showif();
       }
       common_done(res, form.attr("data-viewname"));
       if (focusedEl) focusedEl.setAttribute("previous-val", focusedEl.value);
@@ -1338,6 +1338,14 @@ function check_delete_unsaved(tablename, script_tag) {
   }
 }
 
+function delprevwfroomrun(viewname, e, runid) {
+  e.preventDefault();
+  e.stopPropagation();
+  view_post(viewname, "delprevrun", { run_id: runid });
+  $(e.target).closest(".prevwfroomrun").remove();
+  return false;
+}
+
 function cfu_translate(that) {
   const locale = that.value;
   const translations = window.cfu_translations[locale];

package/routes/admin.js

@@ -3841,6 +3841,22 @@ router.post(
       spawnParams.push("--androidKeyStoreAlias", keystoreAlias);
     if (keystorePassword)
       spawnParams.push("--androidKeystorePassword", keystorePassword);
+
+    // if builDir exists, remove it
+    if (
+      await fs.promises
+        .access(buildDir)
+        .then(() => true)
+        .catch(() => false)
+    ) {
+      try {
+        await fs.promises.rm(buildDir, { recursive: true, force: true });
+        getState().log(5, `Removed existing build directory: ${buildDir}`);
+      } catch (error) {
+        getState().log(4, `Error removing build directory: ${error.message}`);
+      }
+    }
+
     // end http call, return the out directory name, the build directory path and the mode
     // the gui polls for results
     res.json({

package/routes/registry.js

@@ -19,12 +19,14 @@ const {
   details,
   summary,
 } = require("@saltcorn/markup/tags");
-const Table = require("@saltcorn/data/models/table");
 const { isAdmin, error_catcher } = require("./utils");
 const { send_infoarch_page } = require("../markup/admin.js");
+const Table = require("@saltcorn/data/models/table");
 const View = require("@saltcorn/data/models/view");
 const Page = require("@saltcorn/data/models/page");
 const Form = require("@saltcorn/data/models/form");
+const Trigger = require("@saltcorn/data/models/trigger");
+const Plugin = require("@saltcorn/data/models/plugin");
 const {
   table_pack,
   view_pack,
@@ -40,8 +42,8 @@ const {
   event_log_pack,
   install_pack,
 } = require("@saltcorn/admin-models/models/pack");
-const Trigger = require("@saltcorn/data/models/trigger");
 const { getState } = require("@saltcorn/data/db/state");
+const { sleep } = require("@saltcorn/data/utils");
 /**
  * @type {object}
  * @const
@@ -81,6 +83,10 @@ router.get(
       {},
       { orderBy: "name", nocase: true }
     );
+    const all_plugins = await Plugin.find(
+      { name: { not: { in: ["base", "sbadmin2"] } } },
+      { orderBy: "name", nocase: true }
+    );
     const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
 
     const all_configs_obj = await getState().getAllConfigOrDefaults();
@@ -91,7 +97,7 @@ router.get(
       }))
       .filter((c) => isRoot || !c.root_only);
 
-    let tables, views, pages, triggers, configs;
+    let tables, views, pages, triggers, configs, plugins;
     if (q) {
       const qlower = q.toLowerCase();
       const includesQ = (s) => s.toLowerCase().includes(qlower);
@@ -113,12 +119,17 @@ router.get(
         return includesQ(JSON.stringify(pack));
       });
       configs = all_configs.filter((c) => includesQ(JSON.stringify(c)));
+      plugins = all_plugins.filter(
+        (p) =>
+          includesQ(p.name) || includesQ(JSON.stringify(p.configuration || {}))
+      );
     } else {
       tables = all_tables;
       views = all_views;
       pages = all_pages;
       triggers = all_triggers;
       configs = all_configs;
+      plugins = all_plugins;
     }
     const li_link = (etype1, ename1) =>
       li(
@@ -224,6 +235,20 @@ router.get(
 
         edContents = renderForm(mkForm(trpack), req.csrfToken());
         break;
+      case "module":
+        const plugin = all_plugins.find((p) => p.name === ename);
+        cfg_link =
+          `${ename} ${etype}` +
+          a(
+            {
+              class: "ms-1 me-3",
+              href: `/plugins/configure/${encodeURIComponent(ename)}`,
+            },
+            "Configure ",
+            i({ class: "fas fa-cog" })
+          );
+        edContents = renderForm(mkForm(plugin.configuration), req.csrfToken());
+        break;
     }
     send_infoarch_page({
       res,
@@ -315,6 +340,16 @@ router.get(
                       configs.map((t) => li_link("config", t.name))
                     )
                   )
+                ),
+                li(
+                  details(
+                    { open: q || etype === "module" },
+                    summary("Modules"),
+                    ul(
+                      { class: "ps-3" },
+                      plugins.map((m) => li_link("module", m.name))
+                    )
+                  )
                 )
               )
             ),
@@ -372,7 +407,25 @@ router.post(
         break;
     }
     await db.withTransaction(async () => {
-      await install_pack(pack);
+      if (etype === "module") {
+        const plugin = await Plugin.findOne({ name: ename });
+        if (!plugin) throw new Error(`Module ${ename} not found`);
+        let module = getState().plugins[plugin.name];
+        if (!module) {
+          module =
+            getState().plugins[getState().plugin_module_names[plugin.name]];
+        }
+        if (module.configuration_workflow) {
+          const flow = module.configuration_workflow();
+          if (flow?.onStepSave) await flow.onStepSave({}, {}, entVal);
+          if (flow?.onDone) {
+            const doneRes = await flow.onDone(entVal);
+            if (doneRes?.cleanup) await doneRes.cleanup();
+          }
+        }
+        plugin.configuration = entVal;
+        await plugin.upsert();
+      } else await install_pack(pack);
     });
     switch (etype) {
       case "table":
@@ -390,6 +443,13 @@ router.post(
       case "config":
         await getState().refresh_config();
         break;
+      case "module":
+        getState().processSend({
+          refresh_plugin_cfg: ename,
+          tenant: db.getTenantSchema(),
+        });
+        await sleep(500);
+        break;
     }
     res.redirect(
       `/registry-editor?etype=${etype}&ename=${encodeURIComponent(

package/tests/clientjs.test.js

@@ -253,4 +253,20 @@ test("unique_field_from_rows test", () => {
     "bar"
   );
   expect($("#mkuniq11").val()).toBe("bar104");
+  $("body").append(`<input id="mkuniq12" value="YPL240724A"></div>`);
+  unique_field_from_rows(
+    [
+      { foo: "YPL240724A2" },
+      { foo: "YPL240724A1_COPY-1" },
+      { foo: "YPL240724A1" },
+    ],
+    "mkuniq12",
+    "foo",
+    false,
+    1,
+    true,
+    "Digits",
+    "YPL240724A"
+  );
+  expect($("#mkuniq12").val()).toBe("YPL240724A3");
 });