@saltcorn/server 1.1.4-beta.5 → 1.1.4-beta.7

package/routes/list.js

@@ -19,6 +19,7 @@ const {
   i,
   text,
   button,
+  a,
   input,
   label,
   form,
@@ -31,6 +32,7 @@ const {
 } = require("./utils");
 const moment = require("moment");
 const { getState } = require("@saltcorn/data/db/state");
+const { comparingCaseInsensitive } = require("@saltcorn/data/utils");
 
 /**
  * @type {object}
@@ -127,19 +129,26 @@ router.post(
 const typeToGridType = (t, field) => {
   const jsgField = { field: field.name, title: field.label, editor: true };
   if (t.name === "String" && field.attributes && field.attributes.options) {
-    jsgField.editor = "select";
+    jsgField.editor = "list";
 
     const values = field.attributes.options.split(",").map((o) => o.trim());
     if (!field.required) values.unshift("");
 
     jsgField.editorParams = { values };
   } else if (t === "Key" || t === "File") {
-    jsgField.editor = "select";
-    const values = {};
-
-    field.options.forEach(({ label, value }) => (values[value] = label));
+    jsgField.editor = "list";
+    const values = [];
+    const valuesObj = {};
+    field.options
+      .sort(comparingCaseInsensitive("label"))
+      .forEach(({ label, value }) => {
+        //en space. tabulator workaround
+        const l = label === "" ? "\u2002" : label;
+        values.push({ label: l, value });
+        valuesObj[value] = l;
+      });
     jsgField.editorParams = { values };
-    jsgField.formatterParams = { values };
+    jsgField.formatterParams = { values: valuesObj };
     jsgField.formatter = "__lookupIntToString";
   } else if (t.name === "Float" || t.name === "Integer") {
     jsgField.editor = "number";
@@ -373,6 +382,21 @@ router.get(
                   },
                   form(
                     { class: "px-2" },
+                    a(
+                      {
+                        onclick: `event.stopPropagation();allnonecols(true,this)`,
+                        href: "javascript:;",
+                      },
+                      "All"
+                    ),
+                    " | ",
+                    a(
+                      {
+                        onclick: `event.stopPropagation();allnonecols(false,this)`,
+                        href: "javascript:;",
+                      },
+                      "None"
+                    ),
                     fields.map((f) =>
                       div(
                         { class: "form-check" },
@@ -403,7 +427,7 @@ router.get(
                   if(typeof v === "string" && v.startsWith("__"))
                     col[k] = window[v.substring(2)];
                 })
-              })   
+              })
               window.tabulator_table_primary_key = "${table.pk_name}";
               window.tabulator_table = new Tabulator("#jsGrid", {
                   ajaxURL:"/api/${encodeURIComponent(
@@ -411,7 +435,7 @@ router.get(
                   )}?tabulator_pagination_format=true${
                     table.versioned ? "&versioncount=on" : ""
                   }",                   
-                  layout:"fitColumns", 
+                  layout:"fitData", 
                   columns,
                   height:"100%",
                   pagination:true,
@@ -421,10 +445,24 @@ router.get(
                   movableColumns: true,
                   ajaxContentType:"json",
                   sortMode:"remote",
+                  resizableColumnGuide:true,                  
+                  columnDefaults:{
+                      resizable:true,
+                      maxWidth:500
+                  },
                   initialSort:[
                     {column:"${table.pk_name}", dir:"asc"},
                   ],                 
               });
+              window.allnonecols= (do_show, e) =>{
+                columns.forEach(col=>{
+                  if(col.frozen && !do_show) return;
+                  if (do_show) window.tabulator_table.showColumn(col.field);
+                  else window.tabulator_table.hideColumn(col.field);
+                  $(e).closest("form").find("input").prop("checked", do_show)
+                })            
+              }
+
               window.tabulator_table.on("cellEdited", function(cell){
                 const row = cell.getRow().getData()
                 const fieldName = cell.getColumn().getField()

package/serve.js

@@ -168,7 +168,11 @@ const initMaster = async ({ disableMigrate }, useClusterAdaptor = true) => {
   // switch on sql logging
   if (sql_log) db.set_sql_logging(); // dont override cli flag
   // migrate database
-  if (!disableMigrate) await migrate(db.connectObj.default_schema, true);
+  if (!disableMigrate)
+    await db.runWithTenant(
+      db.connectObj.default_schema,
+      async () => await migrate(db.connectObj.default_schema, true)
+    );
   // load all plugins
   await loadAllPlugins(true);
   // switch on sql logging - but it was initiated before???