@saltcorn/server 1.1.1-rc.3 → 1.1.1

package/locales/en.json

@@ -1551,5 +1551,6 @@
 	"Show results in": "Show results in",
 	"Show results from each table in this type of element": "Show results from each table in this type of element",
 	"Search syntax help": "Search syntax help",
-	"Search syntax": "Search syntax"
+	"Search syntax": "Search syntax",
+	"Maximum role": "Maximum role"
 }

package/locales/pl.json

@@ -1521,7 +1521,37 @@
   "OK": "OK",
   "Step settings": "Ustawienia kroku",
   "Action settings": "Ustawienia akcji",
+  "Keystore file is not applied for debug builds.": "Plik Keystore nie jest stosowany dla kompilacji debug.",
   "Workflow": "Przepływ pracy",
   "Previous runs": "Poprzednie uruchomienia",
-  "The workflow the user will be interacting with.": "Przepływ pracy, z którym użytkownik będzie wchodził w interakcję."
+  "The workflow the user will be interacting with.": "Przepływ pracy, z którym użytkownik będzie wchodził w interakcję.",
+  "Delete old workflow runs with status after days": "Usuń stare uruchomienia przepływu pracy ze statusem po określonej liczbie dni",
+	"Finished": "Zakończone",
+	"Error": "Błąd",
+	"Waiting": "Oczekujące",
+	"Running": "Uruchomione",
+	"Minimum role to access search page": "Minimalna rola do uzyskania dostępu do strony wyszukiwania",
+	"Edit tables": "Edytuj tabele",
+	"Minimum role to edit tables": "Minimalna rola do edycji tabel",
+	"Edit views": "Edytuj widoki",
+	"Minimum role to edit views": "Minimalna rola do edycji widoków",
+	"Edit pages": "Edytuj strony",
+	"Minimum role to edit pages": "Minimalna rola do edycji stron",
+	"Edit triggers": "Edytuj wyzwalacze",
+	"Minimum role to edit triggers": "Minimalna rola do edycji wyzwalaczy",
+	"Development permissions": "Uprawnienia deweloperskie",
+	"Inspect tables": "Inspekcja tabel",
+	"Minimum role to inspect (see, without editing) tables": "Minimalna rola do inspekcji (podglądu bez edycji) tabel",
+	"Home pages": "Strony główne",
+	"The home page is the page that is served when the user visits the home location (/). This can be set for each user role.": "Strona główna to strona, która jest wyświetlana, gdy użytkownik odwiedza stronę startową (/). Można ją ustawić dla każdej roli użytkownika.",
+	"Trigger %s deleted": "Wyzwalacz %s usunięty",
+	"Edit menu": "Edytuj menu",
+	"Minimum role to edit menu": "Minimalna rola do edycji menu",
+	"Full-text search index is not available as the table contains Key fields (%s) with the \"Include in full-text search\" option enabled. Disable this before creating a Full-text search index": "Indeks wyszukiwania pełnotekstowego jest niedostępny, ponieważ tabela zawiera pola kluczowe (%s) z włączoną opcją „Uwzględnij w wyszukiwaniu pełnotekstowym”. Wyłącz tę opcję przed utworzeniem indeksu wyszukiwania pełnotekstowego.",
+	"Share Extension Provisioning Profile": "Profil Provisioning Share Extension",
+	"Show results in": "Pokaż wyniki w",
+	"Show results from each table in this type of element": "Pokaż wyniki z każdej tabeli w tym typie elementu",
+	"Search syntax help": "Pomoc dotycząca składni wyszukiwania",
+	"Search syntax": "Składnia wyszukiwania",
+	"Maximum role": "Maksymalna rola"
 }

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.1.1-rc.3",
+  "version": "1.1.1",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@saltcorn/base-plugin": "1.1.1-rc.3",
-    "@saltcorn/builder": "1.1.1-rc.3",
-    "@saltcorn/data": "1.1.1-rc.3",
-    "@saltcorn/admin-models": "1.1.1-rc.3",
-    "@saltcorn/filemanager": "1.1.1-rc.3",
-    "@saltcorn/markup": "1.1.1-rc.3",
-    "@saltcorn/plugins-loader": "1.1.1-rc.3",
-    "@saltcorn/sbadmin2": "1.1.1-rc.3",
+    "@saltcorn/base-plugin": "1.1.1",
+    "@saltcorn/builder": "1.1.1",
+    "@saltcorn/data": "1.1.1",
+    "@saltcorn/admin-models": "1.1.1",
+    "@saltcorn/filemanager": "1.1.1",
+    "@saltcorn/markup": "1.1.1",
+    "@saltcorn/plugins-loader": "1.1.1",
+    "@saltcorn/sbadmin2": "1.1.1",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -2116,6 +2116,17 @@ function select_by_view_click(element, event, required) {
   }
 }
 
