@saltcorn/builder 0.9.4-beta.1 → 0.9.4-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/builder",
-  "version": "0.9.4-beta.1",
+  "version": "0.9.4-beta.10",
   "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.10",
     "saltcorn-craft-layers-noeye": "0.1.0-beta.22",
     "@fonticonpicker/react-fonticonpicker": "1.2.0",
     "@fortawesome/fontawesome-svg-core": "1.2.34",

package/src/components/Builder.js

@@ -52,7 +52,12 @@ import {
   faRedo,
   faTrashAlt,
   faSave,
+  faExclamationTriangle,
 } from "@fortawesome/free-solid-svg-icons";
+import {
+  faCaretSquareLeft,
+  faCaretSquareRight,
+} from "@fortawesome/free-regular-svg-icons";
 import {
   Accordion,
   ErrorBoundary,
@@ -390,9 +395,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 +413,50 @@ 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} />,
+                          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: "12.35rem" } : {}}
+                  >
+                    <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} />
@@ -472,13 +500,31 @@ const Builder = ({ options, layout, mode }) => {
                   </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) => {
@@ -114,7 +103,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 +112,29 @@ 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 || "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);
@@ -184,7 +193,7 @@ export /**
  * @subcategory components
  * @namespace
  */
-const Library = () => {
+const Library = ({ expanded }) => {
   const { actions, selected, query, connectors } = useEditor((state, query) => {
     return {
       selected: state.events.selected,
@@ -216,7 +225,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/Toolbox.js

@@ -35,6 +35,7 @@ import {
   SegmentedNav,
   TextareaT,
 } from "react-bootstrap-icons";
+import { chunk } from "lodash";
 
 /**
  *
@@ -510,13 +511,24 @@ const TableElem = ({ connectors }) => (
   </WrapElem>
 );
 
+const chunkToolBox = (elems, expanded) => {
+  const chunks = chunk(elems, expanded ? 3 : 2);
+  return chunks.map((es, ix) => (
+    <div className="toolbar-row" key={ix}>
+      {es.map((e, j) => (
+        <Fragment key={j}>{e}</Fragment>
+      ))}
+    </div>
+  ));
+};
+
 export /**
  * @returns {Fragment}
  * @category saltcorn-builder
  * @subcategory components / Toolbox
  * @namespace
  */
-const ToolboxShow = () => {
+const ToolboxShow = ({ expanded }) => {
   const { connectors, query } = useEditor();
   const options = useContext(optionsCtx);
   const {
@@ -527,52 +539,35 @@ const ToolboxShow = () => {
     views,
     images,
   } = options;
-  return (
-    <Fragment>
-      <div className="toolbar-row">
-        <TextElem connectors={connectors} />
-        <ColumnsElem connectors={connectors} />
-      </div>
-      <div className="toolbar-row">
-        <FieldElem
-          connectors={connectors}
-          fields={fields}
-          field_view_options={field_view_options}
-        />
-        <LineBreakElem connectors={connectors} />
-      </div>
-      <div className="toolbar-row">
-        <JoinFieldElem connectors={connectors} options={options} />
-        <ViewLinkElem connectors={connectors} options={options} />
-      </div>
-      <div className="toolbar-row">
-        <ActionElem connectors={connectors} options={options} />
-        <LinkElem connectors={connectors} />
-      </div>
-      <div className="toolbar-row">
-        <AggregationElem
-          connectors={connectors}
-          child_field_list={child_field_list}
-          agg_field_opts={agg_field_opts}
-        />
-        <ViewElem connectors={connectors} views={views} />
-      </div>
-      <div className="toolbar-row">
-        <ContainerElem connectors={connectors} />
-        <CardElem connectors={connectors} />
-      </div>
-      <div className="toolbar-row">
-        <TabsElem connectors={connectors} />
-        <ImageElem connectors={connectors} images={images} />
-      </div>
-      <div className="toolbar-row">
-        <HTMLElem connectors={connectors} />
-        <DropMenuElem connectors={connectors} />
-      </div>
-      <div className="toolbar-row">
-        <TableElem connectors={connectors} />
-      </div>
-    </Fragment>
+  return chunkToolBox(
+    [
+      <TextElem connectors={connectors} />,
+      <ColumnsElem connectors={connectors} />,
+      <FieldElem
+        connectors={connectors}
+        fields={fields}
+        field_view_options={field_view_options}
+      />,
+      <LineBreakElem connectors={connectors} />,
+      <JoinFieldElem connectors={connectors} options={options} />,
+      <ViewLinkElem connectors={connectors} options={options} />,
+      <ActionElem connectors={connectors} options={options} />,
+      <LinkElem connectors={connectors} />,
+      <AggregationElem
+        connectors={connectors}
+        child_field_list={child_field_list}
+        agg_field_opts={agg_field_opts}
+      />,
+      <ViewElem connectors={connectors} views={views} />,
+      <ContainerElem connectors={connectors} />,
+      <CardElem connectors={connectors} />,
+      <TabsElem connectors={connectors} />,
+      <ImageElem connectors={connectors} images={images} />,
+      <HTMLElem connectors={connectors} />,
+      <DropMenuElem connectors={connectors} />,
+      <TableElem connectors={connectors} />,
+    ],
+    expanded
   );
 };
 
@@ -582,50 +577,34 @@ export /**
  * @subcategory components / Toolbox
  * @namespace
  */
-const ToolboxFilter = () => {
+const ToolboxFilter = ({ expanded }) => {
   const { connectors, query } = useEditor();
   const options = useContext(optionsCtx);
   const { fields, views, field_view_options } = options;
-  return (
-    <Fragment>
-      <div className="toolbar-row">
-        <TextElem connectors={connectors} />
-        <ColumnsElem connectors={connectors} />
-      </div>
-      <div className="toolbar-row">
-        <FieldElem
-          connectors={connectors}
-          fields={fields}
-          field_view_options={field_view_options}
-        />
-        <LineBreakElem connectors={connectors} />
-      </div>
-      <div className="toolbar-row">
-        <DropDownFilterElem connectors={connectors} fields={fields} />
-        <ToggleFilterElem connectors={connectors} fields={fields} />
-      </div>
-      <div className="toolbar-row">
-        <SearchElem connectors={connectors} />
-        <ActionElem connectors={connectors} options={options} />
-      </div>
-      <div className="toolbar-row">
-        <ContainerElem connectors={connectors} />
-
-        <CardElem connectors={connectors} />
-      </div>
-      <div className="toolbar-row">
-        <TabsElem connectors={connectors} />
-        <ViewElem connectors={connectors} views={views} />
-      </div>
-      <div className="toolbar-row">
-        <HTMLElem connectors={connectors} />
-        <LinkElem connectors={connectors} />
-      </div>
-      <div className="toolbar-row">
-        <TableElem connectors={connectors} />
-        <DropMenuElem connectors={connectors} />
-      </div>
-    </Fragment>
+  return chunkToolBox(
+    [
+      <TextElem connectors={connectors} />,
+      <ColumnsElem connectors={connectors} />,
+      <FieldElem
+        connectors={connectors}
+        fields={fields}
+        field_view_options={field_view_options}
+      />,
+      <LineBreakElem connectors={connectors} />,
+      <DropDownFilterElem connectors={connectors} fields={fields} />,
+      <ToggleFilterElem connectors={connectors} fields={fields} />,
+      <SearchElem connectors={connectors} />,
+      <ActionElem connectors={connectors} options={options} />,
+      <ContainerElem connectors={connectors} />,
+      <CardElem connectors={connectors} />,
+      <TabsElem connectors={connectors} />,
+      <ViewElem connectors={connectors} views={views} />,
+      <HTMLElem connectors={connectors} />,
+      <LinkElem connectors={connectors} />,
+      <TableElem connectors={connectors} />,
+      <DropMenuElem connectors={connectors} />,
+    ],
+    expanded
   );
 };
 
@@ -635,49 +614,34 @@ export /**
  * @subcategory components / Toolbox
  * @namespace
  */
-const ToolboxEdit = () => {
+const ToolboxEdit = ({ expanded }) => {
   const { connectors, query } = useEditor();
   const options = useContext(optionsCtx);
   const { fields, field_view_options, images, views } = options;
-  return (
-    <Fragment>
-      <div className="toolbar-row">
-        <TextElem connectors={connectors} />
-        <ColumnsElem connectors={connectors} />
-      </div>
-      <div className="toolbar-row">
-        <FieldElem
-          connectors={connectors}
-          fields={fields}
-          field_view_options={field_view_options}
-        />
-        <LineBreakElem connectors={connectors} />
-      </div>
-      <div className="toolbar-row">
-        <ActionElem connectors={connectors} options={options} />
-        <ContainerElem connectors={connectors} />
-      </div>
-      <div className="toolbar-row">
-        <CardElem connectors={connectors} />
-        <TabsElem connectors={connectors} />
-      </div>
-      <div className="toolbar-row">
-        <LinkElem connectors={connectors} />
-        <ImageElem connectors={connectors} images={images} />
-      </div>
-      <div className="toolbar-row">
-        <HTMLElem connectors={connectors} />
-        <ViewElem connectors={connectors} views={views} />
-      </div>
-      <div className="toolbar-row">
-        <JoinFieldElem connectors={connectors} options={options} />
-        <DropMenuElem connectors={connectors} />
-      </div>
-      <div className="toolbar-row">
-        <TableElem connectors={connectors} />
-        <ViewLinkElem connectors={connectors} options={options} />
-      </div>
-    </Fragment>
+  return chunkToolBox(
+    [
+      <TextElem connectors={connectors} />,
+      <ColumnsElem connectors={connectors} />,
+      <FieldElem
+        connectors={connectors}
+        fields={fields}
+        field_view_options={field_view_options}
+      />,
+      <LineBreakElem connectors={connectors} />,
+      <ActionElem connectors={connectors} options={options} />,
+      <ContainerElem connectors={connectors} />,
+      <CardElem connectors={connectors} />,
+      <TabsElem connectors={connectors} />,
+      <LinkElem connectors={connectors} />,
+      <ImageElem connectors={connectors} images={images} />,
+      <HTMLElem connectors={connectors} />,
+      <ViewElem connectors={connectors} views={views} />,
+      <JoinFieldElem connectors={connectors} options={options} />,
+      <DropMenuElem connectors={connectors} />,
+      <TableElem connectors={connectors} />,
+      <ViewLinkElem connectors={connectors} options={options} />,
+    ],
+    expanded
   );
 };
 
@@ -687,43 +651,28 @@ export /**
  * @subcategory components / Toolbox
  * @namespace
  */
-const ToolboxPage = () => {
+const ToolboxPage = ({ expanded }) => {
   const { connectors, query } = useEditor();
   const options = useContext(optionsCtx);
   const { views, pages, images } = options;
-  return (
-    <Fragment>
-      <div className="toolbar-row">
-        <TextElem connectors={connectors} />
-        <ColumnsElem connectors={connectors} />
-      </div>
-      <div className="toolbar-row">
-        <LineBreakElem connectors={connectors} />
-        <HTMLElem connectors={connectors} />
-      </div>
-      <div className="toolbar-row">
-        <CardElem connectors={connectors} />
-        <ImageElem connectors={connectors} images={images} />{" "}
-      </div>
-      <div className="toolbar-row">
-        <LinkElem connectors={connectors} />
-        <ViewElem connectors={connectors} views={views} isPageEdit={true} />
-      </div>
-      <div className="toolbar-row">
-        <SearchElem connectors={connectors} />
-        <ActionElem connectors={connectors} options={options} />
-      </div>
-      <div className="toolbar-row">
-        <ContainerElem connectors={connectors} />
-        <TabsElem connectors={connectors} />
-      </div>
-      <div className="toolbar-row">
-        <DropMenuElem connectors={connectors} />
-        <PageElem connectors={connectors} pages={pages} />
-      </div>
-      <div className="toolbar-row">
-        <TableElem connectors={connectors} />
-      </div>
-    </Fragment>
+  return chunkToolBox(
+    [
+      <TextElem connectors={connectors} />,
+      <ColumnsElem connectors={connectors} />,
+      <LineBreakElem connectors={connectors} />,
+      <HTMLElem connectors={connectors} />,
+      <CardElem connectors={connectors} />,
+      <ImageElem connectors={connectors} images={images} />,
+      <LinkElem connectors={connectors} />,
+      <ViewElem connectors={connectors} views={views} isPageEdit={true} />,
+      <SearchElem connectors={connectors} />,
+      <ActionElem connectors={connectors} options={options} />,
+      <ContainerElem connectors={connectors} />,
+      <TabsElem connectors={connectors} />,
+      <DropMenuElem connectors={connectors} />,
+      <PageElem connectors={connectors} pages={pages} />,
+      <TableElem connectors={connectors} />,
+    ],
+    expanded
   );
 };

package/src/components/elements/Columns.js

@@ -250,7 +250,7 @@ const ColumnsSettings = () => {
           setProp={setProp}
           props={node}
         ></ConfigField>
-        <table>
+        <table className="w-100">
           <tbody>
             <SettingsSectionHeaderRow title="Align" />
             <SettingsRow

package/src/components/elements/Container.js

@@ -738,7 +738,7 @@ const ContainerSettings = () => {
           )}
           {["show", "edit", "filter"].includes(options.mode) && (
             <tr>
-              <td>
+              <td colSpan={2}>
                 <input
                   type="text"
                   className="form-control text-to-display"