@saltcorn/server 0.8.0-beta.4 → 0.8.1-beta.0

package/routes/common_lists.js

@@ -8,9 +8,7 @@ const {
   settingsDropdown,
   post_dropdown_item,
 } = require("@saltcorn/markup");
-const {
-  get_base_url,
-} = require("./utils.js");
+const { get_base_url } = require("./utils.js");
 const { h4, p, div, a, input, text } = require("@saltcorn/markup/tags");
 
 /**
@@ -48,52 +46,52 @@ const tablesList = async (tables, req, { tagId, domId, showList } = {}) => {
   const getRole = (rid) => roles.find((r) => r.id === rid).role;
   return tables.length > 0
     ? mkTable(
-      [
-        {
-          label: req.__("Name"),
-          key: (r) => link(`/table/${r.id || r.name}`, text(r.name)),
-        },
-        {
-          label: "",
-          key: (r) => tableBadges(r, req),
-        },
-        {
-          label: req.__("Access Read/Write"),
-          key: (t) =>
-            t.external
-              ? `${getRole(t.min_role_read)} (read only)`
-              : `${getRole(t.min_role_read)}/${getRole(t.min_role_write)}`,
-        },
-        !tagId
-          ? {
-            label: req.__("Delete"),
-            key: (r) =>
-              r.name === "users" || r.external
-                ? ""
-                : post_delete_btn(`/table/delete/${r.id}`, req, r.name),
-          }
-          : {
-            label: req.__("Remove From Tag"),
-            key: (r) =>
-              post_delete_btn(
-                `/tag-entries/remove/tables/${r.id}/${tagId}`,
-                req,
-                `${r.name} from this tag`
-              ),
+        [
+          {
+            label: req.__("Name"),
+            key: (r) => link(`/table/${r.id || r.name}`, text(r.name)),
           },
-      ],
-      tables,
-      {
-        hover: true,
-        tableClass: listClass(tagId, showList),
-        tableId: domId,
-      }
-    )
+          {
+            label: "",
+            key: (r) => tableBadges(r, req),
+          },
+          {
+            label: req.__("Access Read/Write"),
+            key: (t) =>
+              t.external
+                ? `${getRole(t.min_role_read)} (read only)`
+                : `${getRole(t.min_role_read)}/${getRole(t.min_role_write)}`,
+          },
+          !tagId
+            ? {
+                label: req.__("Delete"),
+                key: (r) =>
+                  r.name === "users" || r.external
+                    ? ""
+                    : post_delete_btn(`/table/delete/${r.id}`, req, r.name),
+              }
+            : {
+                label: req.__("Remove From Tag"),
+                key: (r) =>
+                  post_delete_btn(
+                    `/tag-entries/remove/tables/${r.id}/${tagId}`,
+                    req,
+                    `${r.name} from this tag`
+                  ),
+              },
+        ],
+        tables,
+        {
+          hover: true,
+          tableClass: listClass(tagId, showList),
+          tableId: domId,
+        }
+      )
     : div(
-      { class: listClass(tagId, showList), id: domId },
-      h4(req.__("No tables defined")),
-      p(req.__("Tables hold collections of similar data"))
-    );
+        { class: listClass(tagId, showList), id: domId },
+        h4(req.__("No tables defined")),
+        p(req.__("Tables hold collections of similar data"))
+      );
 };
 
 /**
@@ -175,17 +173,17 @@ const viewsList = async (views, req, { tagId, domId, showList } = {}) => {
 
   return views.length > 0
     ? mkTable(
-      [
-        {
-          label: req.__("Name"),
-          key: (r) => link(`/view/${encodeURIComponent(r.name)}`, r.name),
-          sortlink: !tagId
-            ? `javascript:set_state_field('_sortby', 'name')`
-            : undefined,
-        },
-        // description - currently I dont want to show description in view list
-        // because description can be long
-        /*
+        [
+          {
+            label: req.__("Name"),
+            key: (r) => link(`/view/${encodeURIComponent(r.name)}`, r.name),
+            sortlink: !tagId
+              ? `javascript:set_state_field('_sortby', 'name')`
+              : undefined,
+          },
+          // description - currently I dont want to show description in view list
+          // because description can be long
+          /*
        {
            label: req.__("Description"),
            key: "description",
@@ -193,60 +191,60 @@ const viewsList = async (views, req, { tagId, domId, showList } = {}) => {
            sortlink: `javascript:set_state_field('_sortby', 'description')`,
        },
        */
