@saltcorn/data 0.6.1-beta.2 → 0.6.2-beta.1

package/base-plugin/viewtemplates/edit.js

@@ -34,6 +34,7 @@ const {
   getForm,
   fill_presets,
   parse_view_select,
+  get_view_link_query,
 } = require("./viewable_fields");
 const {
   traverse,
@@ -43,7 +44,7 @@ const {
 const { asyncMap } = require("../../utils");
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Workflow}
  */
 const configuration_workflow = (req) =>
@@ -59,7 +60,7 @@ const configuration_workflow = (req) =>
 
           const { field_view_options, handlesTextStyle } = calcfldViewOptions(
             fields,
-            true
+            "edit"
           );
           const fieldViewConfigForms = await calcfldViewConfig(fields, true);
 
@@ -251,8 +252,8 @@ const configuration_workflow = (req) =>
   });
 
 /**
- * @param {*} table_id 
- * @param {*} viewname 
+ * @param {*} table_id
+ * @param {*} viewname
  * @param {object} opts
  * @param {*} opts.columns
  * @returns {Promise<object[]>}
@@ -266,8 +267,8 @@ const get_state_fields = async (table_id, viewname, { columns }) => [
 ];
 
 /**
- * @param {Form} form 
- * @param {string} locale 
+ * @param {Form} form
+ * @param {string} locale
  */
 const setDateLocales = (form, locale) => {
   form.fields.forEach((f) => {
@@ -281,12 +282,12 @@ const setDateLocales = (form, locale) => {
 const initial_config = initial_config_all_fields(true);
 
 /**
- * @param {number} table_id 
- * @param {string} viewname 
+ * @param {number} table_id
+ * @param {string} viewname
  * @param {object} optsOne
  * @param {*} optsOne.columns
  * @param {*} optsOne.layout
- * @param {string} state 
+ * @param {string} state
  * @param {object} optsTwo
  * @param {object} optsTwo.req
  * @param {object} optsTwo.res
@@ -320,13 +321,13 @@ const run = async (
 };
 
 /**
- * @param {number} table_id 
- * @param {string} viewname 
+ * @param {number} table_id
+ * @param {string} viewname
  * @param {object} opts
  * @param {*} opts.columns
  * @param {*} opts.layout
- * @param {State} state 
- * @param {object} extra 
+ * @param {State} state
+ * @param {object} extra
  * @returns {Promise<Form[]>}
  */
 const runMany = async (
@@ -477,21 +478,24 @@ const render = async ({
       }
     }
   });
+  await form.fill_fkey_options();
+
   await transformForm({ form, table, req, row, res });
+
   return renderForm(form, req.csrfToken());
 };
 
 /**
- * @param {number} table_id 
- * @param {string} viewname 
+ * @param {number} table_id
+ * @param {string} viewname
  * @param {object} optsOne
  * @param {object[]} optsOne.columns
  * @param {Layout} optsOne.layout
  * @param {object} optsOne.fixed
  * @param {boolean} optsOne.view_when_done
  * @param {object[]} optsOne.formula_destinations
- * @param {object} state 
- * @param {*} body 
+ * @param {object} state
+ * @param {*} body
  * @param {object} optsTwo
  * @param {object} optsTwo.res
  * @param {object} optsTwo.req
@@ -520,6 +524,7 @@ const runPost = async (
   form.validate(body);
   if (form.hasErrors) {
     if (req.xhr) res.status(422);
+    await form.fill_fkey_options();
     await transformForm({ form, table, req });
     res.sendWrap(viewname, renderForm(form, req.csrfToken()));
   } else {
@@ -550,8 +555,10 @@ const runPost = async (
         row,
         req.user ? +req.user.id : undefined
       );
-      if (ins_res.success) id = ins_res.success;
-      else {
+      if (ins_res.success) {
+        id = ins_res.success;
+        row[pk.name] = id;
+      } else {
         req.flash("error", text_attr(ins_res.error));
         res.sendWrap(viewname, renderForm(form, req.csrfToken()));
         return;
@@ -601,13 +608,13 @@ const runPost = async (
       if (
         (nxview.table_id === table_id || relation) &&
         state_fields.some((sf) => sf.name === pk.name)
-      )
-        res.redirect(
-          `/view/${text(viewname_when_done)}?${pk.name}=${text(
-            relation ? row[relation] : id
-          )}`
-        );
-      else res.redirect(`/view/${text(viewname_when_done)}`);
+      ) {
+        const get_query = get_view_link_query(fields);
+        const query = relation
+          ? `?${pk.name}=${text(row[relation])}`
+          : get_query(row);
+        res.redirect(`/view/${text(viewname_when_done)}${query}`);
+      } else res.redirect(`/view/${text(viewname_when_done)}`);
     }
   }
 };

package/base-plugin/viewtemplates/filter.js

@@ -6,6 +6,7 @@
 const User = require("../../models/user");
 const View = require("../../models/view");
 const Table = require("../../models/table");
+const Field = require("../../models/field");
 const Workflow = require("../../models/workflow");
 
 const {
@@ -17,10 +18,15 @@ const {
   select,
   button,
   text_attr,
+  script,
 } = require("@saltcorn/markup/tags");
 const renderLayout = require("@saltcorn/markup/layout");
 
-const { readState } = require("../../plugin-helper");
+const {
+  readState,
+  calcfldViewOptions,
+  calcfldViewConfig,
+} = require("../../plugin-helper");
 const { search_bar } = require("@saltcorn/markup/helpers");
 const {
   eachView,
@@ -53,11 +59,13 @@ const configuration_workflow = () =>
             const cfields = await cr.table.getFields();
             cfields.forEach((cf) => {
               if (cf.name !== cr.key_field.name)
-                fields.push({
-                  ...cf,
-                  label: `${cr.table.name}.${cr.key_field.name}→${cf.name}`,
-                  name: `${cr.table.name}.${cr.key_field.name}.${cf.name}`,
-                });
+                fields.push(
+                  new Field({
+                    ...cf,
+                    label: `${cr.table.name}.${cr.key_field.name}→${cf.name}`,
+                    name: `${cr.table.name}.${cr.key_field.name}.${cf.name}`,
+                  })
+                );
             });
           }
           const actions = ["Clear"];
@@ -76,12 +84,21 @@ const configuration_workflow = () =>
           const library = (await Library.find({})).filter((l) =>
             l.suitableFor("filter")
           );
+          const fieldViewConfigForms = await calcfldViewConfig(fields, false);
+
+          const { field_view_options, handlesTextStyle } = calcfldViewOptions(
+            fields,
+            "filter"
+          );
           return {
             fields,
+            tableName: table.name,
             roles,
             actions,
             views,
             library,
+            field_view_options,
+            fieldViewConfigForms,
             mode: "filter",
           };
         },
@@ -93,19 +110,19 @@ const configuration_workflow = () =>
 const get_state_fields = () => [];
 
 /**
- * 
+ *
  * @returns {Promise<object>}
  */
 const initial_config = async () => ({ layout: {}, columns: [] });
 
 /**
- * @param {number} table_id 
- * @param {string} viewname 
+ * @param {number} table_id
+ * @param {string} viewname
  * @param {object} opts
  * @param {object[]} opts.columns
  * @param {object} opts.layout
- * @param {object} state 
- * @param {object} extra 
+ * @param {object} state
+ * @param {object} extra
  * @returns {Promise<Layout>}
  */
 const run = async (table_id, viewname, { columns, layout }, state, extra) => {
@@ -115,6 +132,7 @@ const run = async (table_id, viewname, { columns, layout }, state, extra) => {
   const table = await Table.findOne(table_id);
   const fields = await table.getFields();
   readState(state, fields);
+
   const role = extra.req.user ? extra.req.user.role_id : 10;
   const distinct_values = {};
   for (const col of columns) {
@@ -181,6 +199,35 @@ const run = async (table_id, viewname, { columns, layout }, state, extra) => {
   });
   translateLayout(layout, extra.req.getLocale());
   const blockDispatch = {
+    field(segment) {
+      const { field_name, fieldview, configuration } = segment;
+      let field = fields.find((fld) => fld.name === field_name);
+      if (!field) return "";
+
+      if (
+        fieldview &&
+        field.type &&
+        field.type.fieldviews &&
+        field.type.fieldviews[fieldview]
+      ) {
+        const fv = field.type.fieldviews[fieldview];
+        if (fv.isEdit || fv.isFilter)
+          return fv.run(
+            field_name,
+            state[field_name],
+            {
+              onChange: `set_state_field('${field_name}', this.value)`,
+              ...field.attributes,
+              ...configuration,
+            },
+            "",
+            false,
+            segment,
+            state
+          );
+      }
+      return "";
+    },
     search_bar({ has_dropdown, contents, show_badges }, go) {
       const rendered_contents = go(contents);
       return search_bar("_fts", state["_fts"], {
@@ -276,15 +323,15 @@ const run = async (table_id, viewname, { columns, layout }, state, extra) => {
 };
 
 /**
- * @param {object|undefined} x 
- * @param {object|undefined} y 
+ * @param {object|undefined} x
+ * @param {object|undefined} y
  * @returns {object}
  */
 const or_if_undef = (x, y) => (typeof x === "undefined" ? y : x);
 
 /**
- * @param {string} x 
- * @param {string} y 
+ * @param {string} x
+ * @param {string} y
  * @returns {boolean}
  */
 const eq_string = (x, y) => `${x}` === `${y}`;

package/base-plugin/viewtemplates/list.js

@@ -37,7 +37,7 @@ const { get_existing_views } = require("../../models/discovery");
 const { InvalidConfiguration } = require("../../utils");
 
 /**
- * @param {object} context 
+ * @param {object} context
  * @returns {Promise<void>}
  */
 const create_db_view = async (context) => {
@@ -64,8 +64,8 @@ const create_db_view = async (context) => {
 };
 
 /**
- * @param {*} table_id 
- * @param {string} viewname 
+ * @param {*} table_id
+ * @param {string} viewname
  * @param {object} opts
  * @param {*} opts.default_state
  * @returns {Promise<void>}
@@ -83,7 +83,7 @@ const on_delete = async (table_id, viewname, { default_state }) => {
 };
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Workflow}
  */
 const configuration_workflow = (req) =>
@@ -283,8 +283,8 @@ const configuration_workflow = (req) =>
   });
 
 /**
- * @param {string} table_id 
- * @param {*} viewname 
+ * @param {string} table_id
+ * @param {*} viewname
  * @param {object} opts
  * @param {object[]} opts.columns
  * @returns {function}
@@ -313,8 +313,8 @@ const get_state_fields = async (table_id, viewname, { columns }) => {
 const initial_config = initial_config_all_fields(false);
 
 /**
- * @param {string|number} table_id 
- * @param {string} viewname 
+ * @param {string|number} table_id
+ * @param {string} viewname
  * @param {object} opts
  * @param {object[]} opts.columns
  * @param {string} [opts.view_to_create]
@@ -323,7 +323,7 @@ const initial_config = initial_config_all_fields(false);
  * @param {object} [opts.default_state]
  * @param {string} [opts.create_view_location]
  * @param {object} [stateWithId]
- * @param {object} extraOpts 
+ * @param {object} extraOpts
  * @returns {Promise<*>}
  */
 const run = async (
@@ -473,12 +473,12 @@ const run = async (
 };
 
 /**
- * @param {number} table_id 
- * @param {*} viewname 
+ * @param {number} table_id
+ * @param {*} viewname
  * @param {object} optsOne
  * @param {object[]} optsOne.columns
  * @param {*} optsOne.layout
- * @param {object} body 
+ * @param {object} body
  * @param {object} optsTwo
  * @param {object} optsTwo.req
  * @param {*} optsTwo.res
@@ -527,7 +527,7 @@ module.exports = {
   name: "List",
   /** @type {string} */
   description:
-    "Display multiple rows from a table in a grid with columns you specify", 
+    "Display multiple rows from a table in a grid with columns you specify",
   configuration_workflow,
   run,
   /** @type {string} */
@@ -537,13 +537,13 @@ module.exports = {
   on_delete,
   routes: { run_action },
   /**
-   * @param {object} opts 
+   * @param {object} opts
    * @returns {boolean}
    */
   display_state_form: (opts) =>
     !(opts && opts.default_state && opts.default_state._omit_state_form),
   /**
-   * @param {object} opts 
+   * @param {object} opts
    * @returns {boolean}
    */
   default_state_form: ({ default_state }) => {
@@ -552,7 +552,7 @@ module.exports = {
     return ds && removeDefaultColor(removeEmptyStrings(ds));
   },
   /**
-   * @param {object} opts 
+   * @param {object} opts
    * @param {*} opts.columns
    * @param {*} opts.create_view_label
    * @returns {string[]}

package/base-plugin/viewtemplates/room.js

@@ -36,8 +36,8 @@ const db = require("../../db");
 const { getForm, fill_presets } = require("./viewable_fields");
 
 /**
- * 
- * @param {object} req 
+ *
+ * @param {object} req
  * @returns {Workflow}
  */
 const configuration_workflow = (req) =>
@@ -184,8 +184,8 @@ const get_state_fields = () => [
 const limit = 10;
 
 /**
- * @param {string} table_id 
- * @param {string} viewname 
+ * @param {string} table_id
+ * @param {string} viewname
  * @param {object} optsOne
  * @param {string} optsOne.participant_field,
  * @param {string} optsOne.msg_relation
@@ -193,7 +193,7 @@ const limit = 10;
  * @param {string} optsOne.msgview
  * @param {string} optsOne.msgform
  * @param {string} optsOne.participant_maxread_field
- * @param {object} state 
+ * @param {object} state
  * @param {object} optsTwo
  * @param {object} optsTwo.req
  * @param {object} optsTwo.res
@@ -286,6 +286,8 @@ const run = async (
   form.class = `room-${state.id}`;
   form.hidden("room_id");
   form.values = { room_id: state.id };
+  await form.fill_fkey_options();
+
   return div(
     n_retrieved === limit &&
       button(
@@ -305,13 +307,13 @@ const run = async (
 };
 
 /**
- * @param {*} table_id 
- * @param {*} viewname 
- * @param {object} optsOne 
+ * @param {*} table_id
+ * @param {*} viewname
+ * @param {object} optsOne
  * @param {string} optsOne.participant_field
  * @param {string} optsOne.participant_maxread_field
- * @param {body} body 
- * @param {object} optsTwo 
+ * @param {body} body
+ * @param {object} optsTwo
  * @param {object} optsTwo.req
  * @param {object} optsTwo.res
  * @returns {Promise<void>}
@@ -365,8 +367,8 @@ const ack_read = async (
 };
 
 /**
- * @param {*} table_id 
- * @param {*} viewname 
+ * @param {*} table_id
+ * @param {*} viewname
  * @param {object} optsOne.
  * @param {string} optsOne.participant_field
  * @param {string} optsOne.msg_relation
@@ -374,10 +376,10 @@ const ack_read = async (
  * @param {string} optsOne.msgview
  * @param {*} optsOne.msgform
  * @param {*} optsOne.participant_maxread_field
- * @param {object} body 
- * @param {object} optsTwo 
+ * @param {object} body
+ * @param {object} optsTwo
  * @param {object} optsTwo.req
- * @param {object} optsTwo.res 
+ * @param {object} optsTwo.res
  * @returns {Promise<object>}
  */
 const fetch_older_msg = async (
@@ -445,8 +447,8 @@ const fetch_older_msg = async (
 };
 
 /**
- * @param {*} table_id 
- * @param {string} viewname 
+ * @param {*} table_id
+ * @param {string} viewname
  * @param {object} optsOne
  * @param {string} optsOne.participant_field
  * @param {string} optsOne.msg_relation
@@ -454,7 +456,7 @@ const fetch_older_msg = async (
  * @param {string} optsOne.msgview
  * @param {string} optsOne.msgform
  * @param {string} optsOne.participant_maxread_field
- * @param {*} body 
+ * @param {*} body
  * @param {object} optsTwo
  * @param {object} optsTwo.req
  * @param {object} optsTwo.res
@@ -549,8 +551,8 @@ const submit_msg_ajax = async (
 };
 
 /**
- * @param {*} table_id 
- * @param {string} viewname 
+ * @param {*} table_id
+ * @param {string} viewname
  * @param {object} opts
  * @param {*} opts.participant_field
  * @param {string} opts.msg_relation,
@@ -617,8 +619,8 @@ module.exports = {
   /**
    * @param {object} opts
    * @param {object} opts.participant_field
-   * @param {string} room_id 
-   * @param {object} user 
+   * @param {string} room_id
+   * @param {object} user
    * @returns {Promise<object>}
    */
   authorize_join: async ({ participant_field }, room_id, user) => {

package/base-plugin/viewtemplates/show.js

@@ -55,7 +55,7 @@ const { get_base_url } = require("../../models/config");
 const Library = require("../../models/library");
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Workflow}
  */
 const configuration_workflow = (req) =>
@@ -106,7 +106,7 @@ const configuration_workflow = (req) =>
           const fieldViewConfigForms = await calcfldViewConfig(fields, false);
           const { field_view_options, handlesTextStyle } = calcfldViewOptions(
             fields,
-            false
+            "show"
           );
           if (table.name === "users") {
             fields.push(
@@ -207,15 +207,15 @@ const get_state_fields = () => [
 const initial_config = initial_config_all_fields(false);
 
 /**
- * @param {string} table_id 
- * @param {string} viewname 
+ * @param {string} table_id
+ * @param {string} viewname
  * @param {object} opts
  * @param {object[]} opts.columns
  * @param {object} opts.layout
  * @param {string} [opts.page_title]
  * @param {boolean} opts.page_title_formula
- * @param {object} state 
- * @param {object} extra 
+ * @param {object} state
+ * @param {object} extra
  * @returns {Promise<string>}
  */
 const run = async (
@@ -332,13 +332,13 @@ const set_join_fieldviews = async ({ layout, fields }) => {
 };
 
 /**
- * @param {object} table 
- * @param {string} viewname 
+ * @param {object} table
+ * @param {string} viewname
  * @param {object} opts
  * @param {object[]} opts.columns
  * @param {object} opts.layout
- * @param {object} extra 
- * @param {object[]} rows 
+ * @param {object} extra
+ * @param {object[]} rows
  * @returns {Promise<string>}
  */
 const renderRows = async (
@@ -431,13 +431,13 @@ const renderRows = async (
 };
 
 /**
- * @param {number} table_id 
- * @param {string} viewname 
+ * @param {number} table_id
+ * @param {string} viewname
  * @param {object} opts
  * @param {object[]} opts.columns
  * @param {object} opts.layout
- * @param {object} state 
- * @param {object} extra 
+ * @param {object} state
+ * @param {object} extra
  * @returns {Promise<object[]>}
  */
 const runMany = async (
@@ -477,14 +477,14 @@ const runMany = async (
 };
 
 /**
- * @param {object} row 
- * @param {Field[]} fields 
- * @param {Layout} layout0 
- * @param {string} viewname 
- * @param {Table} table 
- * @param {Role} role 
- * @param {object} req 
- * @param {object} is_owner 
+ * @param {object} row
+ * @param {Field[]} fields
+ * @param {Layout} layout0
+ * @param {string} viewname
+ * @param {Table} table
+ * @param {Role} role
+ * @param {object} req
+ * @param {object} is_owner
  * @throws {Error}
  * @returns {Layout}
  */
@@ -627,14 +627,14 @@ const render = (row, fields, layout0, viewname, table, role, req, is_owner) => {
 };
 
 /**
- * @param {number} table_id 
- * @param {*} viewname 
+ * @param {number} table_id
+ * @param {*} viewname
  * @param {object} opts
  * @param {object[]} opts.columns
  * @param {*} opts.layout
- * @param {*} body 
+ * @param {*} body
  * @param {object} optsTwo
- * @param {object} optsTwo.req 
+ * @param {object} optsTwo.req
  * @param {*} optsTwo.res
  * @returns {Promise<object>}
  */