@saltcorn/builder 0.9.4-beta.8 → 0.9.4

package/src/components/elements/JoinField.js

@@ -376,6 +376,7 @@ const JoinFieldSettings = () => {
     textStyle,
     configuration,
     fieldview,
+    click_to_edit,
     node_id,
   } = useNode((node) => ({
     name: node.data.props.name,
@@ -383,7 +384,7 @@ const JoinFieldSettings = () => {
     textStyle: node.data.props.textStyle,
     fieldview: node.data.props.fieldview,
     configuration: node.data.props.configuration,
-
+    click_to_edit: node.data.props.click_to_edit,
     node_id: node.id,
   }));
   const options = useContext(optionsCtx);
@@ -493,6 +494,28 @@ const JoinFieldSettings = () => {
               </td>
             </tr>
           )}
+          {options.mode === "show" || options.mode === "list" ? (
+            <tr>
+              <td></td>
+              <td>
+                <div className="form-check">
+                  <input
+                    className="form-check-input"
+                    name="inline"
+                    type="checkbox"
+                    checked={click_to_edit}
+                    onChange={(e) => {
+                      if (e && e.target) {
+                        const target_value = e.target.checked;
+                        setProp((prop) => (prop.click_to_edit = target_value));
+                      }
+                    }}
+                  />
+                  <label className="form-check-label">Click to edit?</label>
+                </div>
+              </td>
+            </tr>
+          ) : null}
           <tr>
             <td></td>
             <td>
@@ -527,6 +550,7 @@ JoinField.craft = {
       { name: "name", segment_name: "join_field", column_name: "join_field" },
       "fieldview",
       "textStyle",
+      "click_to_edit",
       "block",
       { name: "configuration", default: {} },
     ],

package/src/components/elements/Link.js

