@saltcorn/server 0.7.4 → 0.8.0-beta.1

package/markup/admin.js

@@ -122,35 +122,35 @@ const send_settings_page = ({
   const pillCard = no_nav_pills
     ? []
     : [
-        {
-          type: "card",
-          class: "mt-0",
-          contents: div(
-            { class: "d-flex" },
-            ul(
-              { class: "nav nav-pills plugin-section" },
-              sub_sections.map(({ text, href }) =>
-                li(
-                  { class: "nav-item" },
-                  a(
-                    {
-                      href,
-                      class: ["nav-link", active_sub === text && "active"],
-                    },
-                    req.__(text)
-                  )
+      {
+        type: "card",
+        class: "mt-0",
+        contents: div(
+          { class: "d-flex" },
+          ul(
+            { class: "nav nav-pills plugin-section" },
+            sub_sections.map(({ text, href }) =>
+              li(
+                { class: "nav-item" },
+                a(
+                  {
+                    href,
+                    class: ["nav-link", active_sub === text && "active"],
+                  },
+                  req.__(text)
                 )
               )
             )
-          ),
-        },
-      ];
+          )
+        ),
+      },
+    ];
   // headers
   const title = headers
     ? {
-        title: req.__(active_sub),
-        headers,
-      }
+      title: req.__(active_sub),
+      headers,
+    }
     : req.__(active_sub);
   res.sendWrap(title, {
     above: [
@@ -167,10 +167,10 @@ const send_settings_page = ({
           },
           ...(sub2_page
             ? [
-                {
-                  text: sub2_page,
-                },
-              ]
+              {
+                text: sub2_page,
+              },
+            ]
             : []),
         ],
       },
@@ -199,9 +199,9 @@ const send_infoarch_page = (args) => {
       { text: "Languages", href: "/site-structure/localizer" },
       ...(tenant_list
         ? [
-            { text: "Tenants", href: "/tenant/list" },
-            { text: "Multitenancy", href: "/tenant/settings" },
-          ]
+          { text: "Tenants", href: "/tenant/list" },
+          { text: "Multitenancy", href: "/tenant/settings" },
+        ]
         : []),
       { text: "Tags", href: "/tag" },
       { text: "Diagram", href: "/diagram" },
@@ -223,8 +223,11 @@ const send_users_page = (args) => {
     sub_sections: [
       { text: "Users", href: "/useradmin" },
       { text: "Roles", href: "/roleadmin" },
-      { text: "Settings", href: "/useradmin/settings" },
+      { text: "Login and Signup", href: "/useradmin/settings" },
+      { text: "Table access", href: "/useradmin/table-access" },
       ...(isRoot ? [{ text: "SSL", href: "/useradmin/ssl" }] : []),
+      { text: "HTTP", href: "/useradmin/http" },
+      { text: "Permissions", href: "/useradmin/permissions" },
     ],
     ...args,
   });
@@ -281,7 +284,7 @@ const send_events_page = (args) => {
  * @returns {void}
  */
 const send_admin_page = (args) => {
-  const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+  //const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
   return send_settings_page({
     main_section: "About application",
     main_section_href: "/admin",
@@ -291,6 +294,7 @@ const send_admin_page = (args) => {
       { text: "Email", href: "/admin/email" },
       { text: "System", href: "/admin/system" },
       { text: "Mobile app", href: "/admin/build-mobile-app" },
+      { text: "Development", href: "/admin/dev" },
     ],
     ...args,
   });
@@ -339,8 +343,8 @@ const flash_restart = (req) => {
   req.flash(
     "warning",
     req.__(`Restart required for changes to take effect.`) +
-      " " +
-      a({ href: "/admin/system" }, req.__("Restart here"))
+    " " +
+    a({ href: "/admin/system" }, req.__("Restart here"))
   );
 };
 
@@ -393,16 +397,16 @@ const config_fields_form = async ({
         isView || isRole || isTenant
           ? "String"
           : configTypes[name].input_type
-          ? undefined
-          : configTypes[name].type,
+            ? undefined
+            : configTypes[name].type,
       input_type: configTypes[name].input_type,
       attributes: isView
         ? await viewAttributes(name)
         : isRole
-        ? roleAttribs
-        : isTenant
-        ? await getTenants()
-        : configTypes[name].attributes,
+          ? roleAttribs
+          : isTenant
+            ? await getTenants()
+            : configTypes[name].attributes,
     });
   }
   const form = new Form({
@@ -434,7 +438,7 @@ const save_config_from_form = async (form) => {
 
 /**
  * Get Base Domain
- * @returns {string} base domain
+ * @returns {string|null} base domain
  */
 const getBaseDomain = () => {
   const base_url = getState().getConfig("base_url");
@@ -455,7 +459,7 @@ const hostname_matches_baseurl = (req, domain) => domain === req.hostname;
 
 /**
  * @param {string} domain
- * @returns {string[]}
+ * @returns {string[]|boolean}
  */
 const is_hsts_tld = (domain) => {
   if (!domain) return false;

package/markup/forms.js

@@ -50,7 +50,7 @@ const editRoleForm = ({ url, current_role, roles, req }) =>
  * @param {object} req 
  * @returns {Form}
  */
-const fileUploadForm = (req) =>
+const fileUploadForm = (req, folder) =>
   form(
     {
       action: "/files/upload",
@@ -61,11 +61,12 @@ const fileUploadForm = (req) =>
     label(req.__("Upload file ")),
     input({
       name: "file",
-      class: "form-control-file",
+      class: "form-control ms-1 w-unset d-inline",
       type: "file",
       onchange: "form.submit()",
       multiple: true,
-    })
+    }),
+    folder && input({ type: "hidden", name: "folder", value: folder })
   );
 
 /**

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.7.4",
+  "version": "0.8.0-beta.1",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.7.4",
-    "@saltcorn/builder": "0.7.4",
-    "@saltcorn/data": "0.7.4",
-    "@saltcorn/admin-models": "0.7.4",
-    "@saltcorn/markup": "0.7.4",
-    "@saltcorn/sbadmin2": "0.7.4",
+    "@saltcorn/base-plugin": "0.8.0-beta.1",
+    "@saltcorn/builder": "0.8.0-beta.1",
+    "@saltcorn/data": "0.8.0-beta.1",
+    "@saltcorn/admin-models": "0.8.0-beta.1",
+    "@saltcorn/filemanager": "0.8.0-beta.1",
+    "@saltcorn/markup": "0.8.0-beta.1",
+    "@saltcorn/sbadmin2": "0.8.0-beta.1",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",

package/public/blockly.js

@@ -1,3 +1,4 @@
+// todo replace var with let / const
 function activate_blockly({ events, actions, tables }) {
   // https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#arpfmx
 
@@ -21,8 +22,7 @@ function activate_blockly({ events, actions, tables }) {
       Blockly.JavaScript.ORDER_ATOMIC
     );
     // TODO: Assemble JavaScript into code variable.
-    var code = `console.log(${value_string});\n`;
-    return code;
+    return `console.log(${value_string});\n`;
   };
 
   Blockly.Blocks["emit_event"] = {
@@ -58,9 +58,7 @@ function activate_blockly({ events, actions, tables }) {
       Blockly.JavaScript.ORDER_ATOMIC
     );
     // TODO: Assemble JavaScript into code variable.
-    var code = `emitEvent("${dropdown_event}", ${value_channel}, ${value_payload});\n`;
-
-    return code;
+    return `emitEvent("${dropdown_event}", ${value_channel}, ${value_payload});\n`;
   };
 
   Blockly.Blocks["row"] = {
@@ -75,7 +73,7 @@ function activate_blockly({ events, actions, tables }) {
 
   Blockly.JavaScript["row"] = function (block) {
     // TODO: Assemble JavaScript into code variable.
-    var code = "row";
+    const code = "row";
     // TODO: Change ORDER_NONE to the correct strength.
     return [code, Blockly.JavaScript.ORDER_NONE];
   };
@@ -91,7 +89,7 @@ function activate_blockly({ events, actions, tables }) {
   };
   Blockly.JavaScript["current_channel"] = function (block) {
     // TODO: Assemble JavaScript into code variable.
-    var code = "channel";
+    const code = "channel";
     // TODO: Change ORDER_NONE to the correct strength.
     return [code, Blockly.JavaScript.ORDER_NONE];
   };
@@ -106,7 +104,7 @@ function activate_blockly({ events, actions, tables }) {
   };
   Blockly.JavaScript["empty"] = function (block) {
     // TODO: Assemble JavaScript into code variable.
-    var code = "{}";
+    const code = "{}";
     // TODO: Change ORDER_NONE to the correct strength.
     return [code, Blockly.JavaScript.ORDER_NONE];
   };
@@ -170,8 +168,7 @@ function activate_blockly({ events, actions, tables }) {
       Blockly.JavaScript.ORDER_ATOMIC
     );
     // TODO: Assemble JavaScript into code variable.
-    var code = `${value_row}.${text_key}=${value_value};\n`;
-    return code;
+    return `${value_row}.${text_key}=${value_value};\n`;
   };
   Blockly.Blocks["insert_table"] = {
     init: function () {
@@ -196,8 +193,7 @@ function activate_blockly({ events, actions, tables }) {
       Blockly.JavaScript.ORDER_ATOMIC
     );
     // TODO: Assemble JavaScript into code variable.
-    var code = `await Table.findOne({name: '${dropdown_table}'})\n           .tryInsertRow(${value_row});\n`;
-    return code;
+    return `await Table.findOne({name: '${dropdown_table}'})\n           .tryInsertRow(${value_row});\n`;
   };
   Blockly.Blocks["query_table"] = {
     init: function () {
@@ -281,8 +277,7 @@ function activate_blockly({ events, actions, tables }) {
       Blockly.JavaScript.ORDER_ATOMIC
     );
     // TODO: Assemble JavaScript into code variable.
-    var code = `await Table.findOne({name: '${dropdown_table}'})\n           .deleteRows({id: ${value_id}});\n`;
-    return code;
+    return `await Table.findOne({name: '${dropdown_table}'})\n           .deleteRows({id: ${value_id}});\n`;
   };
 
   Blockly.Blocks["delete_table_where"] = {
@@ -309,9 +304,7 @@ function activate_blockly({ events, actions, tables }) {
       Blockly.JavaScript.ORDER_ATOMIC
     );
     // TODO: Assemble JavaScript into code variable.
-    var code = `await Table.findOne({name: '${dropdown_table}'})\n           .deleteRows(${value_where});\n`;
-
-    return code;
+    return `await Table.findOne({name: '${dropdown_table}'})\n           .deleteRows(${value_where});\n`;
   };
   Blockly.Blocks["update_table"] = {
     init: function () {
@@ -342,8 +335,7 @@ function activate_blockly({ events, actions, tables }) {
       Blockly.JavaScript.ORDER_ATOMIC
     );
     // TODO: Assemble JavaScript into code variable.
-    var code = `await Table.findOne({name: '${dropdown_table}'})\n           .tryUpdateRow(${value_row}, ${value_id});\n`;
-    return code;
+    return `await Table.findOne({name: '${dropdown_table}'})\n           .tryUpdateRow(${value_row}, ${value_id});\n`;
   };
 
   Blockly.Blocks["sleep"] = {
@@ -363,10 +355,9 @@ function activate_blockly({ events, actions, tables }) {
     },
   };
   Blockly.JavaScript["sleep"] = function (block) {
-    var number_sleep_ms = block.getFieldValue("SLEEP_MS");
+    const number_sleep_ms = block.getFieldValue("SLEEP_MS");
     // TODO: Assemble JavaScript into code variable.
-    var code = `await sleep(${number_sleep_ms});\n`;
-    return code;
+    return `await sleep(${number_sleep_ms});\n`;
   };
 
   Blockly.Blocks["http_request"] = {
@@ -439,7 +430,7 @@ function activate_blockly({ events, actions, tables }) {
       "POPUP",
       Blockly.JavaScript.ORDER_ATOMIC
     );
-    var checkbox_reload = block.getFieldValue("RELOAD") == "TRUE";
+    var checkbox_reload = block.getFieldValue("RELOAD") === "TRUE";
     var value_notify = Blockly.JavaScript.valueToCode(
       block,
       "NOTIFY",
@@ -451,8 +442,7 @@ function activate_blockly({ events, actions, tables }) {
     if (value_popup) s += `popup: ${value_popup},`;
     if (value_notify) s += `notify: ${value_notify},`;
     if (checkbox_reload) s += `reload_page: true,`;
-    var code = `return {${s}};\n`;
-    return code;
+    return `return {${s}};\n`;
   };
   Blockly.Blocks["push_to_list"] = {
     init: function () {
@@ -480,8 +470,7 @@ function activate_blockly({ events, actions, tables }) {
       Blockly.JavaScript.ORDER_ATOMIC
     );
     // TODO: Assemble JavaScript into code variable.
-    var code = `${value_list}.push(${value_name});\n`;
-    return code;
+    return `${value_list}.push(${value_name});\n`;
   };
   if (actions.length > 0) {
     Blockly.Blocks["action"] = {
@@ -501,12 +490,11 @@ function activate_blockly({ events, actions, tables }) {
     };
 
     Blockly.JavaScript["action"] = function (block) {
-      var dropdown_name = block.getFieldValue("NAME");
+      const dropdown_name = block.getFieldValue("NAME");
       // TODO: Assemble JavaScript into code variable.
-      var code = dropdown_name.includes(" ")
+      return dropdown_name.includes(" ")
         ? `Actions['${dropdown_name}']();\n`
         : `Actions.${dropdown_name}();\n`;
-      return code;
     };
   }
   Blockly.Blocks["unit_row"] = {
@@ -577,7 +565,7 @@ function activate_blockly({ events, actions, tables }) {
     $("#blocklyForm").submit();
   });
   function myUpdateFunction(event) {
-    var code = Blockly.JavaScript.workspaceToCode(workspace);
+    const code = Blockly.JavaScript.workspaceToCode(workspace);
     $("#blockly_js_output").html(code);
   }
   workspace.addChangeListener(myUpdateFunction);