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

package/routes/admin.js

@@ -2269,7 +2269,7 @@ router.get(
 );
 const buildDialogScript = (capacitorBuilderAvailable, isSbadmin2) =>
   `<script>
-  var capacitorBuilderAvailable = ${capacitorBuilderAvailable};
+  var capacitorBuilderAvailable = ${capacitorBuilderAvailable.installed};
   var isSbadmin2 = ${isSbadmin2};
   function showEntrySelect(type) {
     for( const currentType of ["view", "page", "pagegroup"]) {
@@ -2305,19 +2305,50 @@ 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>`;
 
-const imageAvailable = async () => {
+const imageAvailable = async (preferedVersion) => {
+  const docker = new Docker();
   try {
-    const state = getState();
-    const image = new Docker().getImage(
-      `saltcorn/capacitor-builder:${state.scVersion}`
+    const image = docker.getImage(
+      `saltcorn/capacitor-builder:${preferedVersion}`
     );
     await image.inspect();
-    return true;
+    return { installed: true, version: preferedVersion };
   } catch (e) {
-    return false;
+    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 };
   }
 };
 
@@ -2373,13 +2404,15 @@ router.get(
       .map((plugin) => plugin.name);
     const builderSettings =
       getState().getConfig("mobile_builder_settings") || {};
-    const dockerAvailable = await imageAvailable();
+    const scVersion = getState().scVersion;
+    const dockerAvailable = await imageAvailable(scVersion);
     const xcodeCheckRes = await checkXcodebuild();
     const xcodebuildAvailable = xcodeCheckRes.installed;
     const xcodebuildVersion = xcodeCheckRes.version;
     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,
@@ -2439,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(
@@ -3133,15 +3202,58 @@ router.get(
                               id: "dockerBuilderStatusId",
                               class: "",
                             },
-                            dockerAvailable
+                            dockerAvailable.installed &&
+                              dockerAvailable.version === scVersion
                               ? span(
                                   req.__("installed"),
                                   i({ class: "ps-2 fas fa-check text-success" })
                                 )
-                              : span(
-                                  req.__("not available"),
-                                  i({ class: "ps-2 fas fa-times text-danger" })
-                                )
+                              : dockerAvailable.installed
+                                ? div(
+                                    {
+                                      id: "mismatchBoxId",
+                                      class: "mt-3 p-3 border rounded bg-light",
+                                    },
+                                    div(
+                                      {
+                                        class: "d-flex align-items-center mb-2",
+                                      },
+                                      req.__("installed"),
+                                      i({
+                                        title: req.__("Information"),
+                                        class:
+                                          "ps-2 fas fa-info-circle text-warning",
+                                      })
+                                    ),
+                                    div(
+                                      { class: "fw-bold text-danger mb-1" },
+                                      "Version Mismatch:"
+                                    ),
+
+                                    ul(
+                                      { class: "list-unstyled mb-0" },
+                                      li(
+                                        span(
+                                          { class: "fw-semibold text-muted" },
+                                          req.__("Docker tag:")
+                                        ),
+                                        dockerAvailable.version
+                                      ),
+                                      li(
+                                        span(
+                                          { class: "fw-semibold text-muted" },
+                                          req.__("SC version:")
+                                        ),
+                                        scVersion
+                                      )
+                                    )
+                                  )
+                                : span(
+                                    req.__("not available"),
+                                    i({
+                                      class: "ps-2 fas fa-times text-danger",
+                                    })
+                                  )
                           )
                         ),
                         div(
@@ -3712,6 +3824,7 @@ router.post(
     let {
       entryPoint,
       entryPointType,
+      entryPointByRole,
       androidPlatform,
       iOSPlatform,
       useDocker,
@@ -3815,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",
@@ -3826,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) {
@@ -3997,8 +4113,9 @@ router.get(
   "/mobile-app/check-capacitor-builder",
   isAdmin,
   error_catcher(async (req, res) => {
-    const installed = await imageAvailable();
-    res.json({ installed });
+    const state = getState();
+    const { installed, version } = await imageAvailable(state.scVersion);
+    res.json({ installed, version, sc_version: state.scVersion });
   })
 );
 

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
             ? []
             : [
                 {