@saltcorn/server 0.8.7-beta.6 → 0.8.8-beta.0

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.7-beta.6",
+  "version": "0.8.8-beta.0",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.8.7-beta.6",
-    "@saltcorn/builder": "0.8.7-beta.6",
-    "@saltcorn/data": "0.8.7-beta.6",
-    "@saltcorn/admin-models": "0.8.7-beta.6",
-    "@saltcorn/filemanager": "0.8.7-beta.6",
-    "@saltcorn/markup": "0.8.7-beta.6",
-    "@saltcorn/sbadmin2": "0.8.7-beta.6",
+    "@saltcorn/base-plugin": "0.8.8-beta.0",
+    "@saltcorn/builder": "0.8.8-beta.0",
+    "@saltcorn/data": "0.8.8-beta.0",
+    "@saltcorn/admin-models": "0.8.8-beta.0",
+    "@saltcorn/filemanager": "0.8.8-beta.0",
+    "@saltcorn/markup": "0.8.8-beta.0",
+    "@saltcorn/sbadmin2": "0.8.8-beta.0",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/diagram_utils.js

@@ -49,7 +49,7 @@ function buildCard(node) {
         <h5 class="card-title">${type}</h5>
         <h6 class="card-subtitle text-muted">${label}</h6>
       </div>
-      <div class="card-body">
+      <div class="card-body pt-1">
         ${!isVirtual ? buildTagBadges(node) : "<h5>virtual</h5>"}
         ${buildCardBody(node)}
         <div>
@@ -198,6 +198,7 @@ function buildTagBadges(node) {
     id="_${type}_${objectId}_badges_id"
     class="mb-3"
   >
+    <h6 class="text-muted mb-0">Tags:</h6>
     ${existingTagBadges(node)}    
     <button 
       class="badge bg-primary" 
@@ -486,6 +487,25 @@ function reloadCy(keepViewPos) {
   });
 }
 
