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

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}`);
   })

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/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(`/`);
   })

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/sync.js

@@ -24,7 +24,7 @@ router.get(
   })
 );
 
-const getSyncRows = async (syncInfo, table, syncUntil, client, user) => {
+const getSyncRows = async (syncInfo, table, syncUntil, user) => {
   const tblName = table.name;
   const pkName = table.pk_name;
   const minRole = table.min_role_read;
@@ -50,17 +50,17 @@ const getSyncRows = async (syncInfo, table, syncUntil, client, user) => {
   }
   const schema = db.getTenantSchemaPrefix();
   if (!syncInfo.syncFrom) {
-    const { rows } = await client.query(
+    const { rows } = await db.query(
       `select 
          info_tbl.ref "_sync_info_tbl_ref_", 
          info_tbl.last_modified "_sync_info_tbl_last_modified_", 
          info_tbl.deleted "_sync_info_tbl_deleted_",
          data_tbl.*
        from ${schema}"${db.sqlsanitize(
-        tblName
-      )}_sync_info" "info_tbl" right join "${db.sqlsanitize(
-        tblName
-      )}" "data_tbl"
+         tblName
+       )}_sync_info" "info_tbl" right join "${db.sqlsanitize(
+         tblName
+       )}" "data_tbl"
       on info_tbl.ref = data_tbl."${db.sqlsanitize(
         pkName
       )}" and info_tbl.deleted = false
@@ -77,17 +77,17 @@ const getSyncRows = async (syncInfo, table, syncUntil, client, user) => {
     }
     return rows;
   } else {
-    const { rows } = await client.query(
+    const { rows } = await db.query(
       `select 
          info_tbl.ref "_sync_info_tbl_ref_", 
          info_tbl.last_modified "_sync_info_tbl_last_modified_", 
          info_tbl.deleted "_sync_info_tbl_deleted_",
          data_tbl.*
        from ${schema}"${db.sqlsanitize(
-        tblName
-      )}_sync_info" "info_tbl" join ${schema}"${db.sqlsanitize(
-        tblName
-      )}" "data_tbl"
+         tblName
+       )}_sync_info" "info_tbl" join ${schema}"${db.sqlsanitize(
+         tblName
+       )}" "data_tbl"
       on info_tbl.ref = data_tbl."${db.sqlsanitize(pkName)}"
       where date_trunc('milliseconds', info_tbl.last_modified) > to_timestamp(${
         new Date(syncInfo.syncFrom).valueOf() / 1000.0
@@ -117,7 +117,6 @@ const getSyncRows = async (syncInfo, table, syncUntil, client, user) => {
 router.post(
   "/load_changes",
   error_catcher(async (req, res) => {
-    const result = {};
     const { syncInfos, loadUntil } = req.body || {};
     if (!loadUntil) {
       getState().log(2, `POST /load_changes: loadUntil is missing`);
@@ -128,62 +127,55 @@ router.post(
       return res.status(400).json({ error: "syncInfos is missing" });
     }
     const role = req.user ? req.user.role_id : 100;
-    const client = await db.getClient();
-    let rowLimit = 1000;
     try {
-      await client.query(`BEGIN`);
-      for (const [tblName, syncInfo] of Object.entries(syncInfos)) {
-        const table = Table.findOne({ name: tblName });
-        if (!table) throw new Error(`The table '${tblName}' does not exists`);
-        const pkName = table.pk_name;
-        let rows = await getSyncRows(
-          syncInfo,
-          table,
-          loadUntil,
-          client,
-          req.user
-        );
-        if (!rows) continue;
-        if (role > table.min_role_read) {
-          if (
-            role === 100 ||
-            (!table.ownership_field_id && !table.ownership_formula)
-          )
-            continue;
-          else if (table.ownership_field_id) {
-          } else if (table.ownership_formula) {
-            rows = rows.filter((row) => table.is_owner(req.user, row));
+      const result = await db.withTransaction(async () => {
+        let rowLimit = 1000;
+        const result = {};
+
+        for (const [tblName, syncInfo] of Object.entries(syncInfos)) {
+          const table = Table.findOne({ name: tblName });
+          if (!table) throw new Error(`The table '${tblName}' does not exists`);
+          const pkName = table.pk_name;
+          let rows = await getSyncRows(syncInfo, table, loadUntil, req.user);
+          if (!rows) continue;
+          if (role > table.min_role_read) {
+            if (
+              role === 100 ||
+              (!table.ownership_field_id && !table.ownership_formula)
+            )
+              continue;
+            else if (table.ownership_field_id) {
+            } else if (table.ownership_formula) {
+              rows = rows.filter((row) => table.is_owner(req.user, row));
+            }
           }
+          if (rows.length > rowLimit) {
+            rows.splice(rowLimit);
+          }
+          rowLimit -= rows.length;
+          result[tblName] = {
+            rows,
+            maxLoadedId: rows.length > 0 ? rows[rows.length - 1][pkName] : 0,
+          };
         }
-        if (rows.length > rowLimit) {
-          rows.splice(rowLimit);
-        }
-        rowLimit -= rows.length;
-        result[tblName] = {
-          rows,
-          maxLoadedId: rows.length > 0 ? rows[rows.length - 1][pkName] : 0,
-        };
-      }
-      await client.query("COMMIT");
+        return result;
+      });
       res.json(result);
     } catch (error) {
-      await client.query("ROLLBACK");
       getState().log(2, `POST /load_changes: '${error.message}'`);
       res.status(400).json({ error: error.message || error });
-    } finally {
-      client.release(true);
     }
   })
 );
 
-const getDelRows = async (tblName, syncFrom, syncUntil, client) => {
+const getDelRows = async (tblName, syncFrom, syncUntil) => {
   const schema = db.getTenantSchemaPrefix();
-  const dbRes = await client.query(
+  const dbRes = await db.query(
     `select * 
      from (
       select ref, max(last_modified) from ${schema}"${db.sqlsanitize(
-      tblName
-    )}_sync_info" 
+        tblName
+      )}_sync_info" 
       group by ref, deleted having deleted = true) as alias 
       where alias.max < to_timestamp(${syncUntil.valueOf() / 1000.0}) 
         and alias.max > to_timestamp(${syncFrom.valueOf() / 1000.0})`
@@ -203,31 +195,27 @@ router.post(
   "/deletes",
   error_catcher(async (req, res) => {
     const { syncInfos, syncTimestamp } = req.body || {};
-    const client = await db.getClient();
     try {
-      await client.query(`BEGIN`);
-      const syncUntil = new Date(syncTimestamp);
-      const result = {
-        deletes: {},
-      };
-      for (const [tblName, syncInfo] of Object.entries(syncInfos)) {
-        if (syncInfo.syncFrom) {
-          result.deletes[tblName] = await getDelRows(
-            tblName,
-            new Date(syncInfo.syncFrom),
-            syncUntil,
-            client
-          );
+      const result = await db.withTransaction(async () => {
+        const syncUntil = new Date(syncTimestamp);
+        const result = {
+          deletes: {},
+        };
+        for (const [tblName, syncInfo] of Object.entries(syncInfos)) {
+          if (syncInfo.syncFrom) {
+            result.deletes[tblName] = await getDelRows(
+              tblName,
+              new Date(syncInfo.syncFrom),
+              syncUntil
+            );
+          }
         }
-      }
-      await client.query("COMMIT");
+        return result;
+      });
       res.json(result);
     } catch (error) {
-      await client.query("ROLLBACK");
       getState().log(2, `POST /sync/deletes: '${error.message}'`);
       res.status(400).json({ error: error.message || error });
-    } finally {
-      client.release(true);
     }
   })
 );