@saltcorn/server 1.1.4-alpha.0 → 1.1.4-alpha.2

package/routes/api.js

@@ -15,7 +15,7 @@
  */
 /** @type {module:express-promise-router} */
 const Router = require("express-promise-router");
-//const db = require("@saltcorn/data/db");
+const db = require("@saltcorn/data/db");
 const { error_catcher } = require("./utils.js");
 //const { mkTable, renderForm, link, post_btn } = require("@saltcorn/markup");
 const { getState } = require("@saltcorn/data/db/state");
@@ -574,6 +574,7 @@ router.post(
           const { _versions, ...row } = req.body || {};
           const fields = table.getFields();
           readState(row, fields, req);
+
           const errors = await prepare_insert_row(row, fields);
           if (errors.length > 0) {
             getState().log(
@@ -583,11 +584,13 @@ router.post(
             res.status(400).json({ error: errors.join(", ") });
             return;
           }
-          const ins_res = await table.tryInsertRow(
-            row,
-            req.user || user || { role_id: 100 }
-          );
-          if (ins_res.error) {
+          let ins_res = await db.withTransaction(async () => {
+            return await table.tryInsertRow(
+              row,
+              req.user || user || { role_id: 100 }
+            );
+          });
+          if (ins_res?.error) {
             getState().log(2, `API POST ${table.name} error: ${ins_res.error}`);
             res.status(400).json(ins_res);
           } else res.json(ins_res);
@@ -623,20 +626,22 @@ router.post(
       async function (err, user, info) {
         if (accessAllowedWrite(req, user, table)) {
           try {
-            if (id === "undefined") {
-              const pk_name = table.pk_name;
-              //const fields = table.getFields();
-              const row = req.body || {};
-              //readState(row, fields);
-              await table.deleteRows(
-                { [pk_name]: row[pk_name] },
-                user || req.user || { role_id: 100 }
-              );
-            } else
-              await table.deleteRows(
-                { id },
-                user || req.user || { role_id: 100 }
-              );
+            await db.withTransaction(async () => {
+              if (id === "undefined") {
+                const pk_name = table.pk_name;
+                //const fields = table.getFields();
+                const row = req.body || {};
+                //readState(row, fields);
+                await table.deleteRows(
+                  { [pk_name]: row[pk_name] },
+                  user || req.user || { role_id: 100 }
+                );
+              } else
+                await table.deleteRows(
+                  { id },
+                  user || req.user || { role_id: 100 }
+                );
+            });
             res.json({ success: true });
           } catch (e) {
             getState().log(2, `API DELETE ${table.name} error: ${e.message}`);
@@ -685,13 +690,15 @@ router.post(
             res.status(400).json({ error: errors.join(", ") });
             return;
           }
-          const ins_res = await table.tryUpdateRow(
-            row,
-            id,
-            user || req.user || { role_id: 100 }
-          );
+          let ins_res = await db.withTransaction(async () => {
+            return await table.tryUpdateRow(
+              row,
+              id,
+              user || req.user || { role_id: 100 }
+            );
+          });
 
-          if (ins_res.error) {
+          if (ins_res?.error) {
             getState().log(2, `API POST ${table.name} error: ${ins_res.error}`);
             res.status(400).json(ins_res);
           } else res.json(ins_res);
@@ -727,20 +734,22 @@ router.delete(
       async function (err, user, info) {
         if (accessAllowedWrite(req, user, table)) {
           try {
-            if (id === "undefined") {
-              const pk_name = table.pk_name;
-              //const fields = table.getFields();
-              const row = req.body || {};
-              //readState(row, fields);
-              await table.deleteRows(
-                { [pk_name]: row[pk_name] },
-                user || req.user || { role_id: 100 }
-              );
-            } else
-              await table.deleteRows(
-                { [table.pk_name]: id },
-                user || req.user || { role_id: 100 }
-              );
+            await db.withTransaction(async () => {
+              if (id === "undefined") {
+                const pk_name = table.pk_name;
+                //const fields = table.getFields();
+                const row = req.body || {};
+                //readState(row, fields);
+                await table.deleteRows(
+                  { [pk_name]: row[pk_name] },
+                  user || req.user || { role_id: 100 }
+                );
+              } else
+                await table.deleteRows(
+                  { [table.pk_name]: id },
+                  user || req.user || { role_id: 100 }
+                );
+            });
             res.json({ success: true });
           } catch (e) {
             getState().log(2, `API DELETE ${table.name} error: ${e.message}`);

package/routes/fields.js

@@ -304,60 +304,56 @@ const fieldFlow = (req) =>
         fldRow.required = false;
       }
       const table = Table.findOne({ id: table_id });
-      if (context.id) {
-        const field = await Field.findOne({ id: context.id });
-        try {
-          if (fldRow.label && field.label != fldRow.label) {
-            fldRow.name = Field.labelToName(fldRow.label);
-          }
+      try {
+        await db.withTransaction(async () => {
+          if (context.id) {
+            const field = await Field.findOne({ id: context.id });
 
-          await field.update(fldRow);
-          Trigger.emitEvent(
-            "AppChange",
-            `Field ${fldRow.name} on table ${table?.name}`,
-            req.user,
-            {
-              entity_type: "Field",
-              entity_name: fldRow.name || fldRow.label,
-            }
-          );
-        } catch (e) {
-          console.error(e);
-          return {
-            redirect: `/table/${context.table_id}`,
-            flash: ["error", e.message],
-          };
-        }
-      } else {
-        try {
-          await Field.create(fldRow);
-          Trigger.emitEvent(
-            "AppChange",
-            `Field ${fldRow.name} on table ${table?.name}`,
-            req.user,
-            {
-              entity_type: "Field",
-              entity_name: fldRow.name || fldRow.label,
+            if (fldRow.label && field.label != fldRow.label) {
+              fldRow.name = Field.labelToName(fldRow.label);
             }
-          );
-        } catch (e) {
-          console.error(e);
-          return {
-            redirect: `/table/${context.table_id}`,
-            flash: ["error", e.message],
-          };
-        }
-      }
 
-      return {
-        redirect: `/table/${context.table_id}`,
-        flash: [
-          "success",
-          context.id
-            ? req.__("Field %s saved", label)
-            : req.__("Field %s created", label),
-        ],
-      };
+            await field.update(fldRow);
+            Trigger.emitEvent(
+              "AppChange",
+              `Field ${fldRow.name} on table ${table?.name}`,
+              req.user,
+              {
+                entity_type: "Field",
+                entity_name: fldRow.name || fldRow.label,
+              }
+            );
+          } else {
+            await Field.create(fldRow);
+            Trigger.emitEvent(
+              "AppChange",
+              `Field ${fldRow.name} on table ${table?.name}`,
+              req.user,
+              {
+                entity_type: "Field",
+                entity_name: fldRow.name || fldRow.label,
+              }
+            );
+          }
+        });
+        await getState().refresh_tables();
+
+        return {
+          redirect: `/table/${context.table_id}`,
+          flash: [
+            "success",
+            context.id
+              ? req.__("Field %s saved", label)
+              : req.__("Field %s created", label),
+          ],
+        };
+      } catch (e) {
+        console.error(e);
+        return {
+          redirect: `/table/${context.table_id}`,
+          flash: ["error", e.message],
+        };
+      }
     },
     steps: [
       {
@@ -897,8 +893,11 @@ router.post(
       return;
     }
     const table_id = f.table_id;
+    await db.withTransaction(async () => {
+      await f.delete();
+    });
+    await getState().refresh_tables();
 
-    await f.delete();
     req.flash("success", req.__(`Field %s deleted`, f.label));
     res.redirect(`/table/${table_id}`);
   })
@@ -1514,7 +1513,9 @@ router.post(
     let val = field.type?.read
       ? field.type?.read(req.body[field_name])
       : req.body[field_name];
-    await table.updateRow({ [field_name]: val }, pk, req.user);
+    await db.withTransaction(async () => {
+      await table.updateRow({ [field_name]: val }, pk, req.user);
+    });
     let fv;
     if (field.is_fkey) {
       if (join_field) {

package/routes/list.js

@@ -111,7 +111,9 @@ router.post(
   error_catcher(async (req, res) => {
     const { tableName, id, _version } = req.params;
     const table = Table.findOne({ name: tableName });
-    await table.restore_row_version(id, _version);
+    await db.withTransaction(async () => {
+      await table.restore_row_version(id, _version);
+    });
     req.flash("success", req.__("Version %s restored", _version));
     res.redirect(`/list/_versions/${table.name}/${id}`);
   })

package/routes/menu.js

@@ -605,20 +605,22 @@ router.post(
           else if (item.subitems) search(item.subitems);
         });
     search(menu_items);
-    if (menu_item)
+    if (menu_item) {
       try {
-        const result = await run_action_column({
-          col: menu_item,
-          referrer: req.get("Referrer"),
-          req,
-          res,
+        const result = await db.withTransaction(async () => {
+          return await run_action_column({
+            col: menu_item,
+            referrer: req.get("Referrer"),
+            req,
+            res,
+          });
         });
         res.json({ success: "ok", ...(result || {}) });
       } catch (e) {
         console.error(e);
         res.status(400).json({ error: e.message || e });
       }
-    else res.status(404).json({ error: "Action not found" });
+    } else res.status(404).json({ error: "Action not found" });
   })
 );
 
@@ -656,7 +658,7 @@ router.get(
         break;
       case "json":
         res.json(icons);
-
+        break;
       default:
         res.send("");
         break;

package/routes/models.js

@@ -93,6 +93,7 @@ router.post(
       res.sendWrap(req.__(`New model`), renderForm(form, req.csrfToken()));
     } else {
       const model = await Model.create({ ...form.values, table_id: table.id });
+      await getState().refresh_tables();
       if (model.templateObj.configuration_workflow)
         res.redirect(`/models/config/${model.id}`);
       else res.redirect(`/models/show/${model.id}`);
@@ -157,7 +158,7 @@ const get_model_workflow = (model, req) => {
   workflow.onDone = async (ctx) => {
     const { id, ...configuration } = await oldOnDone(ctx);
     await model.update({ configuration });
-
+    await getState().refresh_tables();
     return {
       redirect: `/models/show/${model.id}`,
       flash: ["success", `Model ${this.name || ""} saved`],
@@ -340,6 +341,7 @@ router.post(
     const { id } = req.params;
     const model = await Model.findOne({ id });
     await model.delete();
+    await getState().refresh_tables();
     req.flash("success", req.__("Model %s deleted", model.name));
     res.redirect(`/table/${model.table_id}`);
   })
@@ -451,7 +453,7 @@ const encode = (s) =>
         ">": ">",
         "'": "'",
         '"': """,
-      }[tag])
+      })[tag]
   );
 
 router.get(

package/routes/packs.js

@@ -18,6 +18,8 @@ const EventLog = require("@saltcorn/data/models/eventlog");
 const Model = require("@saltcorn/data/models/model");
 const ModelInstance = require("@saltcorn/data/models/model_instance");
 const load_plugins = require("../load_plugins");
+const { getState } = require("@saltcorn/data/db/state");
+const db = require("@saltcorn/data/db/index");
 
 const { is_pack } = require("@saltcorn/data/contracts");
 const {
@@ -414,6 +416,7 @@ router.post(
     if (!error && !is_pack.check(pack)) {
       error = req.__("Not a valid pack");
     }
+
     if (!error) {
       const can_install = await can_install_pack(pack);
       if (can_install.error) {
@@ -444,10 +447,12 @@ router.post(
         ],
       });
     } else {
-      await install_pack(pack, undefined, (p) =>
-        load_plugins.loadAndSaveNewPlugin(p)
-      );
-
+      await db.withTransaction(async () => {
+        await install_pack(pack, undefined, (p) =>
+          load_plugins.loadAndSaveNewPlugin(p)
+        );
+      });
+      await getState().refresh();
       res.redirect(`/`);
     }
   })
@@ -480,9 +485,12 @@ router.post(
     } else if (can_install.warning) {
       req.flash("warning", can_install.warning);
     }
-    await install_pack(pack.pack, name, (p) =>
-      load_plugins.loadAndSaveNewPlugin(p)
-    );
+    await db.withTransaction(async () => {
+      await install_pack(pack.pack, name, (p) =>
+        load_plugins.loadAndSaveNewPlugin(p)
+      );
+    });
+    await getState().refresh();
     req.flash("success", req.__(`Pack %s installed`, text(name)));
     res.redirect(`/`);
   })
@@ -506,7 +514,10 @@ router.post(
       res.redirect(`/plugins`);
       return;
     }
-    await uninstall_pack(pack.pack, name);
+    await db.withTransaction(async () => {
+      await uninstall_pack(pack.pack, name);
+    });
+    await getState().refresh();
 
     req.flash("success", req.__(`Pack %s uninstalled`, text(name)));
 

package/routes/page.js

@@ -68,13 +68,15 @@ const runPage = async (page, req, res, tic) => {
           no_menu: page.attributes?.no_menu,
           requestFluidLayout: page.attributes?.request_fluid_layout,
         } || `${page.name} page`,
-        req.smr ? contents : add_edit_bar({
-          role,
-          title: page.name,
-          what: req.__("Page"),
-          url: `/pageedit/edit/${encodeURIComponent(page.name)}`,
-          contents,
-        }),
+        req.smr
+          ? contents
+          : add_edit_bar({
+              role,
+              title: page.name,
+              what: req.__("Page"),
+              url: `/pageedit/edit/${encodeURIComponent(page.name)}`,
+              contents,
+            })
       );
   } else {
     getState().log(2, `Page ${page.name} not authorized`);
@@ -201,15 +203,17 @@ router.post(
       });
       if (col) {
         try {
-          const result = await run_action_column({
-            col,
-            referrer: req.get("Referrer"),
-            req,
-            res,
+          const result = await db.withTransaction(async () => {
+            return await run_action_column({
+              col,
+              referrer: req.get("Referrer"),
+              req,
+              res,
+            });
           });
           res.json({ success: "ok", ...(result || {}) });
         } catch (e) {
-          getState().log(2, e?.stack)
+          getState().log(2, e?.stack);
           res.status(400).json({ error: e.message || e });
         }
       } else res.status(404).json({ error: "Action not found" });

package/routes/page_groupedit.js

@@ -412,9 +412,11 @@ router.post(
       const { id, ...row } = form.values;
       if (+id) {
         await PageGroup.update(id, row);
+        await getState().refresh_page_groups();
         res.json({ success: "ok", row });
       } else {
         const pageGroup = await PageGroup.create(row);
+        await getState().refresh_page_groups();
         res.redirect(`/page_groupedit/${pageGroup.name}`);
       }
     }
@@ -478,6 +480,7 @@ router.post(
           eligible_formula,
           description: description || "",
         });
+        await getState().refresh_page_groups();
         req.flash("success", req.__("Added member"));
         res.redirect(`/page_groupedit/${page_groupname}`);
       }
@@ -497,6 +500,7 @@ router.post(
       const member = PageGroupMember.findOne({ id: member_id });
       const pageGroup = PageGroup.findOne({ id: member.page_group_id });
       await pageGroup.moveMember(member, mode);
+      await getState().refresh_page_groups();
       res.json({ success: "ok" });
     } catch (error) {
       getState().log(2, `POST /page_groupedit/move-member: '${error.message}'`);
@@ -573,6 +577,7 @@ router.post(
           eligible_formula,
           description: description || "",
         });
+      await getState().refresh_page_groups();
       req.flash("success", req.__("Updated member"));
       res.redirect(`/page_groupedit/${group.name}`);
     }
@@ -593,6 +598,7 @@ router.post(
       res.redirect("/pageedit");
     } else {
       await group.delete();
+      await getState().refresh_page_groups();
       req.flash("success", req.__("Deleted page group %s", group_id));
       res.redirect("/pageedit");
     }
@@ -622,6 +628,7 @@ router.post(
       } else {
         try {
           await group.removeMember(member_id);
+          await getState().refresh_page_groups();
           req.flash(
             "success",
             req.__("Removed member %s", member.name || member_id)
@@ -651,6 +658,7 @@ router.post(
       res.redirect("/pageedit");
     } else {
       const copy = await group.clone();
+      await getState().refresh_page_groups();
       req.flash("success", req.__("Cloned page group %s", group.name));
       res.redirect(`/page_groupedit/${copy.name}`);
     }

package/routes/pageedit.js

@@ -508,6 +508,7 @@ router.post(
           pageRow.layout = {};
         }
         await Page.update(+id, pageRow);
+        await getState().refresh_pages();
         Trigger.emitEvent("AppChange", `Page ${dbPage.name}`, req.user, {
           entity_type: "Page",
           entity_name: dbPage.name,
@@ -518,6 +519,7 @@ router.post(
         if (!pageRow.layout) pageRow.layout = {};
         if (!pageRow.fixed_states) pageRow.fixed_states = {};
         await Page.create(pageRow);
+        await getState().refresh_pages();
         Trigger.emitEvent("AppChange", `Page ${pageRow.name}`, req.user, {
           entity_type: "Page",
           entity_name: pageRow.name,
@@ -693,6 +695,7 @@ router.post(
       await Page.update(page.id, {
         layout: decodeURIComponent((req.body || {}).layout),
       });
+      await getState().refresh_pages();
       Trigger.emitEvent("AppChange", `Page ${page.name}`, req.user, {
         entity_type: "Page",
         entity_name: page.name,
@@ -746,6 +749,8 @@ router.post(
     if (id && (req.body || {}).layout) {
       await Page.update(+id, { layout: (req.body || {}).layout });
       const page = await Page.findOne({ id });
+      await getState().refresh_pages();
+
       Trigger.emitEvent("AppChange", `Page ${page.name}`, req.user, {
         entity_type: "Page",
         entity_name: page.name,
@@ -775,7 +780,10 @@ router.post(
       entity_type: "Page",
       entity_name: page.name,
     });
-    await page.delete();
+    await db.withTransaction(async () => {
+      await page.delete();
+    });
+    await getState().refresh_pages();
     req.flash("success", req.__(`Page deleted`));
     res.redirect(`/pageedit`);
   })
@@ -856,6 +864,7 @@ router.post(
       entity_type: "Page",
       entity_name: newpage.name,
     });
+    await getState().refresh_pages();
     req.flash(
       "success",
       req.__("Page %s duplicated as %s", page.name, newpage.name)

package/routes/registry.js

@@ -371,7 +371,9 @@ router.post(
         pack.config[ename] = entVal;
         break;
     }
-    await install_pack(pack);
+    await db.withTransaction(async () => {
+      await install_pack(pack);
+    });
     res.redirect(
       `/registry-editor?etype=${etype}&ename=${encodeURIComponent(
         ename