@saltcorn/server 1.1.0-beta.12 → 1.1.0-beta.14

package/routes/eventlog.js

@@ -81,6 +81,31 @@ const logSettingsForm = async (req) => {
       input_type: "date",
       attributes: { minDate: new Date(), maxDate: hoursFuture(24 * 7 * 2) },
     },
+    {
+      input_type: "section_header",
+      label: req.__("Delete old workflow runs with status after days"),
+    },
+    {
+      name: "delete_finished_workflows_days",
+      label: req.__("Finished"),
+      type: "Integer",
+    },
+    {
+      name: "delete_error_workflows_days",
+      label: req.__("Error"),
+      type: "Integer",
+    },
+    {
+      name: "delete_waiting_workflows_days",
+      label: req.__("Waiting"),
+      type: "Integer",
+    },
+
+    {
+      name: "delete_running_workflows_days",
+      label: req.__("Running"),
+      type: "Integer",
+    },
     {
       input_type: "section_header",
       label: req.__("Which events should be logged?"),
@@ -143,6 +168,10 @@ router.get(
       "next_weekly_event",
       {}
     );
+    ["error", "finished", "running", "waiting"].forEach((k) => {
+      let cfgk = `delete_${k}_workflows_days`;
+      form.values[cfgk] = getState().getConfig(cfgk);
+    });
 
     send_events_page({
       res,
@@ -348,6 +377,13 @@ router.post(
           delete form.values[k];
         }
       }
+      for (const status of ["error", "finished", "running", "waiting"]) {
+        let k = `delete_${status}_workflows_days`;
+        if (form.values[k]) {
+          await getState().setConfig(k, form.values[k]);
+          delete form.values[k];
+        }
+      }
 
       await getState().setConfig("event_log_settings", form.values);
 

package/routes/fields.js

@@ -301,6 +301,10 @@ const fieldFlow = (req) =>
       if (context.id) {
         const field = await Field.findOne({ id: context.id });
         try {
+          if (fldRow.label && field.label != fldRow.label) {
+            fldRow.name = Field.labelToName(fldRow.label);
+          }
+
           await field.update(fldRow);
         } catch (e) {
           return {
@@ -362,10 +366,12 @@ const fieldFlow = (req) =>
         name: req.__("Attributes"),
         contextField: "attributes",
         onlyWhen: (context) => {
-          if (context.calculated) return false;
+          const type = getState().types[context.type];
+          if (context.calculated && !type?.setTypeAttributesForCalculatedFields)
+            return false;
+
           if (context.type === "File") return true;
           if (new Field(context).is_fkey) return false;
-          const type = getState().types[context.type];
           if (!type) return false;
           const attrs = Field.getTypeAttributes(
             type.attributes,

package/routes/tables.js

@@ -757,6 +757,8 @@ router.get(
     const triggers = table.id ? Trigger.find({ table_id: table.id }) : [];
     triggers.sort(comparingCaseInsensitive("name"));
     let fieldCard;
+    const nPrimaryKeys = fields.filter((f) => f.primary_key).length;
+
     if (fields.length === 0) {
       fieldCard = [
         h4(req.__(`No fields defined in %s table`, table.name)),
@@ -818,6 +820,19 @@ router.get(
         { hover: true }
       );
       fieldCard = [
+        nPrimaryKeys > 1 &&
+          div(
+            { class: "alert alert-danger", role: "alert" },
+            i({ class: "fas fa-exclamation-triangle" }),
+            "This table has composite primary keys which is not supported in Saltcorn. A procedure to introduce a single autoincrementing primary key is available.",
+            post_btn(
+              `/table/repair-composite-primary/${table.id}`,
+              "Add autoincrementing primary key",
+              req.csrfToken(),
+              { btnClass: "btn-danger" }
+            )
+          ),
+
         tableHtml,
         inbound_refs.length > 0
           ? req.__("Inbound keys: ") +
@@ -1111,7 +1126,7 @@ router.post(
     const v = req.body;
     if (typeof v.id === "undefined" && typeof v.external === "undefined") {
       // insert
-      v.name = v.name.trim()
+      v.name = v.name.trim();
       const { name, ...rest } = v;
       const alltables = await Table.find({});
       const existing_tables = [
@@ -2074,3 +2089,20 @@ router.post(
     respondWorkflow(table, workflow, wfres, req, res);
   })
 );
+
+router.post(
+  "/repair-composite-primary/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+
+    const table = Table.findOne({ id });
+    if (!table) {
+      req.flash("error", `Table not found`);
+      res.redirect(`/table`);
+      return;
+    }
+    await table.repairCompositePrimary();
+    res.redirect(`/table/${table.id}`);
+  })
+);

package/serve.js

@@ -121,11 +121,7 @@ const initMaster = async ({ disableMigrate }, useClusterAdaptor = true) => {
   if (getState().getConfig("log_sql", false)) db.set_sql_logging();
   if (db.is_it_multi_tenant()) {
     const tenants = await getAllTenants();
-    await init_multi_tenant(
-      async () => await loadAllPlugins(true),
-      disableMigrate,
-      tenants
-    );
+    await init_multi_tenant(loadAllPlugins, disableMigrate, tenants);
   }
   eachTenant(async () => {
     const state = getState();