not-node 6.3.90 → 6.3.92

package/package.json

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

package/src/generic/form.authorizedAction.js

@@ -5,15 +5,14 @@ const Form = require("../form/form");
 const STANDART_FIELDS = [["identity", "not-node//identity"]];
 
 module.exports = ({ MODULE_NAME, MODEL_NAME, actionName, FIELDS = [] }) => {
-    const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
     return class extends Form {
         constructor(params) {
             super({
                 ...params,
                 MODULE_NAME,
                 MODEL_NAME,
+                actionName,
                 FIELDS: [...STANDART_FIELDS, ...FIELDS],
-                FORM_NAME,
             });
         }
 

package/src/generic/form.getByID.js

@@ -8,10 +8,9 @@ const FIELDS = [
 ];
 
 module.exports = ({ MODULE_NAME, MODEL_NAME, actionName = "getByID" }) => {
-    const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
     return class extends Form {
         constructor(params) {
-            super({ ...params, MODULE_NAME, MODEL_NAME, FIELDS, FORM_NAME });
+            super({ ...params, MODULE_NAME, MODEL_NAME,actionName, FIELDS });
         }
 
         async extract(req) {

package/src/generic/form.getById.js

@@ -8,10 +8,9 @@ const FIELDS = [
 ];
 
 module.exports = ({ MODULE_NAME, MODEL_NAME, actionName = "getById" }) => {
-    const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
     return class extends Form {
         constructor(params) {
-            super({ ...params, MODULE_NAME, MODEL_NAME, FIELDS, FORM_NAME });
+            super({ ...params, MODULE_NAME, MODEL_NAME, actionName, FIELDS });
         }
 
         async extract(req) {

package/src/generic/form.list.js

@@ -18,14 +18,12 @@ const FIELDS = [
  * @return {Form}   form class definition
  */
 const FactoryFormList = ({ MODULE_NAME, MODEL_NAME, actionName = "list" }) => {
-    const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
-
     return class extends Form {
         constructor(params) {
             super({
                 ...params,
                 FIELDS,
-                FORM_NAME,
+                actionName,
                 MODULE_NAME,
                 MODEL_NAME,
             });

package/src/generic/form.listAndCount.js

@@ -22,16 +22,16 @@ const FactoryFormListAndCount = ({
     MODEL_NAME,
     actionName = "listAndCount",
 }) => {
-    const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
+
 
     return class extends Form {
         constructor(params) {
             super({
                 ...params,
                 FIELDS,
-                FORM_NAME,
                 MODULE_NAME,
                 MODEL_NAME,
+                actionName
             });
         }
 

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

@@ -12,9 +12,21 @@ const LABELS = {
     single: `${MODULE_NAME}:${MODEL_NAME}_label_single`,
 };
 
+Object.freeze(LABELS);
+
 class nc<%- ModelName %>Common extends notCRUD {
-    static MODULE_NAME = MODULE_NAME;
-    static MODEL_NAME = MODEL_NAME;
+    static get MODULE_NAME(){
+        return MODULE_NAME;
+    }
+
+    static get MODEL_NAME(){
+        return MODEL_NAME;
+    }
+
+    static get LABELS(){
+        return LABELS;
+    }
+
     constructor(app, params) {
         super(app, `${MODULE_NAME}.${MODEL_NAME}`);
         this.setModuleName(MODULE_NAME);
@@ -71,6 +83,11 @@ class nc<%- ModelName %>Common extends notCRUD {
         });
         return newRecord;
     }
+
+    static getMenu(){
+        return notCRUD.getCommonMenu(nc<%- ModelName %>Common);
+    }
+
 }
 
 export default nc<%- ModelName %>Common;

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

@@ -6,6 +6,8 @@ class nc<%- ModelName %> extends nc<%- ModelName %>Common {
     super(app, params);
     return this;
   }
+
+
 }
 
 export default nc<%- ModelName %>;

package/tmpl/files/module.server/layers/controllers/role/index.ejs

@@ -20,8 +20,17 @@ let manifest = {
             items: [],
         },
         side: {
-            sections: [],
-            items: [],
+            sections: [
+                {
+                    id: '<%- moduleName %>',
+                    title: '<%- moduleName %>:menu_section_title',
+                }
+            ],
+            items: [
+            <% for (let {ModelName} of entities){ %>
+            ...nc<%- ModelName %>.getMenu(),
+            <% } %>
+            ],
         },
     },
 };

package/tmpl/files/module.server/layers/forms/create.ejs

@@ -4,7 +4,7 @@ const Form = require("not-node").Form;
 const { MODULE_NAME } = require("../const");
 const MODEL_NAME = '<%- ModelName %>';
 const actionName = 'create';
-const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
+
 //form
 const FIELDS = [
 	["identity", "not-node//identity"],
@@ -16,7 +16,7 @@ const FIELDS = [
 **/
 class <%- ModelName %>CreateForm extends Form {
 	constructor({ app }) {
-		super({MODULE_NAME, MODEL_NAME,actionName, FIELDS, FORM_NAME, app });
+		super({MODULE_NAME, MODEL_NAME,actionName, FIELDS,  app });
 	}
 }
 

package/tmpl/files/module.server/layers/forms/update.ejs

@@ -2,9 +2,7 @@ const Form = require("not-node").Form;
 
 const { MODULE_NAME } = require("../const");
 const MODEL_NAME = '<%- ModelName %>';
-
 const actionName = 'update';
-const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
 
 const FIELDS = [
 	["targetId", { required: true }, "not-node//objectId"],
@@ -14,7 +12,7 @@ const FIELDS = [
 
 class <%- ModelName %>UpdateForm extends Form {
 	constructor({ app }) {
-		super({ FIELDS, FORM_NAME, app });
+		super({MODULE_NAME,MODEL_NAME, actionName,  FIELDS, app });
 	}
 }