@saltcorn/server 1.3.1-beta.11 → 1.3.1-beta.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.3.1-beta.11",
+  "version": "1.3.1-beta.12",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
@@ -8,14 +8,14 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.735.0",
     "@dr.pogodin/csurf": "1.15.0",
-    "@saltcorn/admin-models": "1.3.1-beta.11",
-    "@saltcorn/base-plugin": "1.3.1-beta.11",
-    "@saltcorn/builder": "1.3.1-beta.11",
-    "@saltcorn/data": "1.3.1-beta.11",
-    "@saltcorn/filemanager": "1.3.1-beta.11",
-    "@saltcorn/markup": "1.3.1-beta.11",
-    "@saltcorn/plugins-loader": "1.3.1-beta.11",
-    "@saltcorn/sbadmin2": "1.3.1-beta.11",
+    "@saltcorn/admin-models": "1.3.1-beta.12",
+    "@saltcorn/base-plugin": "1.3.1-beta.12",
+    "@saltcorn/builder": "1.3.1-beta.12",
+    "@saltcorn/data": "1.3.1-beta.12",
+    "@saltcorn/filemanager": "1.3.1-beta.12",
+    "@saltcorn/markup": "1.3.1-beta.12",
+    "@saltcorn/plugins-loader": "1.3.1-beta.12",
+    "@saltcorn/sbadmin2": "1.3.1-beta.12",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",

package/public/saltcorn-common.js

