@saltcorn/server 0.8.8-beta.0 → 0.8.8-beta.2

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.8-beta.0",
+  "version": "0.8.8-beta.2",
   "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.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",
+    "@saltcorn/base-plugin": "0.8.8-beta.2",
+    "@saltcorn/builder": "0.8.8-beta.2",
+    "@saltcorn/data": "0.8.8-beta.2",
+    "@saltcorn/admin-models": "0.8.8-beta.2",
+    "@saltcorn/filemanager": "0.8.8-beta.2",
+    "@saltcorn/markup": "0.8.8-beta.2",
+    "@saltcorn/sbadmin2": "0.8.8-beta.2",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn.js

@@ -282,6 +282,10 @@ function ensure_modal_exists_and_closed() {
     </div>
   </div>`);
   } else if ($("#scmodal").hasClass("show")) {
+    // remove reload handler added by edit, for when we have popup link
+    // in autosave edit in popup
+    $("#scmodal").off("hidden.bs.modal");
+
     close_saltcorn_modal();
   }
 }
@@ -319,7 +323,9 @@ function ajax_modal(url, opts = {}) {
       if (title) $("#scmodal .modal-title").html(decodeURIComponent(title));
       $("#scmodal .modal-body").html(res);
       $("#scmodal").prop("data-modal-state", url);
-      new bootstrap.Modal($("#scmodal")).show();
+      new bootstrap.Modal($("#scmodal"), {
+        focus: false,
+      }).show();
       initialize_page();
       (opts.onOpen || function () {})(res);
       $("#scmodal").on("hidden.bs.modal", function (e) {
@@ -669,6 +675,9 @@ function build_mobile_app(button) {
   form.serializeArray().forEach((item) => {
     params[item.name] = item.value;
   });
+  params.synchedTables = Array.from($("#synched-tbls-select-id")[0].options)
+    .filter((option) => !option.hidden)
+    .map((option) => option.value);
   ajax_post("/admin/build-mobile-app", {
     data: params,
     success: (data) => {
@@ -682,6 +691,40 @@ function build_mobile_app(button) {
   });
 }
 
+function move_to_synched() {
+  const opts = $("#unsynched-tbls-select-id");
+  $("#synched-tbls-select-id").removeAttr("selected");
+  for (const selected of opts.val()) {
+    const jUnsOpt = $(`[id='${selected}_unsynched_opt']`);
+    jUnsOpt.attr("hidden", "true");
+    jUnsOpt.removeAttr("selected");
+    const jSynOpt = $(`[id='${selected}_synched_opt']`);
+    jSynOpt.removeAttr("hidden");
+    jSynOpt.removeAttr("selected");
+  }
+}
+
+function move_to_unsynched() {
+  const opts = $("#synched-tbls-select-id");
+  $("#unsynched-tbls-select-id").removeAttr("selected");
+  for (const selected of opts.val()) {
+    const jSynOpt = $(`[id='${selected}_synched_opt']`);
+    jSynOpt.attr("hidden", "true");
+    jSynOpt.removeAttr("selected");
+    const jUnsOpt = $(`[id='${selected}_unsynched_opt']`);
+    jUnsOpt.removeAttr("hidden");
+    jUnsOpt.removeAttr("selected");
+  }
+}
+
+function toggle_tbl_sync() {
+  if ($("#offlineModeBoxId")[0].checked === true) {
+    $("#tblSyncSelectorId").attr("hidden", false);
+  } else {
+    $("#tblSyncSelectorId").attr("hidden", true);
+  }
+}
+
 function join_field_clicked(e, fieldPath) {
   $("#inputjoin_field").val(fieldPath);
   apply_showif();

package/routes/actions.js

@@ -211,6 +211,7 @@ const triggerForm = async (req, trigger) => {
         name: "description",
         label: req.__("Description"),
         type: "String",
+        fieldview: "textarea",
         sublabel: req.__(
           "Description allows you to give more information about the action"
         ),
@@ -400,8 +401,8 @@ router.get(
       });
       form.values = trigger.configuration;
       const events = Trigger.when_options;
-      const actions = await Trigger.find({
-        when_trigger: { or: ["API call", "Never"] },
+      const actions = Trigger.find({
+        when_trigger: {or: ["API call", "Never"]},
       });
       const tables = (await Table.find({})).map((t) => ({
         name: t.name,
@@ -430,7 +431,7 @@ router.get(
                   div(
                     button(
                       { class: "btn btn-primary mt-2", id: "blocklySave" },
-                      "Save"
+                      req.__("Save")
                     ),
                     renderForm(form, req.csrfToken()),
                     script(

package/routes/admin.js

@@ -1491,7 +1491,7 @@ router.get(
     const images = (await File.find({ mime_super: "image" })).filter((image) =>
       image.filename?.endsWith(".png")
     );
-
+    const withSyncInfo = await Table.find({ has_sync_info: true });
     send_admin_page({
       res,
       req,
@@ -1752,7 +1752,6 @@ router.get(
                   ),
 
                   div(
-                    // TODO only for some tables?
                     { class: "row pb-2" },
                     div(
                       { class: "col-sm-4" },
@@ -1761,6 +1760,8 @@ router.get(
                         id: "offlineModeBoxId",
                         class: "form-check-input me-2",
                         name: "allowOfflineMode",
+                        value: "allowOfflineMode",
+                        onClick: "toggle_tbl_sync()",
                         checked: true,
                       }),
                       label(
@@ -1771,6 +1772,98 @@ router.get(
                         req.__("Allow offline mode")
                       )
                     )
+                  ),
+                  div(
+                    {
+                      id: "tblSyncSelectorId",
+                      class: "row pb-2",
+                    },
+                    div(
+                      label(
+                        { class: "form-label fw-bold" },
+                        req.__("Table Synchronization")
+                      )
+                    ),
+                    div(
+                      { class: "container" },
+                      div(
+                        { class: "row" },
+                        div(
+                          { class: "col-sm-4 text-center" },
+                          req.__("unsynched")
+                        ),
+                        div({ class: "col-sm-1" }),
+                        div(
+                          { class: "col-sm-4 text-center" },
+                          req.__("synched")
+                        )
+                      ),
+                      div(
+                        { class: "row" },
+                        div(
+                          { class: "col-sm-4" },
+                          select(
+                            {
+                              id: "unsynched-tbls-select-id",
+                              class: "form-control form-select",
+                              multiple: true,
+                            },
+                            withSyncInfo.map((table) =>
+                              option({
+                                id: `${table.name}_unsynched_opt`,
+                                value: table.name,
+                                label: table.name,
+                              })
+                            )
+                          )
+                        ),
+                        div(
+                          { class: "col-sm-1 d-flex justify-content-center" },
+                          div(
+                            div(
+                              button(
+                                {
+                                  id: "move-right-btn-id",
+                                  type: "button",
+                                  onClick: `move_to_synched()`,
+                                  class: "btn btn-light pt-1 mb-1",
+                                },
+                                i({ class: "fas fa-arrow-right" })
+                              )
+                            ),
+                            div(
+                              button(
+                                {
+                                  id: "move-left-btn-id",
+                                  type: "button",
+                                  onClick: `move_to_unsynched()`,
+                                  class: "btn btn-light pt-1",
+                                },
+                                i({ class: "fas fa-arrow-left" })
+                              )
+                            )
+                          )
+                        ),
+                        div(
+                          { class: "col-sm-4" },
+                          select(
+                            {
+                              id: "synched-tbls-select-id",
+                              class: "form-control form-select",
+                              multiple: true,
+                            },
+                            withSyncInfo.map((table) =>
+                              option({
+                                id: `${table.name}_synched_opt`,
+                                value: table.name,
+                                label: table.name,
+                                hidden: "true",
+                              })
+                            )
+                          )
+                        )
+                      )
+                    )
                   )
                 ),
                 button(
@@ -1877,6 +1970,7 @@ router.post(
       serverURL,
       splashPage,
       allowOfflineMode,
+      synchedTables,
     } = req.body;
     if (!androidPlatform && !iOSPlatform) {
       return res.json({
@@ -1928,6 +2022,8 @@ router.post(
     if (serverURL) spawnParams.push("-s", serverURL);
     if (splashPage) spawnParams.push("--splashPage", splashPage);
     if (allowOfflineMode) spawnParams.push("--allowOfflineMode");
+    if (synchedTables?.length > 0)
+      spawnParams.push("--synchedTables", ...synchedTables.map((tbl) => tbl));
     if (
       db.is_it_multi_tenant() &&
       db.getTenantSchema() !== db.connectObj.default_schema

package/routes/fields.js

@@ -542,14 +542,6 @@ const fieldFlow = (req) =>
                 type: "Bool",
                 showIf: { summary_field: textfields },
               }),
-              /*new Field({
-                name: "on_delete_cascade",
-                label: req.__("On delete cascade"),
-                type: "Bool",
-                sublabel: req.__(
-                  "If the parent row is deleted, automatically delete the child rows."
-                ),
-              }),*/
               new Field({
                 name: "on_delete",
                 label: req.__("On delete"),
@@ -1063,7 +1055,11 @@ router.post(
       res.send("");
       return;
     }
-    const firefox = /firefox/i.test(req.headers["user-agent"]);
+    //const firefox = /firefox/i.test(req.headers["user-agent"]);
+
+    //Chrome 116 changes its behaviour to align with firefox
+    // - disabled inputs do not dispactch click events
+    const firefox = true;
     const fv = fieldviews[fieldview];
     if (!fv && field.type === "Key" && fieldview === "select")
       res.send(

package/routes/menu.js

@@ -69,8 +69,8 @@ const menuForm = async (req) => {
       .filter(([k, v]) => !v.requireRow && !v.disableInBuilder)
       .map(([k, v]) => k),
   ];
-  const triggers = await Trigger.find({
-    when_trigger: { or: ["API call", "Never"] },
+  const triggers = Trigger.find({
+    when_trigger: {or: ["API call", "Never"]},
   });
   triggers.forEach((tr) => {
     actions.push(tr.name);
@@ -148,6 +148,13 @@ const menuForm = async (req) => {
         input_type: "select",
         options: roles.map((r) => ({ label: r.role, value: r.id })),
       },
+      {
+        name: "disable_on_mobile",
+        label: req.__("Disable on mobile"),
+        type: "Bool",
+        class: "item-menu",
+        required: false,
+      },
       {
         name: "url",
         label: req.__("URL"),
@@ -264,18 +271,18 @@ const menuForm = async (req) => {
         },
         attributes: {
           options: [
-            { name: "", label: "Link" },
-            { name: "btn btn-primary", label: "Primary button" },
-            { name: "btn btn-secondary", label: "Secondary button" },
-            { name: "btn btn-success", label: "Success button" },
-            { name: "btn btn-danger", label: "Danger button" },
+            { name: "", label: req.__("Link") },
+            { name: "btn btn-primary", label: req.__("Primary button") },
+            { name: "btn btn-secondary", label: req.__("Secondary button") },
+            { name: "btn btn-success", label: req.__("Success button") },
+            { name: "btn btn-danger", label: req.__("Danger button") },
             {
               name: "btn btn-outline-primary",
-              label: "Primary outline button",
+              label: req.__("Primary outline button"),
             },
             {
               name: "btn btn-outline-secondary",
-              label: "Secondary outline button",
+              label: req.__("Secondary outline button"),
             },
           ],
         },

package/routes/scapi.js

@@ -101,7 +101,7 @@ router.get(
       { session: false },
       async function (err, user, info) {
         if (accessAllowedRead(req, user)) {
-          const views = await View.find({});
+          const views = await View.find({}, { cached: true });
 
           res.json({ success: views });
         } else {