@saltcorn/server 0.9.0-beta.7 → 0.9.0-beta.9

package/help/Actions.tmd

@@ -0,0 +1,9 @@
+The action chosen will determine what happens when the trigger occurs. 
+After you have chosen an action, there will be further configuration of that action.
+
+The available actions, some of which are only accessible when the trigger is 
+table-related, are: 
+
+{{# for (const [name, action] of Object.entries(scState.actions)) { }}
+* `{{name}}`: {{action.description||""}}
+{{# } }}

package/help/JavaScript action code.tmd

@@ -0,0 +1,161 @@
+Here you can enter the code that needs to run when this trigger occurs. 
+The action can manipulate rows in the database, manipulate files, interact 
+with remote APIs, or issue directives for the user's display.
+
+Your code can use await at the top level, and should do so whenever calling 
+database queries or other aynchronous code (see example below)
+
+The variable `table` is the associated table (if any; note lowercase). If you want to access a different table,
+use the `Table` variable (note uppercase) to access the Table class of tables (see 
+[documentation for Table class](https://saltcorn.github.io/saltcorn/classes/_saltcorn_data.models.Table-1.html))
+
+Example:
+
+```
+await table.insertRow({name: "Alex", age: 43})
+const otherTable = Table.findOne({name: "Orders"})
+await otherTable.deleteRows({id: order})
+```
+
+In addition to `table` and `Table`, you can use other functions/variables:
+
+#### `console`
+
+Use this to print to the terminal.
+
+Example: `console.log("Hello world")`
+
+#### `Actions`
+
+Use `Actions.{ACTION NAME}` to run an action.
+
+Your available action names are: {{ Object.keys(scState.actions).join(", ") }}
+
+Example: 
+
+```
+await Actions.set_user_language({language: "fr"})
+```
+
+#### `sleep`
+
+A small utility function to sleep for certain number of milliseconds. Use this with await
+
+Example: `await sleep(1000)`
+
+#### `require`
+
+Use require to access NPM packages listed under your [Development settings](/admin/dev)
+
+Example: `const _ = require("underscore")`
+
+#### `fetch` and `fetchJSON`
+
+Use these to make HTTP API calls. `fetch` is the standard JavaScript `fetch` (provided by 
+[node-fetch](https://www.npmjs.com/package/node-fetch#common-usage)). `fetchJSON` performs a fetch 
+and then reads its reponse to JSON
+
+Example: 
+
+```
+const response = await fetch('https://api.github.com/users/github');
+const data = await response.json();
+```
+
+which is the same as
+
+```
+const data = await fetchJSON('https://api.github.com/users/github');
+```
+
+## Return directives
+
+Your code can with its return value give directives to the current page. 
+Valid return values are:
+
+#### `notify`
+
+Send a pop-up notification indicating success to the user
+
+Example: `return { notify: "Order completed!" }`
+
+#### `error`
+
+Send a pop-up notification indicating error to the user.
+
+Example: `return { error: "Invalid command!" }`
+
+If this is triggered by an Edit view with the SubmitWithAjax, 
+halt navigation and stay on page. This can be used for complex validation logic, 
+When added as an Insert or Update trigger. If you delete the inserted row, You 
+may also need to clear the returned id in order to allow the user to continue editing.
+
+Example:
+
+```
+if(amount>cash_on_hand) {
+  await table.deleteRows({ id })
+  return { 
+    error: "Invalid order!",
+    id: null 
+  }
+}
+```
+
+#### `goto`
+
+Navigate to a different URL: 
+
+Example: `return { goto: "https://saltcorn.com" }`
+
+Add `target: "_blank"` to open in a new tab.
+
+#### `reload_page`
+
+Request a page reload with the existing URL.
+
+Example: `return { reload_page: true }`
+
+#### `popup`
+
+Open a URL in a popup: 
+
+Example: 
+
+```
+return { popup: `/view/Orders?id=${parent}` }
+```
+
+#### `download`
+
+Download a file to the client browser.
+
+Example:
+
+```
+return { download: {
+    mimetype: "text/csv",
+    blob: filecontents
+  }
+}
+```
+
+#### `set_fields`
+
+If triggered from an edit view, set fields dynamically in the form. The 
+value should be an object with keys that are field variable names.
+
+Example:
+
+```
+return { set_fields: {
+    zidentifier: `${name.toUpperCase()}-${id}`
+  }
+}
+```
+
+#### `eval_js`
+
+Execute JavaScript in the browser.
+
+Example: `return { eval_js: 'alert("Hello world")' }`

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.0-beta.7",
+  "version": "0.9.0-beta.9",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.9.0-beta.7",
-    "@saltcorn/builder": "0.9.0-beta.7",
-    "@saltcorn/data": "0.9.0-beta.7",
-    "@saltcorn/admin-models": "0.9.0-beta.7",
-    "@saltcorn/filemanager": "0.9.0-beta.7",
-    "@saltcorn/markup": "0.9.0-beta.7",
-    "@saltcorn/sbadmin2": "0.9.0-beta.7",
+    "@saltcorn/base-plugin": "0.9.0-beta.9",
+    "@saltcorn/builder": "0.9.0-beta.9",
+    "@saltcorn/data": "0.9.0-beta.9",
+    "@saltcorn/admin-models": "0.9.0-beta.9",
+    "@saltcorn/filemanager": "0.9.0-beta.9",
+    "@saltcorn/markup": "0.9.0-beta.9",
+    "@saltcorn/sbadmin2": "0.9.0-beta.9",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -690,10 +690,13 @@ function initialize_page() {
       setTimeout(() => {
         codes.forEach((el) => {
           //console.log($(el).attr("mode"), el);
+          if ($(el).hasClass("codemirror-enabled")) return;
+
           const cm = CodeMirror.fromTextArea(el, {
             lineNumbers: true,
             mode: $(el).attr("mode"),
           });
+          $(el).addClass("codemirror-enabled");
           cm.on(
             "change",
             $.debounce(() => {
@@ -1061,6 +1064,7 @@ function common_done(res, viewname, isWeb = true) {
       if (
         prev.origin === next.origin &&
         prev.pathname === next.pathname &&
+        prev.searchParams.toString() === next.searchParams.toString() &&
         next.hash !== prev.hash
       )
         location.reload();

package/routes/actions.js

@@ -174,8 +174,9 @@ const triggerForm = async (req, trigger) => {
         attributes: {
           explainers: {
             Often: req.__("Every 5 minutes"),
-            Never:
-              req.__("Not scheduled but can be run as an action from a button click"),
+            Never: req.__(
+              "Not scheduled but can be run as an action from a button click"
+            ),
           },
         },
       },
@@ -201,6 +202,7 @@ const triggerForm = async (req, trigger) => {
         label: req.__("Action"),
         type: "String",
         required: true,
+        help: { topic: "Actions" },
         attributes: {
           calcOptions: ["when_trigger", action_options],
         },
@@ -402,7 +404,7 @@ router.get(
       form.values = trigger.configuration;
       const events = Trigger.when_options;
       const actions = Trigger.find({
-        when_trigger: {or: ["API call", "Never"]},
+        when_trigger: { or: ["API call", "Never"] },
       });
       const tables = (await Table.find({})).map((t) => ({
         name: t.name,

package/routes/sync.js

@@ -312,7 +312,10 @@ router.get(
         const translatedIds = JSON.parse(
           await fs.readFile(path.join(syncDir, "translated-ids.json"))
         );
-        res.json({ finished: true, translatedIds });
+        const uniqueConflicts = JSON.parse(
+          await fs.readFile(path.join(syncDir, "unique-conflicts.json"))
+        );
+        res.json({ finished: true, translatedIds, uniqueConflicts });
       } else if (entries.indexOf("error.json") >= 0) {
         const error = JSON.parse(
           await fs.readFile(path.join(syncDir, "error.json"))

package/tests/sync.test.js

@@ -13,6 +13,7 @@ const db = require("@saltcorn/data/db");
 const { sleep } = require("@saltcorn/data/tests/mocks");
 
 const Table = require("@saltcorn/data/models/table");
+const TableConstraint = require("@saltcorn/data/models/table_constraints");
 const Field = require("@saltcorn/data/models/field");
 const User = require("@saltcorn/data/models/user");
 
@@ -349,8 +350,9 @@ describe("Upload changes", () => {
         .get(`/sync/upload_finished?dir_name=${encodeURIComponent(syncDir)}`)
         .set("Cookie", loginCookie);
       expect(resp.status).toBe(200);
-      const { finished, translatedIds, error } = resp._body;
-      if (finished) return translatedIds ? translatedIds : error;
+      const { finished, translatedIds, uniqueConflicts, error } = resp._body;
+      if (finished)
+        return translatedIds ? { translatedIds, uniqueConflicts } : error;
       await sleep(1000);
     }
     return null;
@@ -401,7 +403,7 @@ describe("Upload changes", () => {
       });
       expect(resp.status).toBe(200);
       const { syncDir } = resp._body;
-      const translatedIds = await getResult(app, loginCookie, syncDir);
+      const { translatedIds } = await getResult(app, loginCookie, syncDir);
       await cleanSyncDir(app, loginCookie, syncDir);
       expect(translatedIds).toBeDefined();
       expect(translatedIds).toEqual({
@@ -414,6 +416,89 @@ describe("Upload changes", () => {
       });
     });
 
+    it("handles inserts with TableConstraint conflicts", async () => {
+      const books = Table.findOne({ name: "books" });
+      const oldCount = await books.countRows();
+      // unique constraint for author + pages
+      const constraint = await TableConstraint.create({
+        table: books,
+        type: "Unique",
+        configuration: {
+          fields: ["author", "pages"],
+        },
+      });
+
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getAdminLoginCookie();
+      const resp = await doUpload(app, loginCookie, new Date().valueOf(), {
+        books: {
+          inserts: [
+            {
+              author: "Herman Melville",
+              pages: 967,
+              publisher: 1,
+            },
+            {
+              author: "Leo Tolstoy",
+              pages: "728",
+              publisher: 2,
+            },
+          ],
+        },
+      });
+
+      expect(resp.status).toBe(200);
+      const { syncDir } = resp._body;
+      const { uniqueConflicts } = await getResult(app, loginCookie, syncDir);
+      await constraint.delete();
+      await cleanSyncDir(app, loginCookie, syncDir);
+      expect(uniqueConflicts).toBeDefined();
+      expect(uniqueConflicts).toEqual({
+        books: [
+          { id: 1, author: "Herman Melville", pages: 967, publisher: null },
+          { id: 2, author: "Leo Tolstoy", pages: 728, publisher: 1 },
+        ],
+      });
+      const newCount = await books.countRows();
+      expect(newCount).toBe(oldCount);
+    });
+
+    it("denies updates with TableConstraint conflicts", async () => {
+      const books = Table.findOne({ name: "books" });
+      const oldCount = await books.countRows();
+      // unique constraint for author + pages
+      const constraint = await TableConstraint.create({
+        table: books,
+        type: "Unique",
+        configuration: {
+          fields: ["author", "pages"],
+        },
+      });
+
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getAdminLoginCookie();
+      const resp = await doUpload(app, loginCookie, new Date().valueOf(), {
+        books: {
+          updates: [
+            {
+              id: 2,
+              author: "Herman Melville",
+              pages: 967,
+            },
+          ],
+        },
+      });
+      expect(resp.status).toBe(200);
+      const { syncDir } = resp._body;
+      const error = await getResult(app, loginCookie, syncDir);
+      await constraint.delete();
+      await cleanSyncDir(app, loginCookie, syncDir);
+      expect(error).toBeDefined();
+      expect(error).toEqual({
+        message: "Duplicate value for unique field: author_pages",
+      });
+    });
+
     it("update with translation", async () => {
       const app = await getApp({ disableCsrf: true });
       const loginCookie = await getAdminLoginCookie();
@@ -438,7 +523,7 @@ describe("Upload changes", () => {
       });
       expect(resp.status).toBe(200);
       const { syncDir } = resp._body;
-      const translatedIds = await getResult(app, loginCookie, syncDir);
+      const { translatedIds } = await getResult(app, loginCookie, syncDir);
       await cleanSyncDir(app, loginCookie, syncDir);
       expect(translatedIds).toBeDefined();
       expect(translatedIds).toEqual({
@@ -476,7 +561,7 @@ describe("Upload changes", () => {
       });
       expect(resp.status).toBe(200);
       const { syncDir } = resp._body;
-      const translatedIds = await getResult(app, loginCookie, syncDir);
+      const { translatedIds } = await getResult(app, loginCookie, syncDir);
       await cleanSyncDir(app, loginCookie, syncDir);
       expect(translatedIds).toBeDefined();
       const afterDelete = await books.getRows();
@@ -520,7 +605,7 @@ describe("Upload changes", () => {
       });
       expect(resp.status).toBe(200);
       const { syncDir } = resp._body;
-      const translatedIds = await getResult(app, loginCookie, syncDir);
+      const { translatedIds } = await getResult(app, loginCookie, syncDir);
       await cleanSyncDir(app, loginCookie, syncDir);
       expect(translatedIds).toBeDefined();
       const afterDelete = await books.getRows();