@saltcorn/server 1.3.0-beta.1 → 1.3.0-beta.3

package/public/saltcorn-common.js

@@ -151,6 +151,21 @@ function valid_js_var_name(s) {
   return !!s.match(/^[a-zA-Z_$][a-zA-Z_$0-9]*$/);
 }
 
+function add_extra_state(base_url, extra_state_fml, row) {
+  //console.log("add_extra_state", { base_url, extra_state_fml, row });
+  if (!extra_state_fml) return base_url;
+  let extra_state = new Function(
+    "row",
+    `{${Object.keys(row).join(",")}}`,
+    "return " + extra_state_fml
+  )(row, row);
+  let qs = Object.entries(extra_state)
+    .map(([k, v]) => `${k}=${encodeURIComponent(v)}`)
+    .join("&");
+  let sepChar = base_url.includes("?") ? "&" : "?";
+  return base_url + sepChar + qs;
+}
+
 const apply_showif_fetching_urls = new Set();
 
 function apply_showif() {
@@ -428,6 +443,49 @@ function apply_showif() {
       });
     });
   });
+  $("[data-view-source]").each(function (ix, element) {
+    const e = $(element);
+    const rec = get_form_record(e);
+    const current = e.attr("data-view-source-current");
+    const encFml = e.attr("data-view-source");
+    const needFields = e.attr("data-view-source-need-fields");
+    if (needFields) {
+      const isSet = (v) => v !== null && v !== "" && typeof v !== "undefined";
+      if (needFields.split(",").some((k) => !isSet(rec[k]))) return;
+    }
+    const fml = decodeURIComponent(encFml);
+    //console.log("fml", fml);
+
+    const viewname = e.attr("data-sc-embed-viewname");
+
+    const newUrl = new Function("row", "return " + fml)(rec);
+    //console.log("current-new", current, newUrl);
+
+    if (current && current == newUrl) return;
+
+    e.attr("data-view-source-current", newUrl); // to prevent concurrent fetches
+    $.ajax(newUrl, {
+      headers: {
+        pjaxpageload: "true",
+        localizedstate: "true", //no admin bar
+      },
+      success: function (res, textStatus, request) {
+        const newE = `<div class="d-inline" 
+        data-sc-embed-viewname="${viewname}" 
+        data-sc-view-source="${newUrl}" 
+        data-view-source-current="${newUrl}"
+        data-view-source-need-fields="${needFields}"
+        data-view-source="${encFml}">${res}</div>`;
+
+        e.replaceWith(newE);
+        initialize_page();
+      },
+      error: function (res) {
+        if (!checkNetworkError(res))
+          notifyAlert({ type: "danger", text: res.responseText });
+      },
+    });
+  });
   $("[data-source-url]").each(function (ix, element) {
     const e = $(element);
     const rec0 = get_form_record(e);
@@ -1741,7 +1799,7 @@ async function common_done(res, viewnameOrElem0, isWeb = true) {
           form.append(
             `<input type="hidden" name="id" value="${res.set_fields[k]}">`
           );
-          reloadEmbeddedEditOwnViews(form, res.set_fields[k]);
+          apply_showif();
           return;
         }
         if (input.attr("type") === "checkbox")
@@ -1830,29 +1888,6 @@ function editAllowedAuthByRole(id, event) {
   );
 }
 
-function reloadEmbeddedEditOwnViews(form, id) {
-  form.find("div[sc-load-on-assign-id]").each(function () {
-    const $e = $(this);
-    const viewname = $e.attr("sc-load-on-assign-id");
-    const newUrl = `/view/${viewname}?id=${id}`;
-    $.ajax(newUrl, {
-      headers: {
-        pjaxpageload: "true",
-        localizedstate: "true", //no admin bar
-      },
-      success: function (res, textStatus, request) {
-        const newE = `<div class="d-inline" data-sc-embed-viewname="${viewname}" data-sc-view-source="${newUrl}">${res}</div>`;
-        $e.replaceWith(newE);
-        initialize_page();
-      },
-      error: function (res) {
-        if (!checkNetworkError(res))
-          notifyAlert({ type: "danger", text: res.responseText });
-      },
-    });
-  });
-}
-
 const repeaterCopyValuesToForm = (form, editor, noTriggerChange) => {
   const vs = JSON.parse(editor.getString());
 
@@ -1981,7 +2016,8 @@ function unique_field_from_rows(
       .filter((v) => v !== value)
       .map((s) => s.replace(value_wspace, ""))
       .map((s) => (numtype ? +s : s))
-      .sort(numtype ? (a, b) => a - b : undefined);
+      .filter((s) => (numtype ? !isNaN(s) : true))
+      .sort((a, b) => a - b);
     if (stripped.length === 0) newname = `${value_wspace}${gen_char(start)}`;
     else {
       const i = char_to_i(stripped[stripped.length - 1]);

package/public/saltcorn.js

@@ -538,7 +538,7 @@ function saveAndContinue(e, k, event) {
         form.append(
           `<input type="hidden" class="form-control  " name="id" value="${res.id}">`
         );
-        reloadEmbeddedEditOwnViews(form, res.id);
+        apply_showif();
       }
       common_done(res, form.attr("data-viewname"));
       if (focusedEl) focusedEl.setAttribute("previous-val", focusedEl.value);

package/routes/admin.js

@@ -487,18 +487,18 @@ router.get(
     backupForm.values.auto_backup_expire_days = getState().getConfig(
       "auto_backup_expire_days"
     );
-    backupForm.values.storage_s3_bucket = getState().getConfig(
-      "storage_s3_bucket"
+    backupForm.values.backup_s3_bucket =
+      getState().getConfig("backup_s3_bucket");
+    backupForm.values.backup_s3_endpoint =
+      getState().getConfig("backup_s3_endpoint");
+    backupForm.values.backup_s3_access_key = getState().getConfig(
+      "backup_s3_access_key"
     );
-    backupForm.values.storage_s3_access_key = getState().getConfig(
-      "storage_s3_access_key"
-    );
-    backupForm.values.storage_s3_access_secret = getState().getConfig(
-      "storage_s3_access_secret"
-    );
-    backupForm.values.storage_s3_region = getState().getConfig(
-      "storage_s3_region"
+    backupForm.values.backup_s3_access_secret = getState().getConfig(
+      "backup_s3_access_secret"
     );
+    backupForm.values.backup_s3_region =
+      getState().getConfig("backup_s3_region");
     aBackupFilePrefixForm.values.backup_with_event_log = getState().getConfig(
       "backup_with_event_log"
     );
@@ -1089,18 +1089,6 @@ const autoBackupForm = (req) => {
           //auto_backup_destination: "Local directory",
         },
       },
-      {
-        type: "Integer",
-        label: req.__("Expiration in days"),
-        sublabel: req.__(
-          "Delete old backup files in this directory after the set number of days"
-        ),
-        name: "auto_backup_expire_days",
-        showIf: {
-          auto_backup_frequency: ["Daily", "Weekly"],
-          auto_backup_destination: "Local directory",
-        },
-      },
       ...(isRoot
         ? [
             {
@@ -1114,10 +1102,19 @@ const autoBackupForm = (req) => {
             },
           ]
         : []),
+      {
+        type: "String",
+        label: req.__("S3 Endpoint"),
+        name: "backup_s3_endpoint",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "S3",
+        },
+      },
       {
         type: "String",
         label: req.__("S3 Bucket Name"),
-        name: "storage_s3_bucket",
+        name: "backup_s3_bucket",
         showIf: {
           auto_backup_frequency: ["Daily", "Weekly"],
           auto_backup_destination: "S3",
@@ -1126,7 +1123,7 @@ const autoBackupForm = (req) => {
       {
         type: "String",
         label: req.__("S3 Access Key"),
-        name: "storage_s3_access_key",
+        name: "backup_s3_access_key",
         showIf: {
           auto_backup_frequency: ["Daily", "Weekly"],
           auto_backup_destination: "S3",
@@ -1136,7 +1133,7 @@ const autoBackupForm = (req) => {
         type: "String",
         label: req.__("S3 Secret Key"),
         fieldview: "password",
-        name: "storage_s3_access_secret",
+        name: "backup_s3_access_secret",
         showIf: {
           auto_backup_frequency: ["Daily", "Weekly"],
           auto_backup_destination: "S3",
@@ -1145,12 +1142,24 @@ const autoBackupForm = (req) => {
       {
         type: "String",
         label: req.__("S3 Region"),
-        name: "storage_s3_region",
+        name: "backup_s3_region",
         showIf: {
           auto_backup_frequency: ["Daily", "Weekly"],
           auto_backup_destination: "S3",
         },
       },
+      {
+        type: "Integer",
+        label: req.__("Expiration in days"),
+        sublabel: req.__(
+          "Delete old backup files in this directory after the set number of days"
+        ),
+        name: "auto_backup_expire_days",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: ["Local directory", "S3"],
+        },
+      },
     ],
   });
 };
@@ -3832,6 +3841,22 @@ router.post(
       spawnParams.push("--androidKeyStoreAlias", keystoreAlias);
     if (keystorePassword)
       spawnParams.push("--androidKeystorePassword", keystorePassword);
+
+    // if builDir exists, remove it
+    if (
+      await fs.promises
+        .access(buildDir)
+        .then(() => true)
+        .catch(() => false)
+    ) {
+      try {
+        await fs.promises.rm(buildDir, { recursive: true, force: true });
+        getState().log(5, `Removed existing build directory: ${buildDir}`);
+      } catch (error) {
+        getState().log(4, `Error removing build directory: ${error.message}`);
+      }
+    }
+
     // end http call, return the out directory name, the build directory path and the mode
     // the gui polls for results
     res.json({

package/tests/clientjs.test.js

@@ -253,4 +253,20 @@ test("unique_field_from_rows test", () => {
     "bar"
   );
   expect($("#mkuniq11").val()).toBe("bar104");
+  $("body").append(`<input id="mkuniq12" value="YPL240724A"></div>`);
+  unique_field_from_rows(
+    [
+      { foo: "YPL240724A2" },
+      { foo: "YPL240724A1_COPY-1" },
+      { foo: "YPL240724A1" },
+    ],
+    "mkuniq12",
+    "foo",
+    false,
+    1,
+    true,
+    "Digits",
+    "YPL240724A"
+  );
+  expect($("#mkuniq12").val()).toBe("YPL240724A3");
 });