@saltcorn/builder 0.9.4-beta.2 → 0.9.4-beta.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/builder",
-  "version": "0.9.4-beta.2",
+  "version": "0.9.4-beta.20",
   "description": "Drag and drop view builder for Saltcorn, open-source no-code platform",
   "main": "index.js",
   "homepage": "https://saltcorn.com",
@@ -20,6 +20,7 @@
     "@babel/preset-react": "7.9.4",
     "@craftjs/core": "0.1.0-beta.20",
     "@craftjs/utils": "0.1.0-beta.20",
+    "@saltcorn/common-code": "0.9.4-beta.20",
     "saltcorn-craft-layers-noeye": "0.1.0-beta.22",
     "@fonticonpicker/react-fonticonpicker": "1.2.0",
     "@fortawesome/fontawesome-svg-core": "1.2.34",
@@ -38,6 +39,7 @@
     "react-bootstrap-icons": "1.5.0",
     "react-contenteditable": "3.3.5",
     "react-dom": "16.13.1",
+    "react-select": "4.3.1",
     "react-test-renderer": "16.13.1",
     "react-transition-group": "4.4.1",
     "@tippyjs/react": "4.2.6",

package/src/components/Builder.js

@@ -18,7 +18,7 @@ import { JoinField } from "./elements/JoinField";
 import { Aggregation } from "./elements/Aggregation";
 import { LineBreak } from "./elements/LineBreak";
 import { ViewLink } from "./elements/ViewLink";
-import { Columns } from "./elements/Columns";
+import { Columns, ntimes } from "./elements/Columns";
 import { SearchBar } from "./elements/SearchBar";
 import { HTMLCode } from "./elements/HTMLCode";
 import { Action } from "./elements/Action";
@@ -37,6 +37,7 @@ import {
   ToolboxEdit,
   ToolboxPage,
   ToolboxFilter,
+  ToolboxList,
 } from "./Toolbox";
 import { craftToSaltcorn, layoutToNodes } from "./storage";
 import { Card } from "./elements/Card";
@@ -52,7 +53,13 @@ import {
   faRedo,
   faTrashAlt,
   faSave,
+  faExclamationTriangle,
+  faPlus,
 } from "@fortawesome/free-solid-svg-icons";