@@ -281,6 +281,7 @@ const LinkSettings = () => {
             values={node}
             linkFirst={true}
             linkIsBlank={true}
+            allowRunOnLoad={false}
           />
         </tbody>
       </table>

package/src/components/elements/ListColumn.js

@@ -0,0 +1,177 @@
+/**
+ * @category saltcorn-builder
+ * @module components/elements/Column
+ * @subcategory components / elements
+ */
+
+import React, {
+  useContext,
+  Fragment,
+  useRef,
+  useEffect,
+  useState,
+} from "react";
+
+import { Element, useNode, useEditor } from "@craftjs/core";
+import { setAPropGen, SettingsFromFields } from "./utils";
+import { Column } from "./Column";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faArrowUp, faArrowDown } from "@fortawesome/free-solid-svg-icons";
+import optionsCtx from "../context";
+
+export /**
+ *
+ * @param {object} props
+ * @param {string} props.children
+ * @param {*} props.align
+ * @returns {div}
+ * @category saltcorn-builder
+ * @subcategory components
+ * @namespace
+ */
+const ListColumn = ({
+  alignment,
+  colIndex,
+  contents,
+  header_label,
+  showif,
+  col_width,
+  col_width_units,
+}) => {
+  const {
+    selected,
+    id,
+    connectors: { connect, drag },
+  } = useNode((node) => ({ selected: node.events.selected }));
+  const { actions, query, isActve } = useEditor((state) => ({}));
+  const options = useContext(optionsCtx);
+
+  const {
+    data: { parent },
+  } = query.node(id).get();
+  const siblings = query.node(parent).childNodes();
+  const nChildren = siblings.length;
+  const childIx = siblings.findIndex((sib) => sib === id);
+
+  const moveDown = () => {
+    const {
+      data: { parent },
+    } = query.node(id).get();
+    actions.move(id, parent, childIx + 2);
+  };
+  const moveUp = () => {
+    const {
+      data: { parent },
+    } = query.node(id).get();
+    actions.move(id, parent, childIx - 1);
+  };
+  return (
+    <div
+      className={`${
+        selected ? "selected-node" : ""
+      } d-flex w-100 list-column-outer`}
+      ref={(dom) => connect(drag(dom))}
+    >
+      <div className={`list-column flex-50 p-2`}>
+        <div className="d-flex justify-content-between h-100">
+          <div className="">
+            Column {childIx}
+            {header_label ? `: ${header_label}` : ""}
+            <br />
+            {showif ? (
+              <span className="badge bg-secondary me-2">showif</span>
+            ) : (
+              ""
+            )}
+            {alignment && alignment !== "Default" ? (
+              <span className="badge bg-secondary me-2">Align {alignment}</span>
+            ) : (
+              ""
+            )}
+            {col_width ? (
+              <span className="badge bg-secondary me-2">
+                {col_width}
+                {col_width_units}
+              </span>
+            ) : (
+              ""
+            )}
+          </div>
+          <div className="d-flex flex-column h-100 justify-content-between">
+            {childIx !== null && childIx > 0 ? (
+              <FontAwesomeIcon icon={faArrowUp} onClick={moveUp} />
+            ) : (
+              <span></span>
+            )}
+            {childIx !== null && childIx < nChildren - 1 ? (
+              <FontAwesomeIcon icon={faArrowDown} onClick={moveDown} />
+            ) : (
+              <span></span>
+            )}
+          </div>
+        </div>
+      </div>
+      <Element
+        canvas
+        id={`listcol`}
+        is={Column}
+        singleOccupancy={!options.allowMultipleElementsPerColumn}
+      >
+        {contents}
+      </Element>
+    </div>
+  );
+};
+
+const fields = [
+  {
+    name: "header_label",
+    label: "Header label",
+    type: "String",
+  },
+  {
+    name: "showif",
+    label: "Show if true",
+    sublabel: "Formula. Leave blank to always show",
+    class: "validate-expression",
+    type: "String",
+    required: false,
+  },
+  {
+    name: "col_width",
+    label: "Column width",
+    type: "Integer",
+    attributes: { asideNext: true },
+  },
+  {
+    name: "col_width_units",
+    label: "Units",
+    type: "String",
+    required: true,
+    attributes: {
+      inline: true,
+      options: ["px", "%", "vw", "em", "rem"],
+    },
+  },
+  {
+    name: "alignment",
+    label: "Alignment",
+    input_type: "select",
+    options: ["Default", "Left", "Center", "Right"],
+  },
+];
+ListColumn.craft = {
+  displayName: "ListColumn",
+  props: {},
+  rules: {
+    canDrag: () => true,
+  },
+  related: {
+    settings: SettingsFromFields(fields, {
+      additionalFieldsOptionKey: "additionalColumnFields",
+    }),
+    segment_type: "list_column",
+    hasContents: true,
+    colFields: fields,
+  },
+};

package/src/components/elements/ListColumns.js

@@ -0,0 +1,62 @@
+/**
+ * @category saltcorn-builder
+ * @module components/elements/ListColumns
+ * @subcategory components / elements
+ */
+
+import React, { useContext, Fragment } from "react";
+
+import { Element, useNode } from "@craftjs/core";
+import optionsCtx from "../context";
+
+export /**
+ *
+ * @param {object} props
+ * @param {string} props.children
+ * @param {*} props.align
+ * @returns {div}
+ * @category saltcorn-builder
+ * @subcategory components
+ * @namespace
+ */
+const ListColumns = ({ children, align }) => {
+  const {
+    selected,
+    id,
+    connectors: { connect, drag },
+  } = useNode((node) => ({ selected: node.events.selected }));
+  return (
+    <div className={selected ? "selected-node" : ""}>
+      <div className={` ${id === "ROOT" ? "root-canvas" : ""}`}>{children}</div>
+    </div>
+  );
+};
+
+export /**
+ * @returns {div}
+ * @category saltcorn-builder
+ * @subcategory components
+ * @namespace
+ */
+const ListColumnsSettings = () => {
+  useNode((node) => ({}));
+  return <div></div>;
+};
+
+/**
+ * @type {object}
+ */
+ListColumns.craft = {
+  displayName: "ListColumns",
+  props: {},
+  rules: {
+    canDrag: () => false,
+    canDrop: () => false,
+    canMoveIn: (incoming) => {
+      return incoming?.data?.displayName === "ListColumn";
+    },
+  },
+  related: {
+    settings: ListColumnsSettings,
+  },
+};

