@saltcorn/server 0.9.0-beta.0 → 0.9.0-beta.10

package/routes/admin.js

@@ -285,6 +285,9 @@ router.get(
     backupForm.values.auto_backup_expire_days = getState().getConfig(
       "auto_backup_expire_days"
     );
+    backupForm.values.backup_with_event_log = getState().getConfig(
+      "backup_with_event_log"
+    );
     //
     const aSnapshotForm = snapshotForm(req);
     aSnapshotForm.values.snapshots_enabled =
@@ -721,6 +724,15 @@ const autoBackupForm = (req) =>
           auto_backup_destination: "Local directory",
         },
       },
+      {
+        type: "Bool",
+        label: req.__("Include Event Logs"),
+        sublabel: req.__("Backup with event logs"),
+        name: "backup_with_event_log",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+        },
+      },
     ],
   });
 
@@ -1514,6 +1526,8 @@ router.get(
     const plugins = (await Plugin.find()).filter(
       (plugin) => ["base", "sbadmin2"].indexOf(plugin.name) < 0
     );
+    const builderSettings =
+      getState().getConfig("mobile_builder_settings") || {};
     send_admin_page({
       res,
       req,
@@ -1543,7 +1557,7 @@ router.get(
                 input({
                   type: "hidden",
                   name: "entryPointType",
-                  value: "view",
+                  value: builderSettings.entryPointType || "view",
                   id: "entryPointTypeID",
                 }),
                 div(
@@ -1574,7 +1588,15 @@ router.get(
                             onClick: "showEntrySelect('view')",
                           },
                           div(
-                            { class: "nav-link active", id: "viewNavLinkID" },
+                            {
+                              class: `nav-link ${
+                                !builderSettings.entryPointType ||
+                                builderSettings.entryPointType === "view"
+                                  ? "active"
+                                  : ""
+                              }`,
+                              id: "viewNavLinkID",
+                            },
                             req.__("View")
                           )
                         ),
@@ -1584,7 +1606,14 @@ router.get(
                             onClick: "showEntrySelect('page')",
                           },
                           div(
-                            { class: "nav-link", id: "pageNavLinkID" },
+                            {
+                              class: `nav-link ${
+                                builderSettings.entryPointType === "page"
+                                  ? "active"
+                                  : ""
+                              }`,
+                              id: "pageNavLinkID",
+                            },
                             req.__("Page")
                           )
                         )
@@ -1592,25 +1621,56 @@ router.get(
                       // select entry-view
                       select(
                         {
-                          class: "form-select",
-                          name: "entryPoint",
+                          class: `form-select ${
+                            builderSettings.entryPointType === "page"
+                              ? "d-none"
+                              : ""
+                          }`,
+                          ...(!builderSettings.entryPointType ||
+                          builderSettings.entryPointType === "view"
+                            ? { name: "entryPoint" }
+                            : {}),
                           id: "viewInputID",
                         },
                         views
                           .map((view) =>
-                            option({ value: view.name }, view.name)
+                            option(
+                              {
+                                value: view.name,
+                                selected:
+                                  builderSettings.entryPointType === "view" &&
+                                  builderSettings.entryPoint === view.name,
+                              },
+                              view.name
+                            )
                           )
                           .join(",")
                       ),
                       // select entry-page
                       select(
                         {
-                          class: "form-select d-none",
+                          class: `form-select ${
+                            !builderSettings.entryPointType ||
+                            builderSettings.entryPointType === "view"
+                              ? "d-none"
+                              : ""
+                          }`,
+                          ...(builderSettings.entryPointType === "page"
+                            ? { name: "entryPoint" }
+                            : {}),
                           id: "pageInputID",
                         },
                         pages
                           .map((page) =>
-                            option({ value: page.name }, page.name)
+                            option(
+                              {
+                                value: page.name,
+                                selected:
+                                  builderSettings.entryPointType === "page" &&
+                                  builderSettings.entryPoint === page.name,
+                              },
+                              page.name
+                            )
                           )
                           .join("")
                       )
@@ -1631,6 +1691,7 @@ router.get(
                               name: "androidPlatform",
                               id: "androidCheckboxId",
                               onClick: "toggle_android_platform()",
+                              checked: builderSettings.androidPlatform === "on",
                             })
                           )
                         ),
@@ -1645,6 +1706,7 @@ router.get(
                               class: "form-check-input",
                               name: "iOSPlatform",
                               id: "iOSCheckboxId",
+                              checked: builderSettings.iOSPlatform === "on",
                             })
                           )
                         )