+function restrict_options(selector, restriction) {
+  $(selector)
+    .find("option")
+    .each(function () {
+      const $o = $(this);
+      const val = $o.val();
+      if (Array.isArray(restriction))
+        if (val && !restriction.find((rid) => rid == val)) $o.remove();
+    });
+}
+
 const observer = new IntersectionObserver(
   (entries, observer) => {
     entries.forEach((entry) => {

package/routes/actions.js

@@ -505,83 +505,6 @@ router.post(
   })
 );
 
-function genWorkflowDiagram(steps) {
-  const stepNames = steps.map((s) => s.name);
-  const nodeLines = steps.map(
-    (s) => `  ${s.mmname}["\`**${s.name}**
-  ${s.action_name}\`"]:::wfstep${s.id}${s.only_if ? "@{ shape: hex }" : ""}`
-  );
-
-  nodeLines.unshift(`  _Start@{ shape: circle, label: "Start" }`);
-  const linkLines = [];
-  let step_ix = 0;
-  for (const step of steps) {
-    if (step.initial_step)
-      linkLines.push(
-        `  _Start-- <i class="fas fa-plus add-btw-nodes btw-nodes-${0}-${
-          step.name
-        }"></i> ---${step.mmname}`
-      );
-    if (stepNames.includes(step.next_step)) {
-      linkLines.push(
-        `  ${step.mmname} -- <i class="fas fa-plus add-btw-nodes btw-nodes-${step.id}-${step.next_step}"></i> --- ${step.mmnext}`
-      );
-    } else if (step.next_step) {
-      let found = false;
-      for (const otherStep of stepNames)
-        if (step.next_step.includes(otherStep)) {
-          linkLines.push(
-            `  ${step.mmname} --> ${WorkflowStep.mmescape(otherStep)}`
-          );
-          found = true;
-        }
-      if (!found) {
-        linkLines.push(
-          `  ${step.mmname}-- <a href="/actions/stepedit/${step.trigger_id}/${step.id}">Error: missing next step in ${step.mmname}</a> ---_End_${step.mmname}`
-        );
-        nodeLines.push(
-          `  _End_${step.mmname}:::wfadd${step.id}@{ shape: circle, label: "<i class='fas fa-plus with-link'></i>" }`
-        );
-      }
-    } else if (!step.next_step) {
-      linkLines.push(`  ${step.mmname} --> _End_${step.mmname}`);
-      nodeLines.push(
-        `  _End_${step.mmname}:::wfadd${step.id}@{ shape: circle, label: "<i class='fas fa-plus with-link'></i>" }`
-      );
-    }
-    if (step.action_name === "ForLoop") {
-      linkLines.push(
-        `  ${step.mmname}-.->${WorkflowStep.mmescape(
-          step.configuration.loop_body_initial_step
-        )}`
-      );
-    }
-    if (step.action_name === "EndForLoop") {
-      // TODO this is not correct. improve.
-      let forStep;
-      for (let i = step_ix; i >= 0; i -= 1) {
-        if (steps[i].action_name === "ForLoop") {
-          forStep = steps[i];
-          break;
-        }
-      }
-      if (forStep) linkLines.push(`  ${step.mmname} --> ${forStep.mmname}`);
-    }
-    step_ix += 1;
-  }
-  if (!steps.length || !steps.find((s) => s.initial_step)) {
-    linkLines.push(`  _Start --> _End`);
-    nodeLines.push(
-      `  _End:::wfaddstart@{ shape: circle, label: "<i class='fas fa-plus with-link'></i>" }`
-    );
-  }
-  const fc =
-    "flowchart TD\n" + nodeLines.join("\n") + "\n" + linkLines.join("\n");
-  //console.log(fc);
-
-  return fc;
-}
-
 const getWorkflowConfig = async (req, id, table, trigger) => {
   let steps = await WorkflowStep.find(
     { trigger_id: trigger.id },
@@ -627,7 +550,7 @@ const getWorkflowConfig = async (req, id, table, trigger) => {
   }
   return (
     copilot_form +
-    pre({ class: "mermaid" }, genWorkflowDiagram(steps)) +
+    pre({ class: "mermaid" }, WorkflowStep.generate_diagram(steps)) +
     script(
       { defer: "defer" },
       `function tryAddWFNodes() {
@@ -1700,7 +1623,7 @@ router.get(
       req,
       active_sub: "Workflow runs",
       page_title: req.__(`Workflow runs`),
-      sub2_page: trigger.name,
+      sub2_page: trigger?.name,
       contents: {
         above: [
           {
@@ -1712,15 +1635,16 @@ router.get(
                 { class: "table table-condensed w-unset" },
                 tbody(
                   tr(th("Run ID"), td(run.id)),
-                  tr(
-                    th("Trigger"),
-                    td(
-                      a(
-                        { href: `/actions/configure/${trigger.id}` },
-                        trigger.name
+                  trigger &&
+                    tr(
+                      th("Trigger"),
+                      td(
+                        a(
+                          { href: `/actions/configure/${trigger.id}` },
+                          trigger.name
+                        )
                       )
-                    )
-                  ),
+                    ),
                   tr(th("Started at"), td(localeDateTime(run.started_at))),
                   tr(th("Started by user"), td(run.started_by)),
                   tr(th("Status"), td(run.status)),

package/routes/api.js

@@ -350,6 +350,13 @@ router.get(
     const orderByField =
       (sortBy || tabulator_sort) && table.getField(sortBy || tabulator_sort);
 
+    const use_limit = tabulator_pagination_format
+      ? +tabulator_size
+      : limit && +limit;
+    const use_offset = tabulator_pagination_format
+      ? +tabulator_size * (+tabulator_page - 1)
+      : offset && +offset;
+
     await passport.authenticate(
       ["api-bearer", "jwt"],
       { session: false },
@@ -360,12 +367,8 @@ router.get(
             const joinOpts = {
               forUser: req.user || user || { role_id: 100 },
               forPublic: !(req.user || user),
-              limit: tabulator_pagination_format
-                ? +tabulator_size
-                : limit && +limit,
-              offset: tabulator_pagination_format
-                ? +tabulator_size * (+tabulator_page - 1)
-                : offset && +offset,
+              limit: use_limit,
+              offset: use_offset,
               orderDesc:
                 (sortDesc && sortDesc !== "false") || tabulator_dir == "desc",
               orderBy: orderByField?.name || "id",
@@ -406,9 +409,10 @@ router.get(
             rows = await table.getJoinedRows({
               where: qstate,
               joinFields,
-              limit: limit && +limit,
-              offset: offset && +offset,
-              orderDesc: sortDesc && sortDesc !== "false",
+              limit: use_limit,
+              offset: use_offset,
+              orderDesc:
+                (sortDesc && sortDesc !== "false") || tabulator_dir == "desc",
               orderBy: orderByField?.name || undefined,
               forPublic: !(req.user || user),
               forUser: req.user || user,

package/routes/list.js

@@ -412,7 +412,7 @@ router.get(
                   height:"100%",
                   pagination:true,
                   paginationMode:"remote",
-                  paginationSize:10,
+                  paginationSize:20,
                   clipboard:true,
                   persistence:true, 
                   persistenceID:"table_tab_${table.name}",

package/routes/menu.js

@@ -9,7 +9,11 @@ const Router = require("express-promise-router");
 
 //const Field = require("@saltcorn/data/models/field");
 const Form = require("@saltcorn/data/models/form");
-const { isAdmin, error_catcher, isAdminOrHasConfigMinRole } = require("./utils.js");
+const {
+  isAdmin,
+  error_catcher,
+  isAdminOrHasConfigMinRole,
+} = require("./utils.js");
 const { getState } = require("@saltcorn/data/db/state");
 //const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
@@ -307,6 +311,13 @@ const menuForm = async (req) => {
         input_type: "select",
         options: roles.map((r) => ({ label: r.role, value: r.id })),
       },
+      {
+        name: "max_role",
+        label: req.__("Maximum role"),
+        class: "item-menu",
+        input_type: "select",
+        options: roles.map((r) => ({ label: r.role, value: r.id })),
+      },
       {
         name: "disable_on_mobile",
         label: req.__("Disable on mobile"),
@@ -566,7 +577,7 @@ const jQMEtoMenu = (menu_items) =>
  */
 router.post(
   "/",
-  isAdminOrHasConfigMinRole("min_role_edit_menu"),  
+  isAdminOrHasConfigMinRole("min_role_edit_menu"),
   error_catcher(async (req, res) => {
     const new_menu = req.body;
     const menu_items = jQMEtoMenu(new_menu);

package/routes/tables.js

@@ -712,6 +712,7 @@ const attribBadges = (f) => {
       if (
         [
           "summary_field",
+          "importance",
           "on_delete_cascade",
           "on_delete",
           "unique_error_msg",