@saltcorn/server 0.7.1-beta.3 → 0.7.2-beta.10

package/tests/viewedit.test.js

@@ -8,6 +8,7 @@ const {
   toInclude,
   toNotInclude,
   resetToFixtures,
+  succeedJsonWith,
 } = require("../auth/testhelp");
 const db = require("@saltcorn/data/db");
 const View = require("@saltcorn/data/models/view");
@@ -371,3 +372,96 @@ describe("viewedit new Show", () => {
       .expect(toRedirect("/viewedit"));
   });
 });
+describe("Library", () => {
+  it("should save new from builder", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .post("/library/savefrombuilder/")
+      .set("Cookie", loginCookie)
+      .send({
+        layout: {
+          columns: [],
+          layout: {
+            type: "card",
+            contents: {
+              above: [
+                null,
+                {
+                  besides: [
+                    {
+                      above: [
+                        null,
+                        {
+                          type: "blank",
+                          contents: "Hello world",
+                          block: false,
+                          inline: false,
+                          textStyle: "",
+                          isFormula: {},
+                          labelFor: "",
+                          style: {},
+                          font: "",
+                        },
+                      ],
+                    },
+                    {
+                      above: [
+                        null,
+                        {
+                          type: "blank",
+                          contents: "Bye bye",
+                          block: false,
+                          inline: false,
+                          textStyle: "",
+                          isFormula: {},
+                          labelFor: "",
+                          style: {},
+                          font: "",
+                        },
+                      ],
+                    },
+                  ],
+                  breakpoints: ["", ""],
+                  style: {},
+                  widths: [6, 6],
+                },
+              ],
+            },
+            title: "header",
+            style: {},
+          },
+        },
+        icon: "far fa-angry",
+        name: "ShinyCard",
+      })
+      .set("Content-Type", "application/json")
+      .set("Accept", "application/json")
+      .expect(succeedJsonWith(() => true));
+  });
+  it("shows library with item", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/library/list")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("ShinyCard"));
+  });
+  it("deletes in library", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post("/library/delete/1")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/library/list"));
+  });
+  it("shows empty library", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/library/list")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Library"))
+      .expect(toNotInclude("ShinyCard"))
+  });
+});

package/wrapper.js

@@ -3,18 +3,28 @@
  * @module wrapper
  */
 const { getState } = require("@saltcorn/data/db/state");
-const db = require("@saltcorn/data/db");
-const { ul, li, h3, div, small } = require("@saltcorn/markup/tags");
+//const db = require("@saltcorn/data/db");
+const { h3, div, small } = require("@saltcorn/markup/tags");
 const { renderForm, link } = require("@saltcorn/markup");
 const renderLayout = require("@saltcorn/markup/layout");
-
+/**
+ * get flashes
+ * @param req
+ * @returns {T[]}
+ */
 const getFlashes = (req) =>
-  ["error", "success", "danger", "warning"]
+  ["error", "success", "danger", "warning","information"]
     .map((type) => {
       return { type, msg: req.flash(type) };
     })
     .filter((a) => a.msg && a.msg.length && a.msg.length > 0);
-
+/**
+ * Get extra menu
+ * @param role
+ * @param state
+ * @param req
+ * @returns {*}
+ */
 const get_extra_menu = (role, state, req) => {
   let cfg = getState().getConfig("unrolled_menu_items", []);
   if (!cfg || cfg.length === 0) {
@@ -43,7 +53,11 @@ const get_extra_menu = (role, state, req) => {
       }));
   return transform(cfg);
 };
-
+/**
+ * Get menu
+ * @param req
+ * @returns {(false|{section: *, items}|{section: *, items: [{link: string, icon: string, label: *},{link: string, icon: string, label: *},{link: string, icon: string, label: *},{icon: string, subitems: [{link: string, icon: string, label: *},{link: string, icon: string, label: *},{link: string, icon: string, altlinks: string[], label: *},{link: string, altlinks: string[], icon: string, label: *},{link: string, icon: string, label: *},null], label: *}]}|{section: *, isUser: boolean, items: ([{icon: string, subitems: [{label: *},{icon: string, link: string, label: *},{link: string, icon: string, label: *}], label: *, isUser: boolean}]|*[])})[]}
+ */
 const get_menu = (req) => {
   const isAuth = req.user && req.user.id;
   const state = getState();
@@ -82,8 +96,13 @@ const get_menu = (req) => {
           ? [{ link: "/auth/login", label: req.__("Login") }]
           : []),
       ];
-  const schema = db.getTenantSchema();
+  // const schema = db.getTenantSchema();
+  // Admin role id (todo move to common constants)
   const isAdmin = role === 1;
+    /*
+     * Admin Menu items
+     *
+     */
   const adminItems = [
     { link: "/table", icon: "fas fa-table", label: req.__("Tables") },
     { link: "/viewedit", icon: "far fa-eye", label: req.__("Views") },
@@ -126,7 +145,8 @@ const get_menu = (req) => {
     },
   ];
 
-  const menu = [
+  // return menu
+  return [
     extra_menu.length > 0 && {
       section: req.__("Menu"),
       items: extra_menu,
@@ -141,9 +161,16 @@ const get_menu = (req) => {
       items: authItems,
     },
   ].filter((s) => s);
-  return menu;
-};
 
+};
+/**
+ * Get Headers
+ * @param req
+ * @param version_tag
+ * @param description
+ * @param extras
+ * @returns {*[]}
+ */
 const get_headers = (req, version_tag, description, extras = []) => {
   const state = getState();
   const favicon = state.getConfig("favicon_id", null);
@@ -167,6 +194,7 @@ const get_headers = (req, version_tag, description, extras = []) => {
       headerTag: `<script>var _sc_globalCsrf = "${req.csrfToken()}"; var _sc_version_tag = "${version_tag}";</script>`,
     },
     { css: `/static_assets/${version_tag}/saltcorn.css` },
+    { script: `/static_assets/${version_tag}/saltcorn-common.js` },
     { script: `/static_assets/${version_tag}/saltcorn.js` },
   ];
   let from_cfg = [];
@@ -187,6 +215,11 @@ const get_headers = (req, version_tag, description, extras = []) => {
     ...from_cfg,
   ];
 };
+/**
+ * Get brand
+ * @param state
+ * @returns {{name: *, logo: (string|undefined)}}
+ */
 const get_brand = (state) => {
   const logo_id = state.getConfig("site_logo_id", "");
   return {
@@ -195,6 +228,12 @@ const get_brand = (state) => {
   };
 };
 module.exports = (version_tag) =>
+    /**
+     *
+     * @param req
+     * @param res
+     * @param next
+     */
   function (req, res, next) {
     const role = (req.user || {}).role_id || 10;
 
@@ -219,7 +258,7 @@ module.exports = (version_tag) =>
           })
         );
       } else {
-        var links = [];
+        let links = [];
         if (authLinks.login)
           links.push(
             link(authLinks.login, req.__("Already have an account? Login"))
@@ -300,7 +339,12 @@ module.exports = (version_tag) =>
     };
     next();
   };
-
+/**
+ * Default render to HTML
+ * @param s
+ * @param role
+ * @returns {string|string|*}
+ */
 const defaultRenderToHtml = (s, role) =>
   typeof s === "string"
     ? s