not-node 5.1.12 → 5.1.15

package/package.json

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

package/src/bootstrap/route.js

@@ -79,12 +79,20 @@ module.exports = ({
         }
     };
 
+    const getForm = (actionName) => {
+        const form = getApp().getForm(
+            [MODULE_NAME, `${MODEL_NAME}.${actionName}`].join("//")
+        );
+        if (form) {
+            return form;
+        }
+        return getApp().getForm([MODULE_NAME, actionName].join("//"));
+    };
+
     const beforeDecorator = async (req, res, next) => {
         const actionName = req.notRouteData.actionName;
         const trimmedActionName = actionName.replace("_", "");
-        const FormValidator = getApp().getForm(
-            [MODULE_NAME, trimmedActionName].join("//")
-        );
+        const FormValidator = getForm(trimmedActionName);
         if (FormValidator) {
             const prepared = await FormValidator.run(req, res, next);
             checkAccessRules(trimmedActionName, prepared);

package/src/core/locales/en.json

@@ -63,5 +63,6 @@
   "crud_update_action_waiting": "Updating record...",
   "crud_delete_action_waiting": "Deleting record...",
   "add_label": "Add",
-  "select_from_list_label": "Select from list..."
+  "select_from_list_label": "Select from list...",
+  "field_actions_label": "Actions"
 }

package/src/core/locales/ru.json

@@ -62,6 +62,8 @@
   "crud_update_action_waiting": "Обновление записи...",
   "crud_delete_action_waiting": "Удаление записи...",
   "add_label": "Добавить",
-  "select_from_list_label": "Выберите из списка..."
+  "select_from_list_label": "Выберите из списка...",
+  "field_actions_label": "Действия"
+
 
 }

package/src/generic/form.listAndCount.js

@@ -0,0 +1,52 @@
+const Form = require("../form/form");
+const { firstLetterToUpper } = require("../common");
+const { getIP } = require("../auth");
+const notFilter = require("not-filter");
+const getApp = require("../getApp");
+
+const FIELDS = [
+    ["query", `not-filter//_filterQuery`],
+    ["activeUserId", { required: true }, "not-node//objectId"],
+    ["activeUser", "not-node//requiredObject"],
+    ["ip", "not-node//ip"],
+];
+
+module.exports = ({ MODULE_NAME, MODEL_NAME, actionName }) => {
+    const FORM_NAME = `${MODULE_NAME}:${MODEL_NAME}:${firstLetterToUpper(
+        actionName
+    )}Form`;
+    return class extends Form {
+        constructor({ app }) {
+            super({ FIELDS, FORM_NAME, app });
+        }
+
+        extract(req) {
+            const thisSchema = getApp().getModelSchema(
+                `${MODULE_NAME}//${MODEL_NAME}`
+            );
+            const { skip, size } = 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 (!req.user.isRoot() && !req.user.isAdmin()) {
+                filter = notFilter.filter.modifyRules(filter, {
+                    owner: req.user._id,
+                });
+            }
+
+            return {
+                query: {
+                    skip,
+                    size,
+                    sorter,
+                    filter,
+                    search,
+                },
+                activeUser: req.user,
+                activeUserId: req.user._id,
+                ip: getIP(req),
+            };
+        }
+    };
+};

package/src/generic/index.js

@@ -1,3 +1,4 @@
 module.exports.GenericLogic = require("./logic.js");
 module.exports.GenericRoute = require("./route.js");
 module.exports.GenericGetByIdForm = require("./form.getById.js");
+module.exports.GenericListAndCountForm = require("./form.listAndCount.js");