@saltcorn/server 0.8.6-beta.1 → 0.8.6-beta.11

package/tests/tenant.test.js

@@ -27,7 +27,7 @@ describe("tenant routes", () => {
   if (!db.isSQLite) {
     it("shows create form", async () => {
       db.enable_multi_tenant();
-      await getState().setConfig("role_to_create_tenant", "10");
+      await getState().setConfig("role_to_create_tenant", "100");
 
       const app = await getApp({ disableCsrf: true });
       await request(app).get("/tenant/create").expect(toInclude("subdomain"));
@@ -43,7 +43,7 @@ describe("tenant routes", () => {
 
     it("creates tenant with capital letter", async () => {
       db.enable_multi_tenant();
-      await getState().setConfig("role_to_create_tenant", "10");
+      await getState().setConfig("role_to_create_tenant", "100");
 
       const app = await getApp({ disableCsrf: true });
       await request(app)
@@ -55,7 +55,7 @@ describe("tenant routes", () => {
 
     it("rejects existing tenant", async () => {
       db.enable_multi_tenant();
-      await getState().setConfig("role_to_create_tenant", "10");
+      await getState().setConfig("role_to_create_tenant", "100");
       const app = await getApp({ disableCsrf: true });
       await request(app)
         .post("/tenant/create")

package/tests/view.test.js

@@ -99,7 +99,7 @@ describe("view with routes", () => {
       name: "aviewwithroutes",
       viewtemplate: "ViewWithRoutes",
       configuration: {},
-      min_role: 8,
+      min_role: 80,
     });
   });
   it("should redirect if not auth", async () => {
@@ -177,3 +177,130 @@ describe("render view with slug", () => {
       .expect(toInclude(`Herman Melville`));
   });
 });
+
+describe("inbound relations", () => {
+  it("view with inbound relation", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/view/show_user_with_blog_posts_feed?id=1")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toInclude("Content of post CPost C"));
+
+    await request(app)
+      .get("/view/show_user_with_blog_posts_feed?id=2")
+      .set("Cookie", loginCookie)
+      .expect(toNotInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toNotInclude("Content of post CPost C"));
+
+    await request(app)
+      .get("/view/show_user_with_blog_posts_feed?id=3")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toInclude("Content of post CPost C"));
+  });
+
+  it("view without inbound relation", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/view/show_user_with_independent_feed?id=1")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toInclude("Content of post CPost C"));
+    await request(app)
+      .get("/view/show_user_with_independent_feed?id=2")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toInclude("Content of post CPost C"));
+    await request(app)
+      .get("/view/show_user_with_independent_feed?id=3")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toInclude("Content of post CPost C"));
+  });
+
+  it("inbound relation from query", async () => {
+    const queryObj = {
+      relation:
+        ".users.user_interested_in_topic$user.topic.blog_in_topic$topic.post",
+      srcId: 1,
+    };
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+
+    await request(app)
+      .get(
+        `/view/blog_posts_feed?_inbound_relation_path_=${encodeURIComponent(
+          JSON.stringify(queryObj)
+        )}`
+      )
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toInclude("Content of post CPost C"));
+
+    queryObj.srcId = 2;
+    await request(app)
+      .get(
+        `/view/blog_posts_feed?_inbound_relation_path_=${encodeURIComponent(
+          JSON.stringify(queryObj)
+        )}`
+      )
+      .set("Cookie", loginCookie)
+      .expect(toNotInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toNotInclude("Content of post CPost C"));
+
+    queryObj.srcId = 3;
+    await request(app)
+      .get(
+        `/view/blog_posts_feed?_inbound_relation_path_=${encodeURIComponent(
+          JSON.stringify(queryObj)
+        )}`
+      )
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toInclude("Content of post CPost C"));
+  });
+
+  it("inbound relation with levels from query", async () => {
+    const queryObj = {
+      relation:
+        ".users.user_interested_in_topic$user.topic.inbound_inbound$topic.bp_inbound.post",
+      srcId: 1,
+    };
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get(
+        `/view/blog_posts_feed?_inbound_relation_path_=${encodeURIComponent(
+          JSON.stringify(queryObj)
+        )}`
+      )
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Content of post APost A"))
+      .expect(toNotInclude("Content of post BPost B"))
+      .expect(toInclude("Content of post CPost C"));
+
+    queryObj.srcId = 2;
+    await request(app)
+      .get(
+        `/view/blog_posts_feed?_inbound_relation_path_=${encodeURIComponent(
+          JSON.stringify(queryObj)
+        )}`
+      )
+      .set("Cookie", loginCookie)
+      .expect(toNotInclude("Content of post APost A"))
+      .expect(toNotInclude("Content of post BPost B"))
+      .expect(toNotInclude("Content of post CPost C"));
+  });
+});

package/tests/viewedit.test.js

@@ -53,7 +53,7 @@ describe("viewedit edit endpoint", () => {
       .send("table_name=books")
       .send("id=" + v.id)
       .send("name=authorlist")
-      .send("min_role=10")
+      .send("min_role=100")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/viewedit/config/authorlist"));
   });
@@ -95,7 +95,7 @@ describe("viewedit new List", () => {
       .send("viewtemplate=List")
       .send("table_name=books")
       .send("name=mybooklist")
-      .send("min_role=8")
+      .send("min_role=80")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/viewedit/config/mybooklist"));
     //expect(res.text.includes("View configuration")).toBe(true);
@@ -212,7 +212,7 @@ describe("viewedit new List with one field", () => {
       .send("viewtemplate=List")
       .send("table_name=books")
       .send("name=mybooklist1")
-      .send("min_role=8")
+      .send("min_role=80")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/viewedit/config/mybooklist1"));
     //expect(res.text.includes("View configuration")).toBe(true);
@@ -334,7 +334,7 @@ describe("viewedit new Show", () => {
       .send("viewtemplate=Show")
       .send("table_name=books")
       .send("name=mybook")
-      .send("min_role=8")
+      .send("min_role=80")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/viewedit/config/mybook"));
     //expect(res.text.includes("View configuration")).toBe(true);

package/wrapper.js

@@ -27,7 +27,7 @@ const getFlashes = (req) =>
 const get_menu = (req) => {
   const isAuth = req.user && req.user.id;
   const state = getState();
-  const role = (req.user || {}).role_id || 10;
+  const role = (req.user || {}).role_id || 100;
 
   const allow_signup = state.getConfig("allow_signup");
   const notification_in_menu = state.getConfig("notification_in_menu");
@@ -192,6 +192,7 @@ const get_headers = (req, version_tag, description, extras = []) => {
     { css: `/static_assets/${version_tag}/saltcorn.css` },
     { script: `/static_assets/${version_tag}/saltcorn-common.js` },
     { script: `/static_assets/${version_tag}/saltcorn.js` },
+    { script: `/static_assets/${version_tag}/dayjs.min.js` },
   ];
   let from_cfg = [];
   if (state.getConfig("page_custom_css", ""))
@@ -245,7 +246,7 @@ module.exports = (version_tag) =>
    * @param next
    */
   function (req, res, next) {
-    const role = (req.user || {}).role_id || 10;
+    const role = (req.user || {}).role_id || 100;
 
     res.sendAuthWrap = function (title, form, authLinks, ...html) {
       const state = getState();