-        // template
-        {
-          label: req.__("Pattern"),
-          key: "viewtemplate",
-          sortlink: !tagId
-            ? `javascript:set_state_field('_sortby', 'viewtemplate')`
-            : undefined,
-        },
-        {
-          label: req.__("Table"),
-          key: (r) => link(`/table/${r.table}`, r.table),
-          sortlink: !tagId
-            ? `javascript:set_state_field('_sortby', 'table')`
-            : undefined,
-        },
-        {
-          label: req.__("Role to access"),
-          key: (row) => editViewRoleForm(row, roles, req),
-        },
-        {
-          label: "",
-          key: (r) =>
-            link(
-              `/viewedit/config/${encodeURIComponent(r.name)}`,
-              req.__("Configure")
-            ),
-        },
-        !tagId
-          ? {
+          // template
+          {
+            label: req.__("Pattern"),
+            key: "viewtemplate",
+            sortlink: !tagId
+              ? `javascript:set_state_field('_sortby', 'viewtemplate')`
+              : undefined,
+          },
+          {
+            label: req.__("Table"),
+            key: (r) => link(`/table/${r.table}`, r.table),
+            sortlink: !tagId
+              ? `javascript:set_state_field('_sortby', 'table')`
+              : undefined,
+          },
+          {
+            label: req.__("Role to access"),
+            key: (row) => editViewRoleForm(row, roles, req),
+          },
+          {
             label: "",
-            key: (r) => view_dropdown(r, req),
-          }
-          : {
-            label: req.__("Remove From Tag"),
             key: (r) =>
-              post_delete_btn(
-                `/tag-entries/remove/views/${r.id}/${tagId}`,
-                req,
-                `${r.name} from this tag`
+              link(
+                `/viewedit/config/${encodeURIComponent(r.name)}`,
+                req.__("Configure")
               ),
           },
-      ],
-      views,
-      {
-        hover: true,
-        tableClass: listClass(tagId, showList),
-        tableId: domId,
-      }
-    )
+          !tagId
+            ? {
+                label: "",
+                key: (r) => view_dropdown(r, req),
+              }
+            : {
+                label: req.__("Remove From Tag"),
+                key: (r) =>
+                  post_delete_btn(
+                    `/tag-entries/remove/views/${r.id}/${tagId}`,
+                    req,
+                    `${r.name} from this tag`
+                  ),
+              },
+        ],
+        views,
+        {
+          hover: true,
+          tableClass: listClass(tagId, showList),
+          tableId: domId,
+        }
+      )
     : div(
-      { class: listClass(tagId, showList), id: domId },
-      h4(req.__("No views defined")),
-      p(req.__("Views define how table rows are displayed to the user"))
-    );
+        { class: listClass(tagId, showList), id: domId },
+        h4(req.__("No views defined")),
+        p(req.__("Views define how table rows are displayed to the user"))
+      );
 };
 
 /**
@@ -334,19 +332,18 @@ const getPageList = (rows, roles, req, { tagId, domId, showList } = {}) => {
       },
       !tagId
         ? {
-          label: "",
-          key: (r) => page_dropdown(r, req),
-        }
+            label: "",
+            key: (r) => page_dropdown(r, req),
+          }
         : {
-          label: req.__("Remove From Tag"),
-          key: (r) =>
-            post_delete_btn(
-              `/tag-entries/remove/pages/${r.id}/${tagId}`,
-              req,
-              `${r.name} from this tag`
-            ),
-        },
-      ,
+            label: req.__("Remove From Tag"),
+            key: (r) =>
+              post_delete_btn(
+                `/tag-entries/remove/pages/${r.id}/${tagId}`,
+                req,
+                `${r.name} from this tag`
+              ),
+          },
     ],
     rows,
     {
@@ -391,18 +388,18 @@ const getTriggerList = (triggers, req, { tagId, domId, showList } = {}) => {
       },
       !tagId
         ? {
-          label: req.__("Delete"),
-          key: (r) => post_delete_btn(`/actions/delete/${r.id}`, req),
-        }
+            label: req.__("Delete"),
+            key: (r) => post_delete_btn(`/actions/delete/${r.id}`, req),
+          }
         : {
-          label: req.__("Remove From Tag"),
-          key: (r) =>
-            post_delete_btn(
-              `/tag-entries/remove/trigger/${r.id}/${tagId}`,
-              req,
-              `${r.name} from this tag`
-            ),
-        },
+            label: req.__("Remove From Tag"),
+            key: (r) =>
+              post_delete_btn(
+                `/tag-entries/remove/trigger/${r.id}/${tagId}`,
+                req,
+                `${r.name} from this tag`
+              ),
+          },
     ],
     triggers,
     {

package/routes/delete.js

@@ -33,13 +33,13 @@ router.post(
     const { tableName, id } = req.params;
     const { redirect } = req.query;
     // todo check that works after where change
-    const table = await Table.findOne({ name : tableName });
+    const table = await Table.findOne({ name: tableName });
     const role = req.user && req.user.id ? req.user.role_id : 10;
     try {
       if (role <= table.min_role_write) await table.deleteRows({ id });
       else if (table.ownership_field_id && req.user) {
         const row = await table.getRow({ id });
-        if (row && (table.is_owner(req.user, row)))
+        if (row && table.is_owner(req.user, row))
           await table.deleteRows({ id });
         else req.flash("error", req.__("Not authorized"));
       } else

package/routes/edit.js

@@ -31,7 +31,7 @@ router.post(
     const { tableName, id, field_name } = req.params;
     const { redirect } = req.query;
     // todo check that works after where change
-    const table = await Table.findOne({ name : tableName });
+    const table = await Table.findOne({ name: tableName });
     const role = req.user && req.user.id ? req.user.role_id : 10;
     if (role <= table.min_role_write) await table.toggleBool(+id, field_name);
     else

package/routes/fields.js

@@ -28,11 +28,13 @@ const expressionBlurb = require("../markup/expression_blurb");
 const {
   readState,
   add_free_variables_to_joinfields,
+  calcfldViewConfig,
 } = require("@saltcorn/data/plugin-helper");
 const { wizardCardTitle } = require("../markup/forms.js");
 const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
 const { applyAsync } = require("@saltcorn/data/utils");
 const { text } = require("@saltcorn/markup/tags");
+const { mkFormContentNoLayout } = require("@saltcorn/markup/form");
 
 /**
  * @type {object}
@@ -291,7 +293,9 @@ const fieldFlow = (req) =>
         form: async (context) => {
           if (context.type === "File") {
             const roles = await User.get_roles();
-            const default_file_accept_filter = await getState().getConfig("files_accept_filter_default");
+            const default_file_accept_filter = await getState().getConfig(
+              "files_accept_filter_default"
+            );
             //console.log("default_file_accept_filter",default_file_accept_filter);
             return new Form({
               fields: [
@@ -317,7 +321,7 @@ const fieldFlow = (req) =>
                   type: "String",
                   label: req.__("Files accept filter"),
                   sublabel: req.__(
-                      "Specifies a filter for what file types the user can pick from the file input dialog box. Example is `.doc,audio/*,video/*,image/*`"
+                    "Specifies a filter for what file types the user can pick from the file input dialog box. Example is `.doc,audio/*,video/*,image/*`"
                   ),
                   default: default_file_accept_filter,
                 },
@@ -901,3 +905,45 @@ router.post(
     res.send("");
   })
 );
+
+router.post(
+  "/fieldviewcfgform/:tableName",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { tableName } = req.params;
+    const {
+      field_name,
+      fieldview,
+      type,
+      join_field,
+      join_fieldview,
+      _columndef,
+    } = req.body;
+    const table = await Table.findOne({ name: tableName });
+    const fieldName = type == "Field" ? field_name : join_field;
+    const fv_name = type == "Field" ? fieldview : join_fieldview;
+    if (!fieldName) {
+      res.send("");
+      return;
+    }
+
+    const field = await table.getField(fieldName);
+
+    const fieldViewConfigForms = await calcfldViewConfig([field], false, 0);
+    const formFields = fieldViewConfigForms[field.name][fv_name];
+    if (!formFields) {
+      res.send("");
+      return;
+    }
+    formFields.forEach((ff) => {
+      ff.class = ff.class ? `${ff.class} item-menu` : "item-menu";
+    });
+
+    const form = new Form({
+      formStyle: "vert",
+      fields: formFields,
+    });
+    if (_columndef) form.values = JSON.parse(_columndef);
+    res.send(mkFormContentNoLayout(form));
+  })
+);