@saltcorn/server 0.8.8-beta.1 → 0.8.8-beta.2

package/routes/tables.js

@@ -168,6 +168,19 @@ const tableForm = async (table, req) => {
               name: "versioned",
               type: "Bool",
             },
+            ...(table.name === "users"
+              ? []
+              : [
+                  {
+                    label: req.__("Sync information"),
+                    sublabel: req.__(
+                      "Sync information tracks the last modification or deletion timestamp " +
+                        "so that the table data can be synchronized with the mobile app"
+                    ),
+                    name: "has_sync_info",
+                    type: "Bool",
+                  },
+                ]),
           ]),
     ],
   });
@@ -922,7 +935,10 @@ router.get(
             { href: `/table/constraints/${table.id}` },
             i({ class: "fas fa-2x fa-tasks" }),
             "<br/>",
-            req.__("Constraints")
+            req.__("Constraints") +
+              (table.constraints?.length
+                ? ` (${table.constraints.length})`
+                : "")
           )
         ),
 
@@ -1080,9 +1096,11 @@ router.post(
       const { id, _csrf, ...rest } = v;
       const table = Table.findOne({ id: parseInt(id) });
       const old_versioned = table.versioned;
+      const old_has_sync_info = table.has_sync_info;
       let hasError = false;
       let notify = "";
       if (!rest.versioned) rest.versioned = false;
+      if (!rest.has_sync_info) rest.has_sync_info = false;
       if (rest.ownership_field_id === "_formula") {
         rest.ownership_field_id = null;
         const fmlValidRes = expressionValidator(rest.ownership_formula);

package/tests/plugin_install.test.js

@@ -0,0 +1,114 @@
+const Table = require("@saltcorn/data/models/table");
+const Plugin = require("@saltcorn/data/models/plugin");
+const { getState, add_tenant } = require("@saltcorn/data/db/state");
+const { install_pack } = require("@saltcorn/admin-models/models/pack");
+const {
+  switchToTenant,
+  insertTenant,
+  create_tenant,
+} = require("@saltcorn/admin-models/models/tenant");
+const { resetToFixtures } = require("../auth/testhelp");
+const db = require("@saltcorn/data/db");
+const load_plugins = require("../load_plugins");
+
+beforeAll(async () => {
+  if (!db.isSQLite) await db.query(`drop schema if exists test101 CASCADE `);
+  await resetToFixtures();
+});
+afterAll(db.close);
+
+jest.setTimeout(30000);
+const plugin_pack = (plugin) => ({
+  tables: [],
+  views: [],
+  plugins: [
+    {
+      ...plugin,
+      configuration: null,
+    },
+  ],
+  pages: [],
+  roles: [],
+  library: [],
+  triggers: [],
+});
+
+describe("Tenant cannot install unsafe plugins", () => {
+  if (!db.isSQLite) {
+    it("creates a new tenant", async () => {
+      db.enable_multi_tenant();
+      const loadAndSaveNewPlugin = load_plugins.loadAndSaveNewPlugin;
+
+      await getState().setConfig("base_url", "http://example.com/");
+
+      add_tenant("test101");
+
+      await switchToTenant(
+        await insertTenant("test101", "foo@foo.com", ""),
+        "http://test101.example.com/"
+      );
+
+      await create_tenant({
+        t: "test101",
+        loadAndSaveNewPlugin,
+        plugin_loader() {},
+      });
+    });
+    it("can install safe plugins on tenant", async () => {
+      await db.runWithTenant("test101", async () => {
+        const loadAndSaveNewPlugin = load_plugins.loadAndSaveNewPlugin;
+
+        await install_pack(
+          plugin_pack({
+            name: "html",
+            source: "npm",
+            location: "@saltcorn/html",
+          }),
+          "Todo list",
+          loadAndSaveNewPlugin
+        );
+        const dbPlugin = await Plugin.findOne({ name: "html" });
+        expect(dbPlugin).not.toBe(null);
+      });
+    });
+    it("cannot install unsafe plugins on tenant", async () => {
+      await db.runWithTenant("test101", async () => {
+        const loadAndSaveNewPlugin = load_plugins.loadAndSaveNewPlugin;
+
+        await install_pack(
+          plugin_pack({
+            name: "sql-list",
+            source: "npm",
+            location: "@saltcorn/sql-list",
+          }),
+          "Todo list",
+          loadAndSaveNewPlugin
+        );
+        const dbPlugin = await Plugin.findOne({ name: "sql-list" });
+        expect(dbPlugin).toBe(null);
+      });
+    });
+    it("can install unsafe plugins on tenant when permitted", async () => {
+      await getState().setConfig("tenants_unsafe_plugins", true);
+      await db.runWithTenant("test101", async () => {
+        const loadAndSaveNewPlugin = load_plugins.loadAndSaveNewPlugin;
+
+        await install_pack(
+          plugin_pack({
+            name: "sql-list",
+            source: "npm",
+            location: "@saltcorn/sql-list",
+          }),
+          "Todo list",
+          loadAndSaveNewPlugin
+        );
+        const dbPlugin = await Plugin.findOne({ name: "sql-list" });
+        expect(dbPlugin).not.toBe(null);
+      });
+    });
+  } else {
+    it("does not support tenants on SQLite", async () => {
+      expect(db.isSQLite).toBe(true);
+    });
+  }
+});

package/tests/plugins.test.js

@@ -2,13 +2,8 @@ const request = require("supertest");
 const getApp = require("../app");
 const Table = require("@saltcorn/data/models/table");
 const Plugin = require("@saltcorn/data/models/plugin");
-const { getState, add_tenant } = require("@saltcorn/data/db/state");
-const { install_pack } = require("@saltcorn/admin-models/models/pack");
-const {
-  switchToTenant,
-  insertTenant,
-  create_tenant,
-} = require("@saltcorn/admin-models/models/tenant");
+const { getState } = require("@saltcorn/data/db/state");
+
 const {
   getAdminLoginCookie,
   itShouldRedirectUnauthToLogin,
@@ -331,98 +326,3 @@ describe("config endpoints", () => {
       .expect(toInclude(">FooSiteName<"));
   });
 });
-
-const plugin_pack = (plugin) => ({
-  tables: [],
-  views: [],
-  plugins: [
-    {
-      ...plugin,
-      configuration: null,
-    },
-  ],
-  pages: [],
-  roles: [],
-  library: [],
-  triggers: [],
-});
-
-describe("Tenant cannot install unsafe plugins", () => {
-  if (!db.isSQLite) {
-    it("creates a new tenant", async () => {
-      db.enable_multi_tenant();
-      const loadAndSaveNewPlugin = load_plugins.loadAndSaveNewPlugin;
-
-      await getState().setConfig("base_url", "http://example.com/");
-
-      add_tenant("test101");
-
-      await switchToTenant(
-        await insertTenant("test101", "foo@foo.com", ""),
-        "http://test101.example.com/"
-      );
-
-      await create_tenant({
-        t: "test101",
-        loadAndSaveNewPlugin,
-        plugin_loader() {},
-      });
-    });
-    it("can install safe plugins on tenant", async () => {
-      await db.runWithTenant("test101", async () => {
-        const loadAndSaveNewPlugin = load_plugins.loadAndSaveNewPlugin;
-
-        await install_pack(
-          plugin_pack({
-            name: "html",
-            source: "npm",
-            location: "@saltcorn/html",
-          }),
-          "Todo list",
-          loadAndSaveNewPlugin
-        );
-        const dbPlugin = await Plugin.findOne({ name: "html" });
-        expect(dbPlugin).not.toBe(null);
-      });
-    });
-    it("cannot install unsafe plugins on tenant", async () => {
-      await db.runWithTenant("test101", async () => {
-        const loadAndSaveNewPlugin = load_plugins.loadAndSaveNewPlugin;
-
-        await install_pack(
-          plugin_pack({
-            name: "sql-list",
-            source: "npm",
-            location: "@saltcorn/sql-list",
-          }),
-          "Todo list",
-          loadAndSaveNewPlugin
-        );
-        const dbPlugin = await Plugin.findOne({ name: "sql-list" });
-        expect(dbPlugin).toBe(null);
-      });
-    });
-    it("can install unsafe plugins on tenant when permitted", async () => {
-      await getState().setConfig("tenants_unsafe_plugins", true);
-      await db.runWithTenant("test101", async () => {
-        const loadAndSaveNewPlugin = load_plugins.loadAndSaveNewPlugin;
-
-        await install_pack(
-          plugin_pack({
-            name: "sql-list",
-            source: "npm",
-            location: "@saltcorn/sql-list",
-          }),
-          "Todo list",
-          loadAndSaveNewPlugin
-        );
-        const dbPlugin = await Plugin.findOne({ name: "sql-list" });
-        expect(dbPlugin).not.toBe(null);
-      });
-    });
-  } else {
-    it("does not support tenants on SQLite", async () => {
-      expect(db.isSQLite).toBe(true);
-    });
-  }
-});