not-node 6.3.61 → 6.3.63

package/package.json

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

package/src/form/after_extract_transformers/addOwnerFieldToFilterIfNotRootOrAdmin.js

@@ -0,0 +1,17 @@
+const notFilter = require("not-filter");
+const notError = require("not-error/src/error.node.cjs");
+
+module.exports = (prepared /*, req*/) => {
+    if (!prepared?.identity?.root && !prepared?.identity?.admin) {
+        if (prepared.identity?.uid) {
+            prepared.filter = notFilter.filter.modifyRules(prepared.filter, {
+                owner: prepared.identity.uid,
+            });
+        } else {
+            throw new notError("User identity has no uid in it", {
+                sid: prepared.identity?.sid,
+            });
+        }
+    }
+    return prepared;
+};

package/src/form/after_extract_transformers/index.js

@@ -1,3 +1,4 @@
 module.exports = {
     addOwnerFieldsToDataIfNotRootOrAdmin: require("./addOwnerFieldsToDataIfNotRootOrAdmin.js"),
+    addOwnerFieldToFilterIfNotRootOrAdmin: require("./addOwnerFieldToFilterIfNotRootOrAdmin.js"),
 };

package/src/form/env_extractors/query.js

@@ -10,25 +10,30 @@ const getApp = require("../../getApp");
 module.exports = (form, req) => {
     const MODULE_NAME = form.getModuleName();
     const MODEL_NAME = form.getModelName(req);
+    let thisSchema;
     if (MODEL_NAME && MODULE_NAME) {
-        const thisSchema = getApp().getModelSchema(
-            `${MODULE_NAME}//${MODEL_NAME}`
+        thisSchema = getApp().getModelSchema(`${MODULE_NAME}//${MODEL_NAME}`);
+    } else {
+        getApp().log(
+            `warning: Form '${form.FORM_NAME}' for model '${MODEL_NAME}' has no MODULE_NAME`
         );
-        if (thisSchema) {
-            let skip, size;
-            const pager = notFilter.pager.process(req), //skip,size
-                sorter = notFilter.sorter.process(req, thisSchema),
-                search = notFilter.search.process(req, thisSchema);
-            let filter = notFilter.filter.process(req, thisSchema);
-            if (pager) {
-                skip = pager.skip;
-                size = pager.size;
-            }
-            return {
-                name: "query",
-                value: { skip, size, sorter, search, filter },
-            };
+        thisSchema = getApp().getModelSchema(`${MODEL_NAME}`);
+    }
+    if (thisSchema) {
+        let skip, size;
+        const pager = notFilter.pager.process(req), //skip,size
+            sorter = notFilter.sorter.process(req, thisSchema),
+            search = notFilter.search.process(req, thisSchema);
+        let filter = notFilter.filter.process(req, thisSchema);
+        if (pager) {
+            skip = pager.skip;
+            size = pager.size;
         }
+        return {
+            name: "query",
+            value: { skip, size, sorter, search, filter },
+        };
     }
+
     return undefined;
 };

package/src/form/form.js

@@ -116,6 +116,10 @@ class Form {
         this.#createRateLimiter(rate);
     }
 
+    get FORM_NAME() {
+        return this.#FORM_NAME;
+    }
+
     /**
      * Creates model name string used in logging
      * @param {string} MODULE_NAME