@@ -1812,10 +1812,14 @@ async function common_done(res, viewnameOrElem0, isWeb = true) {
       })
     );
   if (res.set_fields && (viewname || res.set_fields._viewname)) {
-    const form =
+    let form =
       typeof viewnameOrElem === "string" || res.set_fields._viewname
         ? $(`form[data-viewname="${res.set_fields._viewname || viewname}"]`)
         : $(viewnameOrElem).closest("form[data-viewname]");
+    if (form.length === 0 && viewnameOrElem?.querySelector) {
+      const temp = viewnameOrElem.querySelector("form[data-viewname]");
+      if (temp) form = $(temp);
+    }
     if (form.length === 0 && set_state_fields) {
       // assume this is a filter
       set_state_fields(
@@ -2124,9 +2128,14 @@ function init_collab_room(viewname, eventCfgs) {
   }
   const joinFn = () => {
     socket.emit("join_collab_room", viewname, (ack) => {
-      if (ack && ack.status === "ok")
+      if (ack?.status === "ok")
         console.log(`Joined collaboration room for view '${viewname}'`);
-      else console.error("Failed to join collaboration room:", ack);
+      else if (ack?.status === "already_joined") {
+        if (window._sc_loglevel > 5)
+          console.log(
+            `Already joined collaboration room for view '${viewname}'`
+          );
+      } else console.error("Failed to join collaboration room:", ack);
     });
   };
   if (socket.connected) joinFn();

package/routes/admin.js

@@ -2305,6 +2305,24 @@ const buildDialogScript = (capacitorBuilderAvailable, isSbadmin2) =>
   }
   else
     console.error('versionInput not found');
+
+  const entryByRoleBox = document.getElementById('entryPointByRoleBoxId');
+  if (entryByRoleBox) {
+    entryByRoleBox.addEventListener('change', () => {
+      const entryByRole = entryByRoleBox.checked;
+      const entryRow = document.getElementById('entryPointRowId');
+      const selector = document.getElementById('entrySelectorsId');
+      if (entryByRole) {
+        entryRow.classList.remove('border', 'border-2', 'p-3', 'rounded');
+        selector.classList.add('d-none');
+      }
+      else {
+        entryRow.classList.add('border', 'border-2', 'p-3', 'rounded');
+        selector.classList.remove('d-none');
+      }
+    });
+  } else
+    console.error('entryByRoleBox not found');
 `)}
   </script>`;
 
@@ -2317,12 +2335,19 @@ const imageAvailable = async (preferedVersion) => {
     await image.inspect();
     return { installed: true, version: preferedVersion };
   } catch (e) {
-    const images = await docker.listImages({
-      filters: { reference: ["saltcorn/capacitor-builder:*"] },
-    });
-    const tags = images.flatMap((img) => img.RepoTags || []);
-    if (tags.length > 0)
-      return { installed: true, version: tags[0].split(":")[1] };
+    try {
+      const images = await docker.listImages({
+        filters: { reference: ["saltcorn/capacitor-builder:*"] },
+      });
+      const tags = images.flatMap((img) => img.RepoTags || []);
+      if (tags.length > 0)
+        return { installed: true, version: tags[0].split(":")[1] };
+    } catch (err) {
+      getState().log(
+        5,
+        `Error checking for capacitor-builder image: ${err.message || err}`
+      );
+    }
     return { installed: false };
   }
 };
@@ -2387,6 +2412,7 @@ router.get(
     const layout = getState().getLayout(req.user);
     const isSbadmin2 = layout === getState().layouts.sbadmin2;
     const pushEnabled = getState().getConfig("enable_push_notify", false);
+    const isEntrypointByRole = builderSettings.entryPointByRole === "on";
     send_admin_page({
       res,
       req,
@@ -2446,152 +2472,188 @@ router.get(
                     )
                   ),
                   div(
-                    { class: "row" },
+                    { class: "row mb-3" },
                     div(
-                      { class: "col-sm-4" },
-                      // 'view/page' tabs
-                      ul(
-                        { class: "nav nav-pills" },
-                        li(
-                          {
-                            class: "nav-item",
-                            onClick: "showEntrySelect('view')",
-                          },
-                          div(
+                      {
+                        class: `col-sm-4 mt-2 ${isEntrypointByRole ? "" : "border border-2 p-3 rounded"}`,
+                        id: "entryPointRowId",
+                      },
+                      div(
+                        { class: "row pb-2" },
+                        div(
+                          { class: "col-sm-6" },
+                          input({
+                            type: "checkbox",
+                            id: "entryPointByRoleBoxId",
+                            class: "form-check-input me-2",
+                            name: "entryPointByRole",
+                            checked: isEntrypointByRole,
+                          }),
+                          label(
                             {
-                              class: `nav-link ${
-                                !builderSettings.entryPointType ||
-                                builderSettings.entryPointType === "view"
-                                  ? "active"
-                                  : ""
-                              }`,
-                              id: "viewNavLinkID",
+                              for: "entryPointByRole",
+                              class: "form-label",
                             },
-                            req.__("View")
+                            req.__("Entry point by role"),
+                            a(
+                              {
+                                href: "javascript:ajax_modal('/admin/help/Entry point by role?')",
+                              },
+                              i({ class: "fas fa-question-circle ps-1" })
+                            )
                           )
-                        ),
-                        li(
-                          {
-                            class: "nav-item",
-                            onClick: "showEntrySelect('page')",
-                          },
-                          div(
+                        )
+                      ),
+                      // 'view/page/pagegroup' tabs
+                      div(
+                        {
+                          id: "entrySelectorsId",
+                          class: isEntrypointByRole ? "d-none" : "",
+                        },
+                        ul(
+                          { class: "nav nav-pills" },
+                          li(
                             {
-                              class: `nav-link ${
-                                builderSettings.entryPointType === "page"
-                                  ? "active"
-                                  : ""
-                              }`,
-                              id: "pageNavLinkID",
+                              class: "nav-item",
+                              onClick: "showEntrySelect('view')",
                             },
-                            req.__("Page")
+                            div(
+                              {
+                                class: `nav-link ${
+                                  !builderSettings.entryPointType ||
+                                  builderSettings.entryPointType === "view"
+                                    ? "active"
+                                    : ""
+                                }`,
+                                id: "viewNavLinkID",
+                              },
+                              req.__("View")
+                            )
                           ),
                           li(
                             {
                               class: "nav-item",
-                              onClick: "showEntrySelect('pagegroup')",
+                              onClick: "showEntrySelect('page')",
                             },
                             div(
                               {
                                 class: `nav-link ${
-                                  builderSettings.entryPointType === "pagegroup"
+                                  builderSettings.entryPointType === "page"
                                     ? "active"
                                     : ""
                                 }`,
-                                id: "pagegroupNavLinkID",
+                                id: "pageNavLinkID",
                               },
-                              req.__("Pagegroup")
-                            )
-                          )
-                        )
-                      ),
-                      // select entry-view
-                      select(
-                        {
-                          class: `form-select ${
-                            builderSettings.entryPointType === "page" ||
-                            builderSettings.entryPointType === "pagegroup"
-                              ? "d-none"
-                              : ""
-                          }`,
-                          ...(!builderSettings.entryPointType ||
-                          builderSettings.entryPointType === "view"
-                            ? { name: "entryPoint" }
-                            : {}),
-                          id: "viewInputID",
-                        },
-                        views
-                          .map((view) =>
-                            option(
+                              req.__("Page")
+                            ),
+                            li(
                               {
-                                value: view.name,
-                                selected:
-                                  builderSettings.entryPointType === "view" &&
-                                  builderSettings.entryPoint === view.name,
+                                class: "nav-item",
+                                onClick: "showEntrySelect('pagegroup')",
                               },
-                              view.name
+                              div(
+                                {
+                                  class: `nav-link ${
+                                    builderSettings.entryPointType ===
+                                    "pagegroup"
+                                      ? "active"
+                                      : ""
+                                  }`,
+                                  id: "pagegroupNavLinkID",
+                                },
+                                req.__("Pagegroup")
+                              )
                             )
                           )
-                          .join(",")
-                      ),
-                      // select entry-page
-                      select(
-                        {
-                          class: `form-select ${
-                            !builderSettings.entryPointType ||
-                            builderSettings.entryPointType === "view" ||
-                            builderSettings.entryPointType === "pagegroup"
-                              ? "d-none"
-                              : ""
-                          }`,
-                          ...(builderSettings.entryPointType === "page"
-                            ? { name: "entryPoint" }
-                            : {}),
-                          id: "pageInputID",
-                        },
-                        pages
-                          .map((page) =>
-                            option(
-                              {
-                                value: page.name,
-                                selected:
-                                  builderSettings.entryPointType === "page" &&
-                                  builderSettings.entryPoint === page.name,
-                              },
-                              page.name
+                        ),
+                        // select entry-view
+                        select(
+                          {
+                            class: `form-select ${
+                              builderSettings.entryPointType === "page" ||
+                              builderSettings.entryPointType === "pagegroup"
+                                ? "d-none"
+                                : ""
+                            }`,
+                            ...(!builderSettings.entryPointType ||
+                            builderSettings.entryPointType === "view"
+                              ? { name: "entryPoint" }
+                              : {}),
+                            id: "viewInputID",
+                          },
+                          views
+                            .map((view) =>
+                              option(
+                                {
+                                  value: view.name,
+                                  selected:
+                                    builderSettings.entryPointType === "view" &&
+                                    builderSettings.entryPoint === view.name,
+                                },
+                                view.name
+                              )
                             )
-                          )
-                          .join("")
-                      ),
-                      // select entry-pagegroup
-                      select(
-                        {
-                          class: `form-select ${
-                            !builderSettings.entryPointType ||
-                            builderSettings.entryPointType === "view" ||
-                            builderSettings.entryPointType === "page"
-                              ? "d-none"
-                              : ""
-                          }`,
-                          ...(builderSettings.entryPointType === "pagegroup"
-                            ? { name: "entryPoint" }
-                            : {}),
-                          id: "pagegroupInputID",
-                        },
-                        pageGroups
-                          .map((group) =>
-                            option(
-                              {
-                                value: group.name,
-                                selected:
-                                  builderSettings.entryPointType ===
-                                    "pagegroup" &&
-                                  builderSettings.entryPoint === group.name,
-                              },
-                              group.name
+                            .join(",")
+                        ),
+                        // select entry-page
+                        select(
+                          {
+                            class: `form-select ${
+                              !builderSettings.entryPointType ||
+                              builderSettings.entryPointType === "view" ||
+                              builderSettings.entryPointType === "pagegroup"
+                                ? "d-none"
+                                : ""
+                            }`,
+                            ...(builderSettings.entryPointType === "page"
+                              ? { name: "entryPoint" }
+                              : {}),
+                            id: "pageInputID",
+                          },
+                          pages
+                            .map((page) =>
+                              option(
+                                {
+                                  value: page.name,
+                                  selected:
+                                    builderSettings.entryPointType === "page" &&
+                                    builderSettings.entryPoint === page.name,
+                                },
+                                page.name
+                              )
                             )
-                          )
-                          .join("")
+                            .join("")
+                        ),
+                        // select entry-pagegroup
+                        select(
+                          {
+                            class: `form-select ${
+                              !builderSettings.entryPointType ||
+                              builderSettings.entryPointType === "view" ||
+                              builderSettings.entryPointType === "page"
+                                ? "d-none"
+                                : ""
+                            }`,
+                            ...(builderSettings.entryPointType === "pagegroup"
+                              ? { name: "entryPoint" }
+                              : {}),
+                            id: "pagegroupInputID",
+                          },
+                          pageGroups
+                            .map((group) =>
+                              option(
+                                {
+                                  value: group.name,
+                                  selected:
+                                    builderSettings.entryPointType ===
+                                      "pagegroup" &&
+                                    builderSettings.entryPoint === group.name,
+                                },
+                                group.name
+                              )
+                            )
+                            .join("")
+                        )
                       )
                     ),
                     div(
@@ -3762,6 +3824,7 @@ router.post(
     let {
       entryPoint,
       entryPointType,
+      entryPointByRole,
       androidPlatform,
       iOSPlatform,
       useDocker,
@@ -3865,10 +3928,12 @@ router.post(
     await File.new_folder(outDirName, "/mobile_app");
     const spawnParams = [
       "build-app",
-      "-e",
-      entryPoint,
       "-t",
-      entryPointType === "pagegroup" ? "page" : entryPointType,
+      entryPointByRole
+        ? "byrole"
+        : entryPointType === "pagegroup"
+          ? "page"
+          : entryPointType,
       "-c",
       outDir,
       "-b",
@@ -3876,6 +3941,7 @@ router.post(
       "-u",
       req.user.email, // ensured by isAdmin
     ];
+    if (!entryPointByRole) spawnParams.push("-e", entryPoint);
     if (useDocker) spawnParams.push("-d");
     if (androidPlatform) spawnParams.push("-p", "android");
     if (iOSPlatform) {

package/routes/tables.js

@@ -848,7 +848,7 @@ router.get(
                   r.typename +
                     span({ class: "badge bg-danger ms-1" }, "Unknown type"),
           },
-          ...(table.external || !user_can_edit_tables
+          ...(table.external || !user_can_edit_tables || table.provider_name
             ? []
             : [
                 {
@@ -865,7 +865,7 @@ router.get(
             key: (r) => attribBadges(r),
           },
           { label: req.__("Variable name"), key: (t) => code(t.name) },
-          ...(table.external || !user_can_edit_tables
+          ...(table.external || !user_can_edit_tables || table.provider_name
             ? []
             : [
                 {

package/serve.js

@@ -86,7 +86,12 @@ const ensureJwtSecret = () => {
  */
 const ensurePluginsFolder = async () => {
   const rootFolder = envPaths("saltcorn", { suffix: "plugins" }).data;
-  const staticDeps = ["@saltcorn/markup", "@saltcorn/data", "jest"];
+  const staticDeps = [
+    "@saltcorn/markup",
+    "@saltcorn/data",
+    "@saltcorn/postgres",
+    "jest",
+  ];
   const allPluginFolders = new Set();
   await eachTenant(async () => {
     try {
@@ -639,8 +644,20 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
           const role_id = user ? user.role_id : 100;
           if (view.min_role < role_id)
             throw new Error("Not authorized to join collaboration room");
-          socket.join(`_${tenant}_collab_room_`);
-          if (typeof callback === "function") callback({ status: "ok" });
+          const roomName = `_${tenant}_collab_room_`;
+          if (!socket.rooms.has(roomName)) {
+            socket.join(`_${tenant}_collab_room_`);
+            if (typeof callback === "function") callback({ status: "ok" });
+            const socketIds = await getState().getConfig(
+              "joined_real_time_socket_ids",
+              []
+            );
+            socketIds.push(socket.id);
+            await getState().setConfig("joined_real_time_socket_ids", [
+              ...new Set(socketIds),
+            ]);
+          } else if (typeof callback === "function")
+            callback({ status: "already_joined" });
         } catch (err) {
           getState().log(1, `Socket join_collab_room: ${err.stack}`);
           if (typeof callback === "function")
@@ -662,6 +679,14 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
           if (!user) throw new Error("Not authorized");
           socket.join(`_${tenant}_dynamic_update_room`);
           socket.join(`_${tenant}:${user.id}_dynamic_update_room`);
+          const socketIds = await getState().getConfig(
+            "joined_dynamic_update_socket_ids",
+            []
+          );
+          socketIds.push(socket.id);
+          await getState().setConfig("joined_dynamic_update_socket_ids", [
+            ...new Set(socketIds),
+          ]);
           if (typeof callback === "function") callback({ status: "ok" });
         } catch (err) {
           getState().log(1, `Socket join_dynamic_update_room: ${err.stack}`);
@@ -681,6 +706,30 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
           const socketIds = state.getConfig("joined_log_socket_ids");
           const newSocketIds = socketIds.filter((id) => id !== socket.id);
           await state.setConfig("joined_log_socket_ids", newSocketIds);
+
+          const dynamicSocketIds = state.getConfig(
+            "joined_dynamic_update_socket_ids",
+            []
+          );
+          const newDynamicSocketIds = dynamicSocketIds.filter(
+            (id) => id !== socket.id
+          );
+          await state.setConfig(
+            "joined_dynamic_update_socket_ids",
+            newDynamicSocketIds
+          );
+
+          const realTimeSocketIds = state.getConfig(
+            "joined_real_time_socket_ids",
+            []
+          );
+          const newRealTimeSocketIds = realTimeSocketIds.filter(
+            (id) => id !== socket.id
+          );
+          await state.setConfig(
+            "joined_real_time_socket_ids",
+            newRealTimeSocketIds
+          );
         } else {
           console.error("No state found in socket disconnect");
           console.error("The current tenantSchema is:", db.getTenantSchema());

package/tests/admin.test.js

@@ -387,7 +387,7 @@ describe("actions", () => {
       .send("table_id=2")
       .send("name=mynewaction")
       .send("when_trigger=Insert")
-      .expect(toRedirect("/actions/configure/7"));
+      .expect(toRedirect("/actions/configure/8"));
   });
   it("show edit", async () => {
     const app = await getApp({ disableCsrf: true });
@@ -451,9 +451,9 @@ describe("actions", () => {
       .send("action=run_js_code")
       .send("when_trigger=API+call")
       .send("min_role=1")
-      .expect(toRedirect("/actions/configure/8"));
+      .expect(toRedirect("/actions/configure/9"));
     await request(app)
-      .post("/actions/configure/8")
+      .post("/actions/configure/9")
       .set("Cookie", loginCookie)
       .send("code=return 27")
       .expect(toRedirect("/actions/"));

package/tests/auth.test.js

@@ -21,8 +21,12 @@ const { get_reset_link, generate_email } = require("../auth/resetpw");
 const i18n = require("i18n");
 const path = require("path");
 const fs = require("fs");
+const { sleep } = require("@saltcorn/data/utils");
 
-afterAll(db.close);
+afterAll(async () => {
+  await sleep(100);
+  db.close();
+});
 beforeAll(async () => {
   await resetToFixtures();
 });

package/wrapper.js

@@ -158,7 +158,7 @@ const get_headers = (req, version_tag, description, extras = []) => {
   }
   from_cfg.push({
     scriptBody: `var dynamic_updates_cfg = ${JSON.stringify({
-      enabled: dynamic_updates_enabled,
+      enabled: dynamic_updates_enabled && req.user?.id,
     })}`,
   });
   return [