+function takePicture() {
+  const base64 = window.cy.png({ bg: "white" }).substr(22);
+  const decoded = window.atob(base64);
+  const bytes = new Uint8Array(decoded.length);
+  for (let i = 0; i < decoded.length; i++) {
+    bytes[i] = decoded.charCodeAt(i);
+  }
+  const blob = new Blob([bytes], { type: "image/png" });
+  const DOMURL = self.URL || self.webkitURL || self;
+  const url = DOMURL.createObjectURL(blob);
+  const link = document.createElement("a");
+  link.href = url;
+  link.download = "app-diagram.png";
+  link.click();
+  setTimeout(() => {
+    URL.revokeObjectURL(url);
+  }, 2000);
+}
+
 function toggleEntityFilter(type) {
   switch (type) {
     case "views": {

package/public/relationship_diagram_utils.js

@@ -39,7 +39,8 @@ var erHelper = (() => {
       }px) scale(${scale || 1.0})`
     );
   };
-
+  let mouseDown = false;
+  let isMoving = false;
   return {
     translateY: (val) => {
       const parsed = parseTransform();
@@ -54,22 +55,43 @@ var erHelper = (() => {
     zoom: (val) => {
       const parsed = parseTransform();
       parsed.scale += val;
+      if (parsed.scale < 0.1) parsed.scale = 0.1;
+      else if (parsed.scale > 20) parsed.scale = 20;
       buildTransform(parsed);
     },
     reset: () => {
       buildTransform();
     },
     takePicture: () => {
-      // TODO as png, so that you can download it via right click
-      // right now, you can only print it to pdf
       const svg = $("svg[aria-roledescription='er']")[0];
-      const DOMURL = self.URL || self.webkitURL || self;
-      const blob = new Blob([new XMLSerializer().serializeToString(svg)], {
-        type: "image/svg+xml;charset=utf-8",
-      });
-      const url = DOMURL.createObjectURL(blob);
-      window.open(url);
-      DOMURL.revokeObjectURL(url);
+      const link = document.createElement("a");
+      link.href = `data:image/svg+xml;base64,${btoa(
+        new XMLSerializer().serializeToString(svg)
+      )}`;
+      link.download = "er-diagram.svg";
+      link.click();
+    },
+    onWheel: (event) => {
+      event.preventDefault();
+      erHelper.zoom(-0.001 * event.deltaY);
+    },
+    onMouseDown: () => {
+      mouseDown = true;
+      isMoving = false;
+    },
+    onMouseUp: () => {
+      mouseDown = false;
+    },
+    onMouseMove: (event) => {
+      if (mouseDown) {
+        isMoving = true;
+        document.getSelection().removeAllRanges();
+        erHelper.translateX(event.movementX);
+        erHelper.translateY(event.movementY);
+      }
+    },
+    isTranslating: () => {
+      return isMoving;
     },
   };
 })();

package/public/saltcorn-common.js

@@ -122,9 +122,11 @@ function apply_showif() {
     if (currentOptionsSet === qs) return;
 
     const activate = (success, qs) => {
+      if (e.prop("data-fetch-options-current-set") === qs) return;
       e.empty();
       e.prop("data-fetch-options-current-set", qs);
-      if (!dynwhere.required) e.append($(`<option></option>`));
+      const toAppend = [];
+      if (!dynwhere.required) toAppend.push(`<option></option>`);
       let currentDataOption = undefined;
       const dataOptions = [];
       success.forEach((r) => {
@@ -141,8 +143,10 @@ function apply_showif() {
         const html = `<option ${
           selected ? "selected" : ""
         } value="${value}">${label}</option>`;
-        e.append($(html));
+        toAppend.push(html);
       });
+      e.html(toAppend.join(""));
+
       //TODO: also sort inserted HTML options
       dataOptions.sort((a, b) =>
         (a.text?.toLowerCase?.() || a.text) >
@@ -853,30 +857,41 @@ function emptyAlerts() {
 }
 
 function press_store_button(clicked) {
-  const width = $(clicked).width();
-  $(clicked).html('<i class="fas fa-spinner fa-spin"></i>').width(width);
+  let btn = clicked;
+  if ($(clicked).is("form")) btn = $(clicked).find("button[type=submit]");
+
+  const width = $(btn).width();
+  $(btn).html('<i class="fas fa-spinner fa-spin"></i>').width(width);
 }
 
 function common_done(res, isWeb = true) {
-  if (res.notify) notifyAlert(res.notify);
-  if (res.error) notifyAlert({ type: "danger", text: res.error });
-  if (res.eval_js) eval(res.eval_js);
+  const handle = (element, fn) => {
+    if (Array.isArray(element)) for (const current of element) fn(current);
+    else fn(element);
+  };
+  if (res.notify) handle(res.notify, notifyAlert);
+  if (res.error)
+    handle(res.error, (text) => notifyAlert({ type: "danger", text: text }));
+  if (res.eval_js) handle(res.eval_js, eval);
+
   if (res.reload_page) {
     (isWeb ? location : parent.location).reload(); //TODO notify to cookie if reload or goto
   }
   if (res.download) {
-    const dataurl = `data:${
-      res.download.mimetype || "application/octet-stream"
-    };base64,${res.download.blob}`;
-    fetch(dataurl)
-      .then((res) => res.blob())
-      .then((blob) => {
-        const link = document.createElement("a");
-        link.href = window.URL.createObjectURL(blob);
-        if (res.download.filename) link.download = res.download.filename;
-        else link.target = "_blank";
-        link.click();
-      });
+    handle(res.download, (download) => {
+      const dataurl = `data:${
+        download.mimetype || "application/octet-stream"
+      };base64,${download.blob}`;
+      fetch(dataurl)
+        .then((res) => res.blob())
+        .then((blob) => {
+          const link = document.createElement("a");
+          link.href = window.URL.createObjectURL(blob);
+          if (download.filename) link.download = download.filename;
+          else link.target = "_blank";
+          link.click();
+        });
+    });
   }
   if (res.goto && !isWeb)
     // TODO ch
@@ -901,6 +916,12 @@ function common_done(res, isWeb = true) {
   if (res.popup) {
     ajax_modal(res.popup);
   }
+  if (res.suppressed) {
+    notifyAlert({
+      type: "warning",
+      text: res.suppressed,
+    });
+  }
 }
 
 const repeaterCopyValuesToForm = (form, editor, noTriggerChange) => {

package/public/saltcorn.js

@@ -195,8 +195,11 @@ function ajax_done(res) {
   common_done(res);
 }
 
-function view_post(viewname, route, data, onDone) {
-  $.ajax("/view/" + viewname + "/" + route, {
+function view_post(viewname, route, data, onDone, sendState) {
+  const query = sendState
+    ? `?${new URL(get_current_state_url()).searchParams.toString()}`
+    : "";
+  $.ajax("/view/" + viewname + "/" + route + query, {
     dataType: "json",
     type: "POST",
     headers: {
@@ -250,12 +253,15 @@ function close_saltcorn_modal() {
   var myModalEl = document.getElementById("scmodal");
   if (!myModalEl) return;
   var modal = bootstrap.Modal.getInstance(myModalEl);
-  if (modal) modal.dispose();
+  if (modal) {
+    if (modal.hide) modal.hide();
+    if (modal.dispose) modal.dispose();
+  }
 }
 
 function ensure_modal_exists_and_closed() {
   if ($("#scmodal").length === 0) {
-    $("body").append(`<div id="scmodal", class="modal">
+    $("body").append(`<div id="scmodal" class="modal">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
@@ -264,7 +270,7 @@ function ensure_modal_exists_and_closed() {
             <span class="sc-ajax-indicator-wrapper">
               <span class="sc-ajax-indicator ms-2" style="display: none;"><i class="fas fa-save"></i></span>
             </span>
-            <a class="sc-modal-linkout ms-2" href="" target="_blank"><i class="fas fa-expand-alt"></i></a>
+            <a class="sc-modal-linkout ms-2" onclick="close_saltcorn_modal()" href="" target="_blank"><i class="fas fa-expand-alt"></i></a>
             <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">            
             </button>
           </div>

package/routes/admin.js

@@ -2019,6 +2019,8 @@ router.post(
     }
     if (form.values.tables) {
       await db.deleteWhere("_sc_table_constraints");
+      await db.deleteWhere("_sc_model_instances");
+      await db.deleteWhere("_sc_models");
 
       const tables = await Table.find();
 

package/routes/common_lists.js

@@ -101,9 +101,9 @@ const tablesList = async (tables, req, { tagId, domId, showList } = {}) => {
  * @param {object} req
  * @returns {Form}
  */
-const editViewRoleForm = (view, roles, req) =>
+const editViewRoleForm = (view, roles, req, on_done_redirect_str) =>
   editRoleForm({
-    url: `/viewedit/setrole/${view.id}`,
+    url: `/viewedit/setrole/${view.id}${on_done_redirect_str || ""}`,
     current_role: view.min_role,
     roles,
     req,
@@ -114,7 +114,7 @@ const editViewRoleForm = (view, roles, req) =>
  * @param {object} req
  * @returns {div}
  */
-const view_dropdown = (view, req) =>
+const view_dropdown = (view, req, on_done_redirect_str = "") =>
   settingsDropdown(`dropdownMenuButton${view.id}`, [
     a(
       {
@@ -126,17 +126,19 @@ const view_dropdown = (view, req) =>
     a(
       {
         class: "dropdown-item",
-        href: `/viewedit/edit/${encodeURIComponent(view.name)}`,
+        href: `/viewedit/edit/${encodeURIComponent(
+          view.name
+        )}${on_done_redirect_str}`,
       },
       '<i class="fas fa-edit"></i>&nbsp;' + req.__("Edit")
     ),
     post_dropdown_item(
-      `/viewedit/add-to-menu/${view.id}`,
+      `/viewedit/add-to-menu/${view.id}${on_done_redirect_str}`,
       '<i class="fas fa-bars"></i>&nbsp;' + req.__("Add to menu"),
       req
     ),
     post_dropdown_item(
-      `/viewedit/clone/${view.id}`,
+      `/viewedit/clone/${view.id}${on_done_redirect_str}`,
       '<i class="far fa-copy"></i>&nbsp;' + req.__("Duplicate"),
       req
     ),
@@ -149,7 +151,7 @@ const view_dropdown = (view, req) =>
     ),
     div({ class: "dropdown-divider" }),
     post_dropdown_item(
-      `/viewedit/delete/${view.id}`,
+      `/viewedit/delete/${view.id}${on_done_redirect_str}`,
       '<i class="far fa-trash-alt"></i>&nbsp;' + req.__("Delete"),
       req,
       true,
@@ -169,9 +171,15 @@ const setTableRefs = async (views) => {
   return views;
 };
 
-const viewsList = async (views, req, { tagId, domId, showList } = {}) => {
+const viewsList = async (
+  views,
+  req,
+  { tagId, domId, showList, on_done_redirect, notable } = {}
+) => {
   const roles = await User.get_roles();
-
+  const on_done_redirect_str = on_done_redirect
+    ? `?on_done_redirect=${on_done_redirect}`
+    : "";
   return views.length > 0
     ? mkTable(
         [
@@ -200,29 +208,36 @@ const viewsList = async (views, req, { tagId, domId, showList } = {}) => {
               ? `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,
-          },
+          ...(notable
+            ? []
+            : [
+                {
+                  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),
+            key: (row) =>
+              editViewRoleForm(row, roles, req, on_done_redirect_str),
           },
           {
             label: "",
             key: (r) =>
               link(
-                `/viewedit/config/${encodeURIComponent(r.name)}`,
+                `/viewedit/config/${encodeURIComponent(
+                  r.name
+                )}${on_done_redirect_str}`,
                 req.__("Configure")
               ),
           },
           !tagId
             ? {
                 label: "",
-                key: (r) => view_dropdown(r, req),
+                key: (r) => view_dropdown(r, req, on_done_redirect_str),
               }
             : {
                 label: req.__("Remove From Tag"),