@@ -1658,7 +1720,8 @@ router.get(
                         class: "form-check-input",
                         name: "useDocker",
                         id: "dockerCheckboxId",
-                        hidden: true,
+                        hidden: builderSettings.androidPlatform !== "on",
+                        checked: builderSettings.useDocker === "on",
                       })
                     )
                   ),
@@ -1680,6 +1743,7 @@ router.get(
                         name: "appName",
                         id: "appNameInputId",
                         placeholder: "SaltcornMobileApp",
+                        value: builderSettings.appName || "",
                       })
                     )
                   ),
@@ -1701,6 +1765,7 @@ router.get(
                         name: "appVersion",
                         id: "appVersionInputId",
                         placeholder: "1.0.0",
+                        value: builderSettings.appVersion || "",
                       })
                     )
                   ),
@@ -1721,6 +1786,7 @@ router.get(
                         class: "form-control",
                         name: "serverURL",
                         id: "serverURLInputId",
+                        value: builderSettings.serverURL || "",
                         placeholder: getState().getConfig("base_url") || "",
                       })
                     )
@@ -1746,7 +1812,14 @@ router.get(
                         [
                           option({ value: "" }, ""),
                           ...images.map((image) =>
-                            option({ value: image.location }, image.filename)
+                            option(
+                              {
+                                value: image.location,
+                                selected:
+                                  builderSettings.appIcon === image.location,
+                              },
+                              image.filename
+                            )
                           ),
                         ].join("")
                       )
@@ -1772,7 +1845,14 @@ router.get(
                         [
                           option({ value: "" }, ""),
                           ...pages.map((page) =>
-                            option({ value: page.name }, page.name)
+                            option(
+                              {
+                                value: page.name,
+                                selected:
+                                  builderSettings.splashPage === page.name,
+                              },
+                              page.name
+                            )
                           ),
                         ].join("")
                       )
@@ -1788,8 +1868,7 @@ router.get(
                         id: "autoPublLoginId",
                         class: "form-check-input me-2",
                         name: "autoPublicLogin",
-                        value: "autoPublicLogin",
-                        checked: false,
+                        checked: builderSettings.autoPublicLogin === "on",
                       }),
                       label(
                         {
@@ -1810,9 +1889,8 @@ router.get(
                         id: "offlineModeBoxId",
                         class: "form-check-input me-2",
                         name: "allowOfflineMode",
-                        value: "allowOfflineMode",
                         onClick: "toggle_tbl_sync()",
-                        checked: true,
+                        checked: builderSettings.allowOfflineMode === "on",
                       }),
                       label(
                         {
@@ -1828,6 +1906,7 @@ router.get(
                     {
                       id: "tblSyncSelectorId",
                       class: "row pb-3",
+                      hidden: builderSettings.allowOfflineMode !== "on",
                     },
                     div(
                       label(
@@ -1864,6 +1943,12 @@ router.get(
                                 id: `${table.name}_unsynched_opt`,
                                 value: table.name,
                                 label: table.name,
+                                hidden:
+                                  builderSettings.synchedTables?.indexOf(
+                                    table.name
+                                  ) >= 0
+                                    ? true
+                                    : false,
                               })
                             )
                           )
@@ -1908,7 +1993,12 @@ router.get(
                                 id: `${table.name}_synched_opt`,
                                 value: table.name,
                                 label: table.name,
-                                hidden: "true",
+                                hidden:
+                                  builderSettings.synchedTables?.indexOf(
+                                    table.name
+                                  ) >= 0
+                                    ? false
+                                    : true,
                               })
                             )
                           )