+import {
+  faCaretSquareLeft,
+  faCaretSquareRight,
+} from "@fortawesome/free-regular-svg-icons";
 import {
   Accordion,
   ErrorBoundary,
@@ -60,6 +67,8 @@ import {
 } from "./elements/utils";
 import { InitNewElement, Library } from "./Library";
 import { RenderNode } from "./RenderNode";
+import { ListColumn } from "./elements/ListColumn";
+import { ListColumns } from "./elements/ListColumns";
 const { Provider } = optionsCtx;
 
 /**
@@ -248,58 +257,20 @@ const SettingsPanel = () => {
   );
 };
 
-/**
- * @returns {button}
- * @category saltcorn-builder
- * @subcategory components
- * @namespace
- */
-const SaveButton = () => {
+const AddColumnButton = () => {
   const { query, actions } = useEditor(() => {});
   const options = useContext(optionsCtx);
-
-  /**
-   * @returns {void}
-   */
-  const onClick = () => {
-    const data = craftToSaltcorn(JSON.parse(query.serialize()));
-    const urlroot = options.page_id ? "pageedit" : "viewedit";
-    fetch(`/${urlroot}/savebuilder/${options.page_id || options.view_id}`, {
-      method: "POST", // or 'PUT'
-      headers: {
-        "Content-Type": "application/json",
-        "CSRF-Token": options.csrfToken,
-      },
-      body: JSON.stringify(data),
-    });
+  const addColumn = () => {
+    actions.addNodeTree(
+      query.parseReactElement(<ListColumn />).toNodeTree(),
+      "ROOT"
+    );
   };
-  return options.page_id || options.view_id ? (
-    <button
-      className="btn btn-sm btn-outline-secondary me-2 builder-save-ajax"
-      onClick={onClick}
-    >
-      Save
+  return (
+    <button className="btn btn-primary mt-2" onClick={addColumn}>
+      <FontAwesomeIcon icon={faPlus} className="me-2" />
+      Add column
     </button>
-  ) : (
-    ""
-  );
-};
-
-/**
- * @returns {a|""}
- * @category saltcorn-builder
- * @subcategory components
- * @namespace
- */
-const ViewPageLink = () => {
-  const { query, actions } = useEditor(() => {});
-  const options = useContext(optionsCtx);
-  return options.page_id ? (
-    <a target="_blank" className="d-block" href={`/page/${options.page_name}`}>
-      View page in new tab &raquo;
-    </a>
-  ) : (
-    ""
   );
 };
 
@@ -352,14 +323,18 @@ const NextButton = ({ layout }) => {
   const options = useContext(optionsCtx);
 
   useEffect(() => {
-    layoutToNodes(layout, query, actions);
+    layoutToNodes(layout, query, actions, "ROOT", options);
   }, []);
 
   /**
    * @returns {void}
    */
   const onClick = () => {
-    const { columns, layout } = craftToSaltcorn(JSON.parse(query.serialize()));
+    const { columns, layout } = craftToSaltcorn(
+      JSON.parse(query.serialize()),
+      "ROOT",
+      options
+    );
     document
       .querySelector("form#scbuildform input[name=columns]")
       .setAttribute("value", encodeURIComponent(JSON.stringify(columns)));
@@ -390,9 +365,10 @@ const Builder = ({ options, layout, mode }) => {
   const [previews, setPreviews] = useState({});
   const [uploadedFiles, setUploadedFiles] = useState([]);
   const nodekeys = useRef([]);
-  const [isSaving, setIsSaving] = useState(false);
+  const [savingState, setSavingState] = useState({ isSaving: false });
+  const [isEnlarged, setIsEnlarged] = useState(false);
+  const [isLeftEnlarged, setIsLeftEnlarged] = useState(false);
   const [relationsCache, setRelationsCache] = useState({});
-
   return (
     <ErrorBoundary>
       <Editor onRender={RenderNode}>
@@ -407,28 +383,51 @@ const Builder = ({ options, layout, mode }) => {
               }}
             >
               <div className="row" style={{ marginTop: "-5px" }}>
-                <div className="col-sm-auto left-builder-col">
+                <div
+                  className={`col-sm-auto left-builder-col ${
+                    isLeftEnlarged
+                      ? "builder-left-enlarged"
+                      : "builder-left-shrunk"
+                  }`}
+                >
                   <div className="componets-and-library-accordion toolbox-card">
                     <InitNewElement
                       nodekeys={nodekeys}
-                      setIsSaving={setIsSaving}
+                      setSavingState={setSavingState}
+                      savingState={savingState}
                     />
                     <Accordion>
                       <div className="card mt-1" accordiontitle="Components">
                         {{
-                          show: <ToolboxShow />,
-                          edit: <ToolboxEdit />,
-                          page: <ToolboxPage />,
-                          filter: <ToolboxFilter />,
+                          show: <ToolboxShow expanded={isLeftEnlarged} />,
+                          list: <ToolboxList expanded={isLeftEnlarged} />,
+                          edit: <ToolboxEdit expanded={isLeftEnlarged} />,
+                          page: <ToolboxPage expanded={isLeftEnlarged} />,
+                          filter: <ToolboxFilter expanded={isLeftEnlarged} />,
                         }[mode] || <div>Missing mode</div>}
                       </div>
                       <div accordiontitle="Library">
-                        <Library />
+                        <Library expanded={isLeftEnlarged} />
                       </div>
                     </Accordion>
                   </div>
-                  <div className="card toolbox-card pe-0">
-                    <div className="card-header">Layers</div>
+                  <div
+                    className="card toolbox-card pe-0"
+                    style={isLeftEnlarged ? { width: "13.4rem" } : {}}
+                  >
+                    <div className="card-header p-2 d-flex justify-content-between">
+                      <div>Layers</div>
+                      <FontAwesomeIcon
+                        icon={
+                          isLeftEnlarged
+                            ? faCaretSquareLeft
+                            : faCaretSquareRight
+                        }
+                        className={"float-end fa-lg"}
+                        onClick={() => setIsLeftEnlarged(!isLeftEnlarged)}
+                        title={isLeftEnlarged ? "Shrink" : "Enlarge"}
+                      />
+                    </div>
                     {showLayers && (
                       <div className="card-body p-0 builder-layers">
                         <Layers expandRootOnLoad={true} />
@@ -438,7 +437,9 @@ const Builder = ({ options, layout, mode }) => {
                 </div>
                 <div
                   id="builder-main-canvas"
-                  className={`col builder-mode-${options.mode}`}
+                  className={`col builder-mode-${options.mode} ${
+                    options.mode !== "list" ? "emptymsg" : ""
+                  }`}
                 >
                   <div>
                     <Frame
@@ -465,20 +466,45 @@ const Builder = ({ options, layout, mode }) => {
                         Tabs,
                         Table,
                         ToggleFilter,
+                        ListColumn,
+                        ListColumns,
                       }}
                     >
-                      <Element canvas is={Column}></Element>
+                      {options.mode === "list" ? (
+                        <Element canvas is={ListColumns}></Element>
+                      ) : (
+                        <Element canvas is={Column}></Element>
+                      )}
                     </Frame>
+                    {options.mode === "list" ? <AddColumnButton /> : null}
                   </div>
                 </div>
                 <div className="col-sm-auto builder-sidebar">
-                  <div style={{ width: "16rem" }}>
+                  <div style={{ width: isEnlarged ? "28rem" : "16rem" }}>
                     <NextButton layout={layout} />
                     <HistoryPanel />
                     <FontAwesomeIcon
                       icon={faSave}
-                      className={isSaving ? "d-inline" : "d-none"}
+                      className={savingState.isSaving ? "d-inline" : "d-none"}
+                    />
+                    <FontAwesomeIcon
+                      icon={faExclamationTriangle}
+                      color="#ff0033"
+                      className={savingState.error ? "d-inline" : "d-none"}
+                    />
+                    <FontAwesomeIcon
+                      icon={isEnlarged ? faCaretSquareRight : faCaretSquareLeft}
+                      className={"float-end me-2 mt-1 fa-lg"}
+                      onClick={() => setIsEnlarged(!isEnlarged)}
+                      title={isEnlarged ? "Shrink" : "Enlarge"}
                     />
+                    <div
+                      className={` ${
+                        savingState.error ? "d-block" : "d-none"
+                      } my-2 fw-bold`}
+                    >
+                      your work is not being saved
+                    </div>
                     <SettingsPanel />
                   </div>
                 </div>

package/src/components/Library.js

@@ -20,18 +20,7 @@ import faIcons from "./elements/faicons";
 import { craftToSaltcorn, layoutToNodes } from "./storage";
 import optionsCtx from "./context";
 import { WrapElem } from "./Toolbox";
-import { isEqual, throttle } from "lodash";
-
-/**
- *
- * @param {object[]} xs
- * @returns {object[]}
- */
-const twoByTwos = (xs) => {
-  if (xs.length <= 2) return [xs];
-  const [x, y, ...rest] = xs;
-  return [[x, y], ...twoByTwos(rest)];
-};
+import { isEqual, throttle, chunk } from "lodash";
 
 export /**
  * @param {object} props
@@ -94,7 +83,7 @@ export /**
  * @subcategory components
  * @namespace
  */
-const InitNewElement = ({ nodekeys, setIsSaving }) => {
+const InitNewElement = ({ nodekeys, savingState, setSavingState }) => {
   const [saveTimeout, setSaveTimeout] = useState(false);
   const savedData = useRef(false);
   const { actions, query, connectors } = useEditor((state, query) => {
@@ -104,7 +93,11 @@ const InitNewElement = ({ nodekeys, setIsSaving }) => {
   const doSave = (query) => {
     if (!query.serialize) return;
 
-    const data = craftToSaltcorn(JSON.parse(query.serialize()));
+    const data = craftToSaltcorn(
+      JSON.parse(query.serialize()),
+      "ROOT",
+      options
+    );
     const urlroot = options.page_id ? "pageedit" : "viewedit";
     if (savedData.current === false) {
       //do not save on first call
@@ -114,7 +107,7 @@ const InitNewElement = ({ nodekeys, setIsSaving }) => {
     }
     if (isEqual(savedData.current, JSON.stringify(data.layout))) return;
     savedData.current = JSON.stringify(data.layout);
-    setIsSaving(true);
+    setSavingState({ isSaving: true });
 
     fetch(`/${urlroot}/savebuilder/${options.page_id || options.view_id}`, {
       method: "POST", // or 'PUT'
@@ -123,9 +116,32 @@ const InitNewElement = ({ nodekeys, setIsSaving }) => {
         "CSRF-Token": options.csrfToken,
       },
       body: JSON.stringify(data),
-    }).then(() => {
-      setIsSaving(false);
-    });
+    })
+      .then((response) => {
+        response.json().then((data) => {
+          if (typeof data?.error === "string") {
+            // don't log duplicates
+            if (!savingState.error)
+              window.notifyAlert({ type: "danger", text: data.error });
+            setSavingState({ isSaving: false, error: data.error });
+          } else setSavingState({ isSaving: false });
+        });
+      })
+      .catch((e) => {
+        const text =
+          e.message === "Failed to fetch"
+            ? "Network connection lost"
+            : e || "Unable to save";
+        // don't log duplicates
+        if (savingState.error) setSavingState({ isSaving: false, error: text });
+        else {
+          window.notifyAlert({ type: "danger", text: text });
+          setSavingState({
+            isSaving: false,
+            error: text,
+          });
+        }
+      });
   };
   const throttledSave = useThrottle(() => {
     doSave(query);
@@ -148,7 +164,8 @@ const InitNewElement = ({ nodekeys, setIsSaving }) => {
           layout.layout ? layout.layout : layout,
           query,
           actions,
-          node.parent
+          node.parent,
+          options
         );
         setTimeout(() => {
           actions.delete(id);
@@ -184,7 +201,7 @@ export /**
  * @subcategory components
  * @namespace
  */
-const Library = () => {
+const Library = ({ expanded }) => {
   const { actions, selected, query, connectors } = useEditor((state, query) => {
     return {
       selected: state.events.selected,
@@ -200,7 +217,11 @@ const Library = () => {
    * @returns {void}
    */
   const addSelected = () => {
-    const layout = craftToSaltcorn(JSON.parse(query.serialize()), selected);
+    const layout = craftToSaltcorn(
+      JSON.parse(query.serialize()),
+      selected,
+      options
+    );
     const data = { layout, icon, name: newName };
     fetch(`/library/savefrombuilder`, {
       method: "POST", // or 'PUT'
@@ -216,7 +237,10 @@ const Library = () => {
     setRecent([...recent, data]);
   };
 
-  const elemRows = twoByTwos([...(options.library || []), ...recent]);
+  const elemRows = chunk(
+    [...(options.library || []), ...recent],
+    expanded ? 3 : 2
+  );
   return (
     <div className="builder-library">
       <div className="dropdown">

package/src/components/RenderNode.js

@@ -80,6 +80,11 @@ const RenderNode = ({ render }) => {
     currentDOM.style.left = left;
   }, [dom, getPos]);
 
+  useEffect(() => {
+    if (name === "Column" && parent && parent !== "ROOT")
+      actions.selectNode(parent);
+  }, [isActive]);
+
   useEffect(() => {
     document
       .getElementById("builder-main-canvas")