@saltcorn/server 0.9.1-beta.11 → 0.9.1-beta.13

package/package.json

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

package/public/saltcorn-common.js

@@ -1090,11 +1090,13 @@ function common_done(res, viewname, isWeb = true) {
     handle(res.error, (text) => notifyAlert({ type: "danger", text: text }));
 
   if (res.eval_js && res.row && res.field_names) {
-    const f = new Function(`row, {${res.field_names}}`, res.eval_js);
-    const evalres = f(res.row, res.row);
+    const f = new Function(`viewname, row, {${res.field_names}}`, res.eval_js);
+    const evalres = f(viewname, res.row, res.row);
     if (evalres) common_done(evalres, viewname, isWeb);
   } else if (res.eval_js) {
-    handle(res.eval_js, eval);
+    const f = new Function(`viewname`, res.eval_js);
+    const evalres = f(viewname);
+    if (evalres) common_done(evalres, viewname, isWeb);
   }
 
   if (res.reload_page) {

package/routes/actions.js

@@ -478,7 +478,9 @@ router.get(
       res.redirect(`/actions/`);
     } else {
       // get configuration fields
-      const cfgFields = await getActionConfigFields(action, table);
+      const cfgFields = await getActionConfigFields(action, table, {
+        mode: "trigger",
+      });
       // create form
       const form = new Form({
         action: addOnDoneRedirect(`/actions/configure/${id}`, req),
@@ -523,7 +525,9 @@ router.post(
     const table = trigger.table_id
       ? Table.findOne({ id: trigger.table_id })
       : null;
-    const cfgFields = await getActionConfigFields(action, table);
+    const cfgFields = await getActionConfigFields(action, table, {
+      mode: "trigger",
+    });
     const form = new Form({
       action: `/actions/configure/${id}`,
       fields: cfgFields,

package/routes/common_lists.js

@@ -123,40 +123,46 @@ const view_dropdown = (view, req, on_done_redirect_str = "") =>
       },
       '<i class="fas fa-running"></i>&nbsp;' + req.__("Run")
     ),
-    a(
-      {
-        class: "dropdown-item",
-        href: `/viewedit/edit/${encodeURIComponent(
-          view.name
-        )}${on_done_redirect_str}`,
-      },
-      '<i class="fas fa-edit"></i>&nbsp;' + req.__("Edit")
-    ),
+    view.id &&
+      a(
+        {
+          class: "dropdown-item",
+          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}${on_done_redirect_str}`,
+      `/viewedit/add-to-menu/${encodeURIComponent(
+        view.name
+      )}${on_done_redirect_str}`,
       '<i class="fas fa-bars"></i>&nbsp;' + req.__("Add to menu"),
       req
     ),
-    post_dropdown_item(
-      `/viewedit/clone/${view.id}${on_done_redirect_str}`,
-      '<i class="far fa-copy"></i>&nbsp;' + req.__("Duplicate"),
-      req
-    ),
-    a(
-      {
-        class: "dropdown-item",
-        href: `javascript:ajax_modal('/admin/snapshot-restore/view/${view.name}')`,
-      },
-      '<i class="fas fa-undo-alt"></i>&nbsp;' + req.__("Restore")
-    ),
-    div({ class: "dropdown-divider" }),
-    post_dropdown_item(
-      `/viewedit/delete/${view.id}${on_done_redirect_str}`,
-      '<i class="far fa-trash-alt"></i>&nbsp;' + req.__("Delete"),
-      req,
-      true,
-      view.name
-    ),
+    view.id &&
+      post_dropdown_item(
+        `/viewedit/clone/${view.id}${on_done_redirect_str}`,
+        '<i class="far fa-copy"></i>&nbsp;' + req.__("Duplicate"),
+        req
+      ),
+    view.id &&
+      a(
+        {
+          class: "dropdown-item",
+          href: `javascript:ajax_modal('/admin/snapshot-restore/view/${view.name}')`,
+        },
+        '<i class="fas fa-undo-alt"></i>&nbsp;' + req.__("Restore")
+      ),
+    view.id && div({ class: "dropdown-divider" }),
+    view.id &&
+      post_dropdown_item(
+        `/viewedit/delete/${view.id}${on_done_redirect_str}`,
+        '<i class="far fa-trash-alt"></i>&nbsp;' + req.__("Delete"),
+        req,
+        true,
+        view.name
+      ),
   ]);
 
 const setTableRefs = async (views) => {
@@ -222,17 +228,21 @@ const viewsList = async (
           {
             label: req.__("Role to access"),
             key: (row) =>
-              editViewRoleForm(row, roles, req, on_done_redirect_str),
+              row.id
+                ? editViewRoleForm(row, roles, req, on_done_redirect_str)
+                : "admin",
           },
           {
             label: "",
             key: (r) =>
-              link(
-                `/viewedit/config/${encodeURIComponent(
-                  r.name
-                )}${on_done_redirect_str}`,
-                req.__("Configure")
-              ),
+              r.id && r.viewtemplateObj?.configuration_workflow
+                ? link(
+                    `/viewedit/config/${encodeURIComponent(
+                      r.name
+                    )}${on_done_redirect_str}`,
+                    req.__("Configure")
+                  )
+                : "",
           },
           !tagId
             ? {

package/routes/pageedit.js

@@ -167,7 +167,9 @@ const pageBuilderData = async (req, context) => {
   for (const name of actions) {
     const action = stateActions[name];
     if (action && action.configFields) {
-      actionConfigForms[name] = await getActionConfigFields(action);
+      actionConfigForms[name] = await getActionConfigFields(action, null, {
+        mode: "page",
+      });
     }
   }
   const library = (await Library.find({})).filter((l) => l.suitableFor("page"));

package/routes/viewedit.js

@@ -118,6 +118,9 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
     .filter(([k, v]) => !v.tableless)
     .map(([k, v]) => k);
   const slugOptions = await Table.allSlugOptions();
+  const viewpatternOptions = Object.values(getState().viewtemplates)
+    .filter((vt) => !vt.singleton)
+    .map((vt) => vt.name);
   return new Form({
     action: addOnDoneRedirect("/viewedit/save", req),
     submitLabel: req.__("Configure") + " »",
@@ -151,7 +154,7 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
           topic: "View patterns",
           context: {},
         },
-        options: Object.keys(getState().viewtemplates),
+        options: viewpatternOptions,
         attributes: {
           explainers: mapObjectValues(
             getState().viewtemplates,
@@ -661,11 +664,11 @@ router.post(
  * @function
  */
 router.post(
-  "/add-to-menu/:id",
+  "/add-to-menu/:viewname",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { id } = req.params;
-    const view = await View.findOne({ id });
+    const { viewname } = req.params;
+    const view = await View.findOne({ name: viewname });
     await add_to_menu({
       label: view.name,
       type: "View",