@@ -1954,7 +2044,12 @@ router.get(
                                 id: `${plugin.name}_excluded_opt`,
                                 value: plugin.name,
                                 label: plugin.name,
-                                hidden: "true",
+                                hidden:
+                                  builderSettings.excludedPlugins?.indexOf(
+                                    plugin.name
+                                  ) >= 0
+                                    ? false
+                                    : true,
                               })
                             )
                           )
@@ -1999,7 +2094,12 @@ router.get(
                                 id: `${plugin.name}_included_opt`,
                                 value: plugin.name,
                                 label: plugin.name,
-                                // hidden: "true",
+                                hidden:
+                                  builderSettings.excludedPlugins?.indexOf(
+                                    plugin.name
+                                  ) >= 0
+                                    ? true
+                                    : false,
                               })
                             )
                           )
@@ -2116,6 +2216,8 @@ router.post(
       synchedTables,
       includedPlugins,
     } = req.body;
+    if (!includedPlugins) includedPlugins = [];
+    if (!synchedTables) synchedTables = [];
     if (!androidPlatform && !iOSPlatform) {
       return res.json({
         error: req.__("Please select at least one platform (android or iOS)."),
@@ -2167,9 +2269,9 @@ router.post(
     if (splashPage) spawnParams.push("--splashPage", splashPage);
     if (allowOfflineMode) spawnParams.push("--allowOfflineMode");
     if (autoPublicLogin) spawnParams.push("--autoPublicLogin");
-    if (synchedTables?.length > 0)
+    if (synchedTables.length > 0)
       spawnParams.push("--synchedTables", ...synchedTables.map((tbl) => tbl));
-    if (includedPlugins?.length > 0)
+    if (includedPlugins.length > 0)
       spawnParams.push(
         "--includedPlugins",
         ...includedPlugins.map((pluginName) => pluginName)
@@ -2180,6 +2282,30 @@ router.post(
     ) {
       spawnParams.push("--tenantAppName", db.getTenantSchema());
     }
+    const excludedPlugins = (await Plugin.find())
+      .filter(
+        (plugin) =>
+          ["base", "sbadmin2"].indexOf(plugin.name) < 0 &&
+          includedPlugins.indexOf(plugin.name) < 0
+      )
+      .map((plugin) => plugin.name);
+    await getState().setConfig("mobile_builder_settings", {
+      entryPoint,
+      entryPointType,
+      androidPlatform,
+      iOSPlatform,
+      useDocker,
+      appName,
+      appVersion,
+      appIcon,
+      serverURL,
+      splashPage,
+      autoPublicLogin,
+      allowOfflineMode,
+      synchedTables: synchedTables,
+      includedPlugins: includedPlugins,
+      excludedPlugins,
+    });
     // end http call, return the out directory name
     // the gui polls for results
     res.json({ build_dir_name: outDirName });

package/routes/fields.js

@@ -409,7 +409,7 @@ const fieldFlow = (req) =>
             instance_options[model.name].push(...instances.map((i) => i.name));
 
             const outputs = await applyAsync(
-              model.templateObj.prediction_outputs || [],
+              model.templateObj?.prediction_outputs || [], // unit tests can have templateObj undefined
               { table, configuration: model.configuration }
             );
             output_options[model.name] = outputs.map((o) => o.name);
@@ -840,6 +840,11 @@ router.post(
     const table = Table.findOne({ name: tableName });
     const role = req.user && req.user.id ? req.user.role_id : 100;
 
+    getState().log(
+      5,
+      `Route /fields/show-calculated/${tableName}/${fieldName}/${fieldview} user=${req.user?.id}`
+    );
+
     const fields = table.getFields();
     let row = { ...req.body };
     if (row && Object.keys(row).length > 0) readState(row, fields);
@@ -1018,6 +1023,13 @@ router.post(
     const { tableName, fieldName, fieldview } = req.params;
     const table = Table.findOne({ name: tableName });
     const fields = table.getFields();
+    const state = getState();
+
+    state.log(
+      5,
+      `Route /fields/preview/${tableName}/${fieldName}/${fieldview} user=${req.user?.id}`
+    );
+
     let field, row, value;
     if (fieldName.includes(".")) {
       const [refNm, targetNm] = fieldName.split(".");
@@ -1048,9 +1060,9 @@ router.post(
     }
     const fieldviews =
       field.type === "Key"
-        ? getState().keyFieldviews
+        ? state.keyFieldviews
         : field.type === "File"
-        ? getState().fileviews
+        ? state.fileviews
         : field.type.fieldviews;
     if (!field.type || !fieldviews) {
       res.send("");

package/routes/menu.js

@@ -44,7 +44,7 @@ const menuForm = async (req) => {
   const views = await View.find({}, { orderBy: "name", nocase: true });
   const pages = await Page.find({}, { orderBy: "name", nocase: true });
   const roles = await User.get_roles();
-  const tables = await Table.find({});
+  const tables = await Table.find_with_external({});
   const dynTableOptions = tables.map((t) => t.name);
   const dynOrderFieldOptions = {},
     dynSectionFieldOptions = {};

package/routes/packs.js

@@ -6,18 +6,19 @@
 
 const Router = require("express-promise-router");
 const { isAdmin, error_catcher } = require("./utils.js");
-const { mkTable, renderForm, link, post_btn } = require("@saltcorn/markup");
-const { getState } = require("@saltcorn/data/db/state");
+const { renderForm } = require("@saltcorn/markup");
 const Table = require("@saltcorn/data/models/table");
 const Form = require("@saltcorn/data/models/form");
 const View = require("@saltcorn/data/models/view");
-const Field = require("@saltcorn/data/models/field");
 const Plugin = require("@saltcorn/data/models/plugin");
 const Page = require("@saltcorn/data/models/page");
+const Tag = require("@saltcorn/data/models/tag");
+const EventLog = require("@saltcorn/data/models/eventlog");
+const Model = require("@saltcorn/data/models/model");
+const ModelInstance = require("@saltcorn/data/models/model_instance");
 const load_plugins = require("../load_plugins");
 
 const { is_pack } = require("@saltcorn/data/contracts");
-const { contract, is } = require("contractis");
 const {
   table_pack,
   view_pack,
@@ -26,15 +27,20 @@ const {
   role_pack,
   library_pack,
   trigger_pack,
+  tag_pack,
+  model_pack,
+  model_instance_pack,
   install_pack,
   fetch_pack_by_name,
   can_install_pack,
   uninstall_pack,
+  event_log_pack,
 } = require("@saltcorn/admin-models/models/pack");
-const { h5, pre, code, p, text, text_attr } = require("@saltcorn/markup/tags");
+const { pre, code, p, text, text_attr } = require("@saltcorn/markup/tags");
 const Library = require("@saltcorn/data/models/library");
 const Trigger = require("@saltcorn/data/models/trigger");
 const Role = require("@saltcorn/data/models/role");
+const fs = require("fs");
 
 /**
  * @type {object}
@@ -98,6 +104,52 @@ router.get(
       name: `role.${l.role}`,
       type: "Bool",
     }));
+    const tags = await Tag.find({});
+    const tagFields = tags.map((t) => ({
+      label: `${t.name} tag`,
+      name: `tag.${t.name}`,
+      type: "Bool",
+    }));
+    const models = await Model.find({});
+    const modelFields = models.map((m) => {
+      const modelTbl = Table.findOne({ id: m.table_id });
+      return {
+        label: `${m.name} model, table: ${
+          modelTbl.name || req.__("Table not found")
+        }`,
+        name: `model.${m.name}.${modelTbl.name}`,
+        type: "Bool",
+      };
+    });
+    const modelInstances = await ModelInstance.find({});
+    const modelInstanceFields = (
+      await Promise.all(
+        modelInstances.map(async (instance) => {
+          const model = await Model.findOne({ id: instance.model_id });
+          if (!model) {
+            req.flash(
+              "warning",
+              req.__(`Model with '${instance.model_id}' not found`)
+            );
+            return null;
+          }
+          const mTable = await Table.findOne({ id: model.table_id });
+          if (!mTable) {
+            req.flash(
+              "warning",
+              req.__(`Table of model '${model.name}' not found`)
+            );
+            return null;
+          }
+          return {
+            label: `${instance.name} model instance, model: ${model.name}, table: ${mTable.name}`,
+            name: `model_instance.${instance.name}.${model.name}.${mTable.name}`,
+            type: "Bool",
+          };
+        })
+      )
+    ).filter((f) => f);
+
     const form = new Form({
       action: "/packs/create",
       fields: [
@@ -108,6 +160,14 @@ router.get(
         ...trigFields,
         ...roleFields,
         ...libFields,
+        ...tagFields,
+        ...modelFields,
+        ...modelInstanceFields,
+        {
+          name: "with_event_logs",
+          label: req.__("Include Event Logs"),
+          type: "Bool",
+        },
       ],
     });
     res.sendWrap(req.__(`Create Pack`), {
@@ -140,7 +200,7 @@ router.post(
   "/create",
   isAdmin,
   error_catcher(async (req, res) => {
-    var pack = {
+    const pack = {
       tables: [],
       views: [],
       plugins: [],
@@ -148,9 +208,13 @@ router.post(
       roles: [],
       library: [],
       triggers: [],
+      tags: [],
+      models: [],
+      model_instances: [],
+      event_logs: [],
     };
     for (const k of Object.keys(req.body)) {
-      const [type, name] = k.split(".");
+      const [type, name, ...rest] = k.split(".");
       switch (type) {
         case "table":
           pack.tables.push(await table_pack(name));
@@ -173,7 +237,32 @@ router.post(
         case "trigger":
           pack.triggers.push(await trigger_pack(name));
           break;
-
+        case "tag":
+          pack.tags.push(await tag_pack(name));
+          break;
+        case "model": {
+          const table = rest[0];
+          if (!table) throw new Error(`Table for model '${name}' not found`);
+          pack.models.push(await model_pack(name, table));
+          break;
+        }
+        case "model_instance": {
+          const model = rest[0];
+          if (!model)
+            throw new Error(`Model of Model Instance '${name}' not found`);
+          const table = rest[1];
+          if (!table) throw new Error(`Table of Model '${model}' not found`);
+          pack.model_instances.push(
+            await model_instance_pack(name, model, table)
+          );
+          break;
+        }
+        case "with_event_logs":
+          const logs = await EventLog.find({});
+          pack.event_logs = await Promise.all(
+            logs.map(async (l) => await event_log_pack(l))
+          );
+          break;
         default:
           break;
       }
@@ -217,11 +306,33 @@ const install_pack_form = (req) =>
     action: "/packs/install",
     submitLabel: req.__("Install"),
     fields: [
+      {
+        name: "source",
+        label: req.__("Source"),
+        type: "String",
+        attributes: {
+          options: [
+            { label: "from text", name: "from_text" },
+            { label: "from file", name: "from_file" },
+          ],
+        },
+        default: "from_text",
+        required: true,
+      },
       {
         name: "pack",
         label: req.__("Pack"),
         type: "String",
         fieldview: "textarea",
+        showIf: { source: "from_text" },
+      },
+      {
+        name: "pack_file",
+        label: req.__("Pack file"),
+        class: "form-control",
+        type: "File",
+        sublabel: req.__("Upload a pack file"),
+        showIf: { source: "from_file" },
       },
     ],
   });
@@ -267,8 +378,22 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     var pack, error;
+    const source = req.body.source || "from_text";
     try {
-      pack = JSON.parse(req.body.pack);
+      switch (source) {
+        case "from_text":
+          pack = JSON.parse(req.body.pack);
+          break;
+        case "from_file":
+          if (req.files?.pack_file?.tempFilePath)
+            pack = JSON.parse(
+              fs.readFileSync(req.files?.pack_file?.tempFilePath)
+            );
+          else throw new Error(req.__("No file uploaded"));
+          break;
+        default:
+          throw new Error(req.__("Invalid source"));
+      }
     } catch (e) {
       error = e.message;
     }