not-node 6.3.66 → 6.3.69

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.3.66",
+	"version": "6.3.69",
 	"description": "node complimentary part for client side notFramework.",
 	"main": "index.js",
 	"scripts": {

package/src/common.js

@@ -248,6 +248,20 @@ module.exports.tryFileAsync = async (filePath) => {
     }
 };
 
+/**
+ *  Asynchronously check dir existence and if it's really a file
+ * @param {string}     dirPath  full path to file
+ * @return {Promise<boolean>}            true if path exists and it's a file
+ **/
+module.exports.tryDirAsync = async (dirPath) => {
+    try {
+        const stat = await fs.promises.lstat(dirPath);
+        return stat && stat.isDirectory();
+    } catch (e) {
+        return false;
+    }
+};
+
 /**
  *  Trying to parse input to JSON or returns def
  * @param {string}     input  string to be parsed

package/src/generic/logic.js

@@ -349,7 +349,12 @@ module.exports = ({
                 if (!itm) {
                     throw new DBExceptionDocumentIsNotFound();
                 }
-                if (shouldOwn && !isOwner(itm, identity?.uid)) {
+                if (
+                    shouldOwn &&
+                    identity &&
+                    identity?.uid &&
+                    !isOwner(itm, identity.uid)
+                ) {
                     throw new DBExceptionDocumentIsNotOwnerByActiveUser({
                         params: {
                             targetId,
@@ -447,12 +452,12 @@ module.exports = ({
             shouldOwn = false,
         }) {
             logDebugAction(action, identity);
-            const { skip, size, sorter, filter, search } = query;
+            let { skip, size, sorter, filter, search } = query;
             let populate = await getPopulate(action, {
                 identity,
             });
             if (shouldOwn) {
-                notFilter.filter.modifyRules(filter, {
+                filter = notFilter.filter.modifyRules(filter, {
                     [ownerFieldName]: identity?.uid,
                 });
             }
@@ -489,12 +494,12 @@ module.exports = ({
 
         static async _list({ query, identity, action, shouldOwn = false }) {
             logDebugAction(action, identity);
-            const { skip, size, sorter, filter } = query;
+            let { skip, size, sorter, filter } = query;
             let populate = await getPopulate(action, {
                 identity,
             });
             if (shouldOwn) {
-                notFilter.filter.modifyRules(filter, {
+                filter = notFilter.filter.modifyRules(filter, {
                     [ownerFieldName]: identity?.uid,
                 });
             }
@@ -529,14 +534,14 @@ module.exports = ({
 
         static async _count({ query, action, identity, shouldOwn = false }) {
             logDebugAction(action, identity);
-            const { filter, search } = query;
+            let { filter, search } = query;
             if (shouldOwn) {
-                notFilter.filter.modifyRules(filter, {
+                filter = notFilter.filter.modifyRules(filter, {
                     [ownerFieldName]: identity?.uid,
                 });
             }
             if (search) {
-                notFilter.filter.modifyRules(search, filter);
+                filter = notFilter.filter.modifyRules(search, filter);
             }
             const result = await getModel().countWithFilter(search || filter);
             LogAction(action, identity, { shouldOwn });

package/src/init/lib/env.js

@@ -1,4 +1,5 @@
 const log = require("not-log")(module, "not-node//init//env");
+const { tryDirAsync } = require("../../common");
 
 module.exports = class InitENV {
     static getProxyPort(config) {
@@ -20,8 +21,21 @@ module.exports = class InitENV {
         return name;
     }
 
+    static async checkPaths(master, config) {
+        const paths = config.get("path");
+        if (paths) {
+            for (let pathName of Object.keys(paths)) {
+                if (await tryDirAsync(paths[pathName])) {
+                    log?.error(
+                        `config path (${pathName}) not exists: ${paths[pathName]}`
+                    );
+                }
+            }
+        }
+    }
+
     async run({ config, options, master, emit }) {
-        log.info("Setting up server environment variables...");
+        log?.info("Setting up server environment variables...");
         await emit("env.pre", { config, options, master });
         config.set(
             "staticPath",
@@ -41,9 +55,10 @@ module.exports = class InitENV {
         config.set("npmPath", options.pathToNPM);
         config.set("fullServerName", InitENV.getFullServerName(config));
         if (config.get("path:ws")) {
-            log.log("wsPath", master.getAbsolutePath(config.get("path:ws")));
+            log?.log("wsPath", master.getAbsolutePath(config.get("path:ws")));
             config.set("wsPath", master.getAbsolutePath(config.get("path:ws")));
         }
+        await InitENV.checkPaths(master, config);
         await emit("env.post", { config, options, master });
     }
 };

package/src/logic/actions.before/ownage/ownage.js

@@ -18,13 +18,13 @@ module.exports = class OwnageBeforeAction {
         if (identity.uid) {
             //if searching, counting, listing and so on
             //adding condition of ownership by this excat user
-            const { filter, search } = query;
+            let { filter, search } = query;
             if (filter) {
-                notFilter.filter.modifyRules(filter, {
+                filter = notFilter.filter.modifyRules(filter, {
                     [OwnageBeforeAction.ownerFieldName]: identity?.uid,
                 });
                 if (search) {
-                    notFilter.filter.modifyRules(search, filter);
+                    search = notFilter.filter.modifyRules(search, filter);
                 }
             }
             args.defaultQueryById = {

package/tmpl/files/module.server/layers/controllers/common/crud.ejs

@@ -1,6 +1,8 @@
 import { MODULE_NAME } from "../../const.js";
 import Validators from "../common/validators.js";
 import { Frame } from "not-bulma";
+import CRUDActionList from "not-bulma/src/frame/crud/actions/list";
+
 const { notCRUD } = Frame;
 
 const MODEL_NAME = "<%- ModelName %>";
@@ -53,27 +55,7 @@ class nc<%- ModelName %>Common extends notCRUD {
                     path: ":_id",
                     title: "Действия",
                     type: "button",
-                    preprocessor: (value) => {
-                        return [
-                            {
-                                action: ()=>this.goDetails(value),
-                                title: "Подробнее",
-                                size: "small",
-                            },
-                            {
-                                action: ()=>this.goUpdate(value),
-                                title: "Изменить",
-                                size: "small",
-                            },
-                            {
-                                action: ()=>this.goDelete(value),
-                                color: "danger",
-                                title: "Удалить",
-                                size: "small",
-                                style: "outlined",
-                            },
-                        ];
-                    },
+                    preprocessor: (value) => CRUDActionList.createActionsButtons(this, value),
                 },
             ],
         });
@@ -82,8 +64,8 @@ class nc<%- ModelName %>Common extends notCRUD {
         return this;
     }
 
-    createDefault() {        
-        let newRecord = this.getModel({            
+    createDefault() {
+        let newRecord = this.getModel({
             <% for (let fieldName of fields){ %><%- fieldName %>: undefined,
             <% } %>
         });