package/src/components/elements/RelationBadges.js

@@ -1,33 +1,49 @@
 import React from "react";
 import { removeWhitespaces } from "./utils";
+import { parseLegacyRelation, RelationType } from "@saltcorn/common-code";
 
-const buildBadgeCfgs = (parsed, parentTbl) => {
-  const result = [];
-  let currentCfg = null;
-  for (const { type, table, key } of parsed) {
-    if (type === "Inbound") {
-      if (currentCfg) result.push(currentCfg);
-      currentCfg = { up: key, table };
-    } else {
-      if (!currentCfg && key) result.push({ down: key, table: parentTbl });
-      else if (currentCfg) {
-        currentCfg.down = key;
-        result.push(currentCfg);
+const buildBadgeCfgs = (sourceTblName, type, path, caches) => {
+  if (type === RelationType.OWN)
+    return [{ table: `${sourceTblName} (same table)` }];
+  else if (type === RelationType.INDEPENDENT)
+    return [{ table: "None (no relation)" }];
+  else if (path.length === 0) return [{ table: "invalid relation" }];
+  else {
+    const result = [];
+    let currentCfg = null;
+    let currentTbl = sourceTblName;
+    for (const pathElement of path) {
+      if (pathElement.inboundKey) {
+        if (currentCfg) result.push(currentCfg);
+        currentTbl = pathElement.table;
+        currentCfg = { up: pathElement.inboundKey, table: currentTbl };
+      } else if (pathElement.fkey) {
+        if (!currentCfg)
+          result.push({ down: pathElement.fkey, table: currentTbl });
+        else {
+          currentCfg.down = pathElement.fkey;
+          result.push(currentCfg);
+        }
+        const tblObj = caches.tableNameCache[currentTbl];
+        const fkey = tblObj.foreign_keys.find(
+          (key) => key.name === pathElement.fkey
+        );
+        currentTbl = fkey.reftable_name;
+        currentCfg = { table: currentTbl };
       }
-      currentCfg = { table };
     }
-  }
-  if (
-    currentCfg &&
-    !result.find(
-      ({ down, table, up }) =>
-        down === currentCfg.down &&
-        table === currentCfg.table &&
-        up === currentCfg.up
+    if (
+      currentCfg &&
+      !result.find(
+        ({ down, table, up }) =>
+          down === currentCfg.down &&
+          table === currentCfg.table &&
+          up === currentCfg.up
+      )
     )
-  )
-    result.push(currentCfg);
-  return result;
+      result.push(currentCfg);
+    return result;
+  }
 };
 
 const buildBadge = ({ up, table, down }, index) => {
@@ -59,41 +75,34 @@ const buildBadge = ({ up, table, down }, index) => {
   );
 };
 
-export const RelationBadges = ({
-  view,
-  relation,
-  parentTbl,
-  tableNameCache,
-}) => {
+export const RelationBadges = ({ view, relation, parentTbl, caches }) => {
   if (relation) {
-    const parsed = relationHelpers.parseRelationPath(relation, tableNameCache);
-
     return (
       <div className="overflow-scroll">
-        {parsed.length > 0
-          ? buildBadgeCfgs(parsed, parentTbl).map(buildBadge)
-          : buildBadge({ table: "invalid relation" }, 0)}
+        {buildBadgeCfgs(
+          relation.sourceTblName,
+          relation.type,
+          relation.path,
+          caches
+        ).map(buildBadge)}
       </div>
     );
   } else {
     if (!view) return buildBadge({ table: "invalid relation" }, 0);
     const [prefix, rest] = view.split(":");
-    const parsed = relationHelpers.parseLegacyRelation(prefix, rest, parentTbl);
-    if (parsed.length === 0)
-      return buildBadge({ table: "invalid relation" }, 0);
-    else if (
-      parsed.length === 1 &&
-      (parsed[0].type === "Independent" || parsed[0].type === "Own")
-    )
+    if (!rest) return buildBadge({ table: "invalid relation" }, 0);
+    const { type, path } = parseLegacyRelation(prefix, rest, parentTbl);
+    if (path.length === 0) return buildBadge({ table: "invalid relation" }, 0);
+    else if (path.length === 1 && (type === "Independent" || type === "Own"))
       return (
         <div className="overflow-scroll">
-          {buildBadge({ table: parsed[0].table }, 0)}
+          {buildBadge({ table: path[0].table }, 0)}
         </div>
       );
     else
       return (
         <div className="overflow-scroll">
-          {buildBadgeCfgs(parsed, parentTbl).map(buildBadge)}
+          {buildBadgeCfgs(parentTbl, type, path, caches).map(buildBadge)}
         </div>
       );
   }

package/src/components/elements/Tabs.js

@@ -185,6 +185,7 @@ const TabsSettings = () => {
     titles: node.data.props.titles,
     showif: node.data.props.showif,
     field: node.data.props.field,
+    acc_init_opens: node.data.props.acc_init_opens,
   }));
   const {
     actions: { setProp },
@@ -200,6 +201,7 @@ const TabsSettings = () => {
     tabId,
     showif,
     setting_tab_n,
+    acc_init_opens,
   } = node;
   const use_setting_tab_n = setting_tab_n || 0;
   const options = useContext(optionsCtx);
@@ -424,7 +426,9 @@ const TabsSettings = () => {
                 />
               </td>
             </tr>
-            {options.mode === "show" || options.mode === "edit" ? (
+            {options.mode === "show" ||
+            options.mode === "edit" ||
+            options.mode === "filter" ? (
               <Fragment>
                 <tr>
                   <th colSpan="2">Show if formula</th>
@@ -448,6 +452,29 @@ const TabsSettings = () => {
                 </tr>
               </Fragment>
             ) : null}
+            {tabsStyle === "Accordion" ? (
+              <tr>
+                <td colSpan="2">
+                  <div className="form-check">
+                    <input
+                      className="form-check-input"
+                      name="block"
+                      type="checkbox"
+                      checked={acc_init_opens?.[use_setting_tab_n] || false}
+                      onChange={(e) => {
+                        if (!e.target) return;
+                        const value = e.target.checked;
+                        setProp((prop) => {
+                          if (!prop.acc_init_opens) prop.acc_init_opens = [];
+                          prop.acc_init_opens[use_setting_tab_n] = value;
+                        });
+                      }}
+                    />
+                    <label className="form-check-label">Initially open</label>
+                  </div>
+                </td>
+              </tr>
+            ) : null}
           </Fragment>
         )}
       </tbody>
@@ -462,6 +489,7 @@ Tabs.craft = {
   props: {
     titles: ["Tab1", "Tab2"],
     showif: [],
+    acc_init_opens: [],
     ntabs: 2,
     tabsStyle: "Tabs",
     independent: false,

package/src/components/elements/Text.js

@@ -179,9 +179,11 @@ const TextSettings = () => {
   } = node;
   const { mode, fields } = useContext(optionsCtx);
   const setAProp = setAPropGen(setProp);
+  const allowFormula = mode === "show" || mode === "list";
+
   return (
     <div>
-      {mode === "show" && (
+      {allowFormula && (
         <div className="form-check">
           <input
             type="checkbox"
@@ -197,7 +199,7 @@ const TextSettings = () => {
         </div>
       )}
       <label>Text to display</label>
-      {mode === "show" && isFormula.text ? (
+      {allowFormula && isFormula.text ? (
         <input
           type="text"
           className="text-to-display form-control"