@saltcorn/history-control 0.5.3 → 0.5.5

package/common.js

@@ -40,17 +40,31 @@ const get_where_vals = (table_name, whereFull) => {
 const runQuery = async (table, whereFull, opts) => {
   const schemaPrefix = db.getTenantSchemaPrefix();
   const { where, values } = get_where_vals(table.name, whereFull);
-  const sql = `select 
- _version || '_'|| id as _version_id, 
+  let joinTs = [],
+    joinF = [];
+  // console.log(table.fields);
+
+  Object.entries(opts?.joinFields || {}).forEach(([nm, { ref, target }]) => {
+    const keyField = table.getField(ref);
+    const reftable_name = `${schemaPrefix}"${
+      ref === "_userid" ? "users" : db.sqlsanitize(keyField.reftable_name)
+    }"`;
+    joinF.push(`${reftable_name}."${target}" as "${nm}"`);
+    joinTs.push(`${reftable_name} on h."${ref}" = ${reftable_name}."id"`);
+  });
+  const sql = `select
+ _version || '_'|| h.id as _version_id,
  _version = (select max(ih._version) from ${schemaPrefix}"${db.sqlsanitize(
     table.name
   )}__history" ih where ih.id = h.id) as _is_latest,
  not exists(select id from ${schemaPrefix}"${db.sqlsanitize(
     table.name
-  )}" t where t.id = h.id) as _deleted, 
- * from ${schemaPrefix}"${db.sqlsanitize(table.name)}__history" h ${
-    where.length ? ` ${where}` : ""
-  }${
+  )}" t where t.id = h.id) as _deleted,
+ *${
+   joinF.length ? `, ${joinF.join()}` : ``
+ } from ${schemaPrefix}"${db.sqlsanitize(table.name)}__history" h ${
+    joinTs.length ? ` JOIN ${joinTs.join(" JOIN ")}` : ``
+  } ${where.length ? ` ${where}` : ""}${
     opts.orderBy && opts.orderBy !== "_version_id"
       ? ` order by "${db.sqlsanitize(opts.orderBy)}"${
           opts.orderDesc ? " DESC" : ""

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/history-control",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "Allow users to interact with row history",
   "main": "index.js",
   "dependencies": {

package/rowdiffview.js

@@ -20,6 +20,7 @@ const {
   select,
   option,
   h2,
+  time,
   button,
 } = require("@saltcorn/markup/tags");
 const { radio_group, checkbox_group } = require("@saltcorn/markup/helpers");
@@ -183,6 +184,7 @@ const run = async (
     hist,
     state
   );
+
   return div(
     {
       class: ["accordion"],
@@ -190,6 +192,21 @@ const run = async (
     },
     rendered.map((html, ix) => {
       const row = hist[ix];
+      let d = row._time;
+      const jsdate = d;
+      const locale = (req) => {
+        //console.log(req && req.getLocale ? req.getLocale() : undefined);
+        return req?.getLocale?.() || "en";
+      };
+      const loc = locale(extraArgs.req);
+      let format = date_format || "YYYY-MM-DD HH:mm";
+      let timeHtml = time(
+        {
+          datetime: new Date(d).toISOString(),
+          "locale-date-format": encodeURIComponent(JSON.stringify(format)),
+        },
+        moment(jsdate).locale(loc).format(format)
+      );
       return div(
         { class: "accordion-item" },
         h2(
@@ -203,10 +220,8 @@ const run = async (
               "aria-expanded": "false",
               "aria-controls": `a${stateHash}tab${ix}`,
             },
-            date_format
-              ? moment(row._time).format(date_format)
-              : row._time.toString(),
-            " - ",
+            timeHtml,
+            " - ",
             emails[row._userid]
           )
         ),

package/table-provider.js

@@ -66,7 +66,7 @@ module.exports = {
         { name: "_is_latest", label: "Is latest", type: "Bool" },
         { name: "_deleted", label: "Deleted", type: "Bool" },
         { name: "_time", label: "Time", type: "Date" },
-        { name: "_userid", label: "User ID", type: "Integer" },
+        { name: "_userid", label: "User ID", type: "Key to users" },
         {
           name: "_restore_of_version",
           label: "Restore of version",
@@ -98,6 +98,11 @@ module.exports = {
           const qres = await runQuery(table, where, opts);
           return qres.rows;
         },
+        getJoinedRows: async (opts) => {
+          const table = Table.findOne({ name: cfg.table });
+          const qres = await runQuery(table, opts?.where || {}, opts);
+          return qres.rows;
+        },
       };
     },
   },