@saltcorn/builder 0.9.4-beta.1 → 0.9.4-beta.11

package/src/components/storage.js

@@ -200,6 +200,7 @@ const layoutToNodes = (layout, query, actions, parent = "ROOT") => {
           minHeight={segment.minHeight}
           height={segment.height}
           width={segment.width}
+          click_action={segment.click_action}
           url={segment.url}
           hoverColor={segment.hoverColor}
           minHeightUnit={segment.minHeightUnit || "px"}
@@ -253,10 +254,12 @@ const layoutToNodes = (layout, query, actions, parent = "ROOT") => {
         <Tabs
           key={ix}
           titles={segment.titles}
+          showif={segment.showif}
           ntabs={segment.ntabs}
           independent={segment.independent}
           startClosed={segment.startClosed}
           deeplink={segment.deeplink}
+          acc_init_opens={segment.acc_init_opens}
           disable_inactive={segment.disable_inactive}
           serverRendered={segment.serverRendered}
           tabId={segment.tabId}
@@ -457,6 +460,7 @@ const craftToSaltcorn = (nodes, startFrom = "ROOT") => {
           gradStartColor: node.props.gradStartColor,
           gradEndColor: node.props.gradEndColor,
           gradDirection: node.props.gradDirection,
+          click_action: node.props.click_action,
           rotate: node.props.rotate,
           style: node.props.style,
         };
@@ -529,10 +533,12 @@ const craftToSaltcorn = (nodes, startFrom = "ROOT") => {
         type: "tabs",
         contents,
         titles: node.props.titles,
+        showif: node.props.showif,
         tabsStyle: node.props.tabsStyle,
         field: node.props.field,
         independent: node.props.independent,
         startClosed: node.props.startClosed,
+        acc_init_opens: node.props.acc_init_opens,
         deeplink: node.props.deeplink,
         disable_inactive: node.props.disable_inactive,
         serverRendered: node.props.serverRendered,

package/tests/relations_finder.test.js

@@ -9,7 +9,16 @@ import {
   withKeyFromLayerTwo,
   withKeyFromLayerThree,
   withSimplePostTopicrelation,
-} from "./test_data";
+} from "@saltcorn/common-code/tests/test_data";
+
+import {
+  expectedOne,
+  expectedTwo,
+  expectedThree,
+  expectedFour,
+  expectedFive,
+  expectedSix,
+} from "@saltcorn/common-code/tests/expected_relations";
 import { ViewSettings } from "../src/components/elements/View";
 import { ViewLinkSettings } from "../src/components/elements/ViewLink";
 
@@ -60,43 +69,47 @@ const doTest = (
   renderer.create(<ViewSettings></ViewSettings>);
   expect(spy).toBeCalled();
   const vCallArgs = spy.mock.calls[0];
-  expect(vCallArgs[0].paths).toBeDefined();
-  expect(vCallArgs[0].paths).toHaveLength(expected.length);
-  expect(vCallArgs[0].paths).toEqual(expect.arrayContaining(expected));
+  expect(vCallArgs[0].relations).toBeDefined();
+  expect(vCallArgs[0].relations).toHaveLength(expected.length);
+  expect(vCallArgs[0].relations.map((rel) => rel.relationString)).toEqual(
+    expect.arrayContaining(expected)
+  );
 
   renderer.create(<ViewLinkSettings></ViewLinkSettings>);
   expect(spy.mock.calls).toHaveLength(4);
   const vLinkcallArgs = spy.mock.calls[2];
-  expect(vLinkcallArgs[0].paths).toBeDefined();
-  expect(vLinkcallArgs[0].paths).toHaveLength(expected.length);
-  expect(vLinkcallArgs[0].paths).toEqual(expect.arrayContaining(expected));
+  expect(vLinkcallArgs[0].relations).toBeDefined();
+  expect(vLinkcallArgs[0].relations).toHaveLength(expected.length);
+  expect(vLinkcallArgs[0].relations.map((rel) => rel.relationString)).toEqual(
+    expect.arrayContaining(expected)
+  );
 };
 
 describe("relations tests", () => {
-  beforeAll(() => {
-    // inject relationHelpers (normally it's a script tag)
-    global.relationHelpers = {
-      ...require("../../server/public/relation_helpers.js"),
-    };
-  });
   beforeEach(() => {
     jest.restoreAllMocks();
   });
   describe("single relations", () => {
-    it("parent relations", async () => {
-      const { tables, views } = fixturesData();
+    it("parent relations", () => {
+      const { tables, views } = fixturesData(__dirname);
       const expected = [".fan_club.artist"];
       doTest(tables, views, "fan_club", "show_artist", expected);
     });
 
-    it("one to one relations", async () => {
-      const { tables, views } = fixturesData();
+    it("parent relations with layers", () => {
+      const { tables, views } = fixturesData(__dirname);
+      const expected = [".patients.favbook.publisher"];
+      doTest(tables, views, "patients", "show_publisher", expected);
+    });
+
+    it("one to one relations", () => {
+      const { tables, views } = fixturesData(__dirname);
       const expected = [".covers.albums$cover"];
       doTest(tables, views, "covers", "show_album", expected);
     });
 
-    it("employee department relation", async () => {
-      const { tables, views } = fixturesData();
+    it("employee department relation", () => {
+      const { tables, views } = fixturesData(__dirname);
       const expected = [".employee", ".employee.department.manager"];
       doTest(tables, views, "employee", "show_manager", expected);
     });
@@ -104,85 +117,37 @@ describe("relations tests", () => {
 
   describe("multi relations", () => {
     describe("inbound relations", () => {
-      const expectedOne = [
-        ".",
-        ".users.user_interested_in_topic$user.topic.blog_in_topic$topic",
-        ".users.user_interested_in_topic$user.topic.inbound_inbound$topic.bp_inbound.post.blog_in_topic$post",
-        ".users.messages$user.room.participants$room.user.user_interested_in_topic$user.topic.blog_in_topic$topic",
-      ];
-      it("single keys to source and rel table", async () => {
-        const { tables, views } = fixturesData();
+      it("single keys to source and rel table", () => {
+        const { tables, views } = fixturesData(__dirname);
         doTest(tables, views, "users", "blog_in_topic_feed", expectedOne);
       });
 
-      const expectedTwo = [
-        ...expectedOne,
-        ".users.user_interested_in_topic$another_user.topic.blog_in_topic$topic",
-        ".users.user_interested_in_topic$another_user.topic.inbound_inbound$topic.bp_inbound.post.blog_in_topic$post",
-        ".users.messages$user.room.participants$room.user.user_interested_in_topic$another_user.topic.blog_in_topic$topic",
-      ];
-      it("multiple keys to source and single key to rel table", async () => {
-        const { tables, views } = withAnotherUserField();
+      it("multiple keys to source and single key to rel table", () => {
+        const { tables, views } = withAnotherUserField(__dirname);
         doTest(tables, views, "users", "blog_in_topic_feed", expectedTwo);
       });
 
-      const expectedThree = [
-        ...expectedTwo,
-        ".users.user_interested_in_topic$user.topic.blog_in_topic$second_topic",
-        ".users.user_interested_in_topic$another_user.topic.blog_in_topic$second_topic",
-        ".users.messages$user.room.participants$room.user.user_interested_in_topic$user.topic.blog_in_topic$second_topic",
-        ".users.messages$user.room.participants$room.user.user_interested_in_topic$another_user.topic.blog_in_topic$second_topic",
-      ];
-      it("multiple keys to source and rel table", async () => {
-        const { tables, views } = withSecondTopicField();
+      it("multiple keys to source and rel table", () => {
+        const { tables, views } = withSecondTopicField(__dirname);
         doTest(tables, views, "users", "blog_in_topic_feed", expectedThree);
       });
 
-      const expectedFour = [
-        ...expectedThree,
-        ".users.user_interested_in_topic$user.another_user.second_inbound$user.topic.blog_in_topic$topic",
-        ".users.user_interested_in_topic$user.another_user.second_inbound$user.topic.blog_in_topic$second_topic",
-        ".users.second_inbound$user.topic.blog_in_topic$topic",
-        ".users.second_inbound$user.topic.blog_in_topic$second_topic",
-        ".users.second_inbound$user.topic.inbound_inbound$topic.bp_inbound.post.blog_in_topic$post",
-        ".users.messages$user.room.participants$room.user.second_inbound$user.topic.blog_in_topic$topic",
-        ".users.messages$user.room.participants$room.user.second_inbound$user.topic.blog_in_topic$second_topic",
-      ];
-      it("multiple inbound tables", async () => {
-        const { tables, views } = withMultipleInbounds();
+      it("multiple inbound tables", () => {
+        const { tables, views } = withMultipleInbounds(__dirname);
         doTest(tables, views, "users", "blog_in_topic_feed", expectedFour);
       });
 
-      const expectedFive = [
-        ...expectedFour,
-        ".users.user_interested_in_topic$user.topic.inbound_inbound$topic.post_from_layer_two.blog_in_topic$post",
-        ".users.user_interested_in_topic$another_user.topic.inbound_inbound$topic.post_from_layer_two.blog_in_topic$post",
-        ".users.second_inbound$user.topic.inbound_inbound$topic.post_from_layer_two.blog_in_topic$post",
-        ".users.user_interested_in_topic$user.topic.blog_in_topic$topic.post.inbound_inbound$post_from_layer_two.topic.blog_in_topic$second_topic",
-        ".users.user_interested_in_topic$user.another_user.second_inbound$user.topic.inbound_inbound$topic.post_from_layer_two.blog_in_topic$post",
-        ".users.user_interested_in_topic$another_user.topic.blog_in_topic$topic.post.inbound_inbound$post_from_layer_two.topic.blog_in_topic$second_topic",
-        ".users.second_inbound$user.topic.blog_in_topic$topic.post.inbound_inbound$post_from_layer_two.topic.blog_in_topic$second_topic",
-      ];
-      it("key to source from layer two", async () => {
-        const { tables, views } = withKeyFromLayerTwo();
+      it("key to source from layer two", () => {
+        const { tables, views } = withKeyFromLayerTwo(__dirname);
         doTest(tables, views, "users", "blog_in_topic_feed", expectedFive);
       });
 
-      const expectedSix = [
-        ...expectedFive,
-        ".users.user_interested_in_topic$user.topic.inbound_level_three$topic.inbound_level_two.bp_inbound.post.blog_in_topic$post",
-        ".users.user_interested_in_topic$user.topic.inbound_level_three$topic.inbound_level_two.post_from_layer_two.blog_in_topic$post",
-        ".users.user_interested_in_topic$another_user.topic.inbound_level_three$topic.inbound_level_two.bp_inbound.post.blog_in_topic$post",
-        ".users.user_interested_in_topic$another_user.topic.inbound_level_three$topic.inbound_level_two.post_from_layer_two.blog_in_topic$post",
-        ".users.second_inbound$user.topic.inbound_level_three$topic.inbound_level_two.bp_inbound.post.blog_in_topic$post",
-        ".users.second_inbound$user.topic.inbound_level_three$topic.inbound_level_two.post_from_layer_two.blog_in_topic$post",
-      ];
-      it("three levels inbound", async () => {
-        const { tables, views } = withKeyFromLayerThree();
+      it("three levels inbound", () => {
+        const { tables, views } = withKeyFromLayerThree(__dirname);
         doTest(tables, views, "users", "blog_in_topic_feed", expectedSix);
       });
 
-      it("simple post topic relation", async () => {
+      it("simple post topic relation", () => {
         const expected = [
           ".",
           ".users.favsimpletopic.simple_posts$topic",
@@ -190,20 +155,20 @@ describe("relations tests", () => {
           ".users.messages$user.room.participants$room.user.favsimpletopic.simple_posts$topic",
           ".users.messages$user.room.participants$room.user.favsimpletopic.simple_post_inbound$topic.post",
         ];
-        const { tables, views } = withSimplePostTopicrelation();
+        const { tables, views } = withSimplePostTopicrelation(__dirname);
         doTest(tables, views, "users", "simple_posts_list", expected);
       });
     });
 
     describe("many to many relations", () => {
-      it("artist_plays_on_album", async () => {
-        const { tables, views } = fixturesData();
+      it("artist_plays_on_album", () => {
+        const { tables, views } = fixturesData(__dirname);
         const expected = [".", ".artists.artist_plays_on_album$artist.album"];
         doTest(tables, views, "artists", "albums_feed", expected);
       });
 
-      it("tracks on album", async () => {
-        const { tables, views } = fixturesData();
+      it("tracks on album", () => {
+        const { tables, views } = fixturesData(__dirname);
         const expected = [
           ".",
           ".artists.artist_plays_on_album$artist.album.tracks_on_album$album",
@@ -211,8 +176,8 @@ describe("relations tests", () => {
         doTest(tables, views, "artists", "tracks_on_album_feed", expected);
       });
 
-      it("show pressing_job with embedded fan club feed", async () => {
-        const { tables, views } = fixturesData();
+      it("show pressing_job with embedded fan club feed", () => {
+        const { tables, views } = fixturesData(__dirname);
         const expected = [
           ".",
           ".pressing_job.album.artist_plays_on_album$album.artist.fan_club$artist",
@@ -222,8 +187,8 @@ describe("relations tests", () => {
     });
 
     describe("excluded viewtemplates", () => {
-      it("excluded viewtemplates", async () => {
-        const { tables, views } = fixturesData();
+      it("excluded viewtemplates", () => {
+        const { tables, views } = fixturesData(__dirname);
         const expected = [];
         const excluded = ["Room"];
         doTest(tables, views, "participants", "rooms_view", expected, excluded);
@@ -232,7 +197,7 @@ describe("relations tests", () => {
 
     describe("open legacy relations", () => {
       it("ChildList", async () => {
-        const { tables, views } = fixturesData();
+        const { tables, views } = fixturesData(__dirname);
         const expected = [".", ".books.discusses_books$book"];
         doTest(
           tables,
@@ -247,7 +212,7 @@ describe("relations tests", () => {
       });
 
       it("Independent", async () => {
-        const { tables, views } = fixturesData();
+        const { tables, views } = fixturesData(__dirname);
         const expected = [
           ".",
           ".blog_posts",
@@ -266,7 +231,7 @@ describe("relations tests", () => {
       });
 
       it("Own", async () => {
-        const { tables, views } = fixturesData();
+        const { tables, views } = fixturesData(__dirname);
         const expected = [".books"];
         doTest(
           tables,

package/tests/test_data.js

@@ -1,163 +0,0 @@
-import { readFileSync } from "fs";
-import { join } from "path";
-
-export const fixturesData = () => {
-  const { tables, views } = JSON.parse(
-    readFileSync(join(__dirname, "schema_data.json"))
-  );
-  return { tables, views };
-};
-
-let nextFieldId = 3000;
-
-export const withAnotherUserField = () => {
-  const { tables, views } = JSON.parse(JSON.stringify(fixturesData()));
-  const uiit = tables.find(({ name }) => name === "user_interested_in_topic");
-  uiit.foreign_keys.push({
-    name: "another_user",
-    id: nextFieldId++,
-    table_id: uiit.id,
-    reftable_name: "users",
-    is_unique: false,
-  });
-  return { tables, views };
-};
-
-export const withSecondTopicField = () => {
-  const { tables, views } = JSON.parse(JSON.stringify(withAnotherUserField()));
-  const bit = tables.find(({ name }) => name === "blog_in_topic");
-  bit.foreign_keys.push({
-    name: "second_topic",
-    id: nextFieldId++,
-    table_id: bit.id,
-    reftable_name: "topics",
-    is_unique: false,
-  });
-  return { tables, views };
-};
-
-export const withMultipleInbounds = () => {
-  const { tables, views } = JSON.parse(JSON.stringify(withSecondTopicField()));
-  const nextTableId = tables.length + 1;
-  tables.push({
-    name: "second_inbound",
-    id: nextTableId,
-    foreign_keys: [
-      {
-        name: "topic",
-        id: nextFieldId++,
-        table_id: nextTableId,
-        reftable_name: "topics",
-        is_unique: false,
-      },
-      {
-        name: "user",
-        id: nextFieldId++,
-        table_id: nextTableId,
-        reftable_name: "users",
-        is_unique: false,
-      },
-    ],
-  });
-  return { tables, views };
-};
-
-export const withKeyFromLayerTwo = () => {
-  const { tables, views } = JSON.parse(JSON.stringify(withMultipleInbounds()));
-  const inboundInbound = tables.find(({ name }) => name === "inbound_inbound");
-  inboundInbound.foreign_keys.push({
-    name: "post_from_layer_two",
-    id: nextFieldId++,
-    table_id: inboundInbound.id,
-    reftable_name: "blog_posts",
-    is_unique: false,
-  });
-  return { tables, views };
-};
-
-export const withKeyFromLayerThree = () => {
-  const { tables, views } = JSON.parse(JSON.stringify(withKeyFromLayerTwo()));
-  const nextTableId = tables.length + 1;
-  tables.push({
-    name: "inbound_level_three",
-    id: nextTableId,
-    foreign_keys: [
-      {
-        name: "inbound_level_two",
-        id: nextFieldId++,
-        table_id: nextTableId,
-        reftable_name: "inbound_inbound",
-        is_unique: false,
-      },
-      {
-        name: "topic",
-        id: nextFieldId++,
-        table_id: nextTableId,
-        reftable_name: "topics",
-        is_unique: false,
-      },
-    ],
-  });
-  return { tables, views };
-};
-
-export const withSimplePostTopicrelation = () => {
-  const { tables, views } = JSON.parse(JSON.stringify(fixturesData()));
-  const simpleTopicsId = tables.length + 1;
-  const simplePostsId = simpleTopicsId + 1;
-  const simplePostInboundId = simplePostsId + 1;
-  tables.push({
-    name: "simple_posts",
-    id: simplePostsId,
-    foreign_keys: [
-      {
-        name: "topic",
-        table_id: simplePostsId,
-        id: nextFieldId++,
-        reftable_name: "simple_topics",
-        is_unique: false,
-      },
-    ],
-  });
-  tables.push({
-    name: "simple_topics",
-    id: simpleTopicsId,
-    foreign_keys: [],
-  });
-  tables.push({
-    name: "simple_post_inbound",
-    id: simplePostInboundId,
-    foreign_keys: [
-      {
-        name: "post",
-        table_id: simplePostInboundId,
-        id: nextFieldId++,
-        reftable_name: "simple_posts",
-        is_unique: false,
-      },
-      {
-        name: "topic",
-        table_id: simplePostInboundId,
-        id: nextFieldId++,
-        reftable_name: "simple_topics",
-        is_unique: false,
-      },
-    ],
-  });
-  const users = tables.find(({ name }) => name === "users");
-  users.foreign_keys.push({
-    name: "favsimpletopic",
-    table_id: users.id,
-    id: nextFieldId++,
-    reftable_name: "simple_topics",
-    is_unique: false,
-  });
-
-  views.push({
-    name: "simple_posts_list",
-    table_id: simplePostsId,
-    display_type: "NO_ROW_LIMIT",
-  });
-
-  return { tables, views };
-};