not-node 6.5.10 → 6.5.12

package/package.json

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

package/src/form/env_extractors/query.js

@@ -54,6 +54,7 @@ module.exports = (form, req) => {
         Object.values(ACTION_DATA_TYPES).forEach((dataType) => {
             if (
                 routeActionDataTypes.includes(dataType) &&
+                // @ts-ignore
                 Object.hasOwn(extractors, dataType)
             ) {
                 extractors[dataType](result, req, thisSchema, formOptions);

package/src/generic/manifest.js

@@ -21,8 +21,28 @@ const extraActionsBuilder = (
 const POST_FIX_RECORD_ID = "/:record[_id]";
 const POST_FIX_ACTION_NAME = "/:actionName";
 
-module.exports = (MODULE_NAME, modelName, FIELDS = [], actions = {}) => {
-    return {
+const DEFAULT_LOCALES_STRINGS = ["title", "description"];
+
+const getFormActionLocaleString = (
+    strName,
+    MODULE_NAME,
+    modelName,
+    actionName,
+    commonFormTitles = false
+) => {
+    return commonFormTitles
+        ? `not-node:crud_${actionName}_action_form_${strName}`
+        : `${MODULE_NAME}:${modelName}_form_${actionName}_${strName}`;
+};
+
+module.exports = (
+    MODULE_NAME,
+    modelName,
+    FIELDS = [],
+    actions = {},
+    options = {}
+) => {
+    const resultManifest = {
         model: modelName,
         url: "/api/:modelName",
         fields: FIELDS,
@@ -37,7 +57,6 @@ module.exports = (MODULE_NAME, modelName, FIELDS = [], actions = {}) => {
                         root: true,
                     },
                 ],
-                title: `${MODULE_NAME}:${modelName}_form_create_title`,
             },
             update: {
                 method: "POST",
@@ -53,7 +72,6 @@ module.exports = (MODULE_NAME, modelName, FIELDS = [], actions = {}) => {
                         root: true,
                     },
                 ],
-                title: `${MODULE_NAME}:${modelName}_form_update_title`,
             },
             list: {
                 method: "GET",
@@ -108,7 +126,6 @@ module.exports = (MODULE_NAME, modelName, FIELDS = [], actions = {}) => {
                         root: true,
                     },
                 ],
-                title: `${MODULE_NAME}:${modelName}_form_details_title`,
             },
             getByID: {
                 method: "GET",
@@ -146,4 +163,22 @@ module.exports = (MODULE_NAME, modelName, FIELDS = [], actions = {}) => {
             ...extraActionsBuilder(MODULE_NAME, modelName, FIELDS, actions),
         },
     };
+
+    Object.keys(resultManifest.actions).forEach((actionName) => {
+        const actionData = resultManifest.actions[actionName];
+        const lst = options?.localesStrings ?? DEFAULT_LOCALES_STRINGS;
+        lst.forEach((strName) => {
+            if (!Object.hasOwn(actionData, strName)) {
+                actionData[strName] = getFormActionLocaleString(
+                    strName,
+                    MODULE_NAME,
+                    modelName,
+                    actionName,
+                    options?.commonFormTitles
+                );
+            }
+        });
+    });
+
+    return resultManifest;
 };

package/src/model/default.js

@@ -283,6 +283,14 @@ function listAllAndPopulate(populate) {
     return query.exec();
 }
 
+const getPageNumber = (skip, size) => {
+    if (skip === 0) {
+        return 0;
+    } else {
+        return Math.floor(skip / size); //
+    }
+};
+
 /**
  *	List record in collection and populates, with count of total founded records
  *	By default sorts by _id in DESC
@@ -305,11 +313,12 @@ async function listAndCount(skip, size, sorter, filter, search, populate = []) {
         ),
         countQuery = this.countWithFilter(search || filter);
     const [list, count] = await Promise.all([listQuery, countQuery]);
+
     return {
         list,
         skip,
         count,
-        page: Math.floor(skip / size) + (skip % size === 0 ? 1 : 0),
+        page: getPageNumber(skip, size),
         pages: Math.ceil(count / size),
     };
 }

package/src/types.js

@@ -1,6 +1,6 @@
 /**
  * @typedef     {object}    notAppResponse
- * @property    {string}            status      ok or error
+ * @property    {string}            status      'ok' or 'error'
  * @property    {string}            message
  * @property    {Array<string>|Object<string, Array<string>>}     [errors]
  * @property    {object}            [result]

package/test/model/default.js

@@ -907,7 +907,7 @@ module.exports = ({
                 expect(res.list).to.be.deep.equal([1, 2, 3, 4]);
                 expect(res.count).to.be.equal(24);
                 expect(res.skip).to.be.equal(skip);
-                expect(res.page).to.be.equal(2);
+                expect(res.page).to.be.equal(1);
                 expect(res.pages).to.be.equal(2);
             });
         });

package/.eslintrc.json

@@ -1,36 +0,0 @@
-{
-    "parserOptions": {
-        "requireConfigFile": false,
-        "sourceType": "module",
-        "allowImportExportEverywhere": false,
-        "ecmaFeatures": {
-            "globalReturn": false
-        },
-        "ecmaVersion": "latest"
-    },
-    "env": {
-        "es6": true,
-        "node": true,
-        "mongo": true,
-        "mocha": true
-    },
-    "extends": [
-        "eslint:recommended",
-        "plugin:node/recommended",
-        "plugin:sonarjs/recommended"
-    ],
-    "rules": {
-        "node/exports-style": ["error", "module.exports"],
-        "node/file-extension-in-import": ["error", "always"],
-        "node/prefer-global/buffer": ["error", "always"],
-        "node/prefer-global/console": ["error", "always"],
-        "node/prefer-global/process": ["error", "always"],
-        "node/prefer-global/url-search-params": ["error", "always"],
-        "node/prefer-global/url": ["error", "always"],
-        "node/no-unpublished-require": "warn",
-        "indent": ["error", 4, { "SwitchCase": 1 }],
-        "linebreak-style": ["error", "unix"],
-        "semi": ["error", "always"],
-        "no-useless-escape": [0]
-    }
-}