not-node 6.3.36 → 6.3.37

package/package.json

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

package/src/core/locales/ru.json

@@ -53,9 +53,21 @@
   "field_UUID_label": "UUID",
   "field_UUID_placeholder": "UUID",
   "crud_create_action_waiting": "Создание записи...",
+  "crud_create_action_form_title_": "Добавление",
+  "crud_create_action_form_description": "Добавить новый документ",
   "crud_read_action_waiting": "Чтение записи...",
+  "crud_read_action_form_title": "Детали",
+  "crud_read_action_form_description": "Просмотр документа",
   "crud_update_action_waiting": "Обновление записи...",
+  "crud_update_action_form_title": "Изменение",
+  "crud_update_action_form_description": "Изменение документа",
   "crud_delete_action_waiting": "Удаление записи...",
+  "crud_delete_action_form_title": "Удаление",
+  "crud_delete_action_form_description": "Удаление документа",
+  "crud_listAll_action_form_title": "Список всех",
+  "crud_listAll_action_form_description": "Список всех документов",
+  "crud_listAndCount_action_form_title": "Список",
+  "crud_listAndCount_action_form_description": "Постраничный список документов",
   "add_label": "Добавить",
   "select_from_list_label": "Выберите из списка...",
   "field_actions_label": "Действия",

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

@@ -93,3 +93,4 @@ class nc<%- ModelName %>Common extends notCRUD {
 }
 
 export default nc<%- ModelName %>Common;
+

package/tmpl/files/module.server/layers/logics.ejs

@@ -37,35 +37,8 @@ const <%- ModelName %>GenericLogic = notNode.Generic.GenericLogic({
 module.exports.thisLogicName = MODEL_NAME;
 
 class <%- ModelName %>Logic extends <%- ModelName %>GenericLogic {
-	<% if(Object.keys(actions).length){ %>
-	<% for(let actionName in actions) { %>
-	static async <%- actionName %>({ identity, data, targetId, shouldOwn }) {
-		const action = "<%- actionName %>";
-		Log.debug(
-			`${MODULE_NAME}//Logic//${MODEL_NAME}//${action}`,
-			{
-				targetId,
-				ip: identity.ip,
-				root: identity.root,
-			}
-		);
-		const results = await getModel().<%- actionName %>(			
-			targetId,
-			data,
-			identity
-		);
-		LogAction({
-			action,
-			by: identity.uid,
-			role: identity.role,
-			ip: identity.ip,
-			root: identity.root,
-			shouldOwn,
-		});
-		return results;
-	}
-	<% } %>
-	<% } %>
+	
 }
 
 module.exports[MODEL_NAME] = <%- ModelName %>Logic;
+

package/tmpl/files/module.server/layers/routes.ejs

@@ -25,26 +25,7 @@ const <%- ModelName %>GenericRoute = notNode.Generic.GenericRoute({
 });
 
 class <%- ModelName %>Route extends <%- ModelName %>GenericRoute {
-	<% if(Object.keys(actions).length){ %>
-	<% for(let actionName in actions) { %>
-	static async <%- actionName %>(
-		req, res, next, 	//standart express routes objects
-		prepared 		//extracted by `before` if form class exists
-	) {
-	<% if (layers.includes('forms') && layers.includes('logics')){ %>
-	return await getLogic().<%- actionName %>({ ...prepared });
-	<% } %>
-        
-	<% if (layers.includes('forms') && !layers.includes('logics')){ %>
-	return {...prepared};
-	<% } %>
-
-	<% if (!layers.includes('forms') && layers.includes('logics')){ %>
-	return await getLogic().<%- actionName %>();
-	<% } %>
-    }
-    <% } %>   
-    <% } %>   
+	static restrictRootAccess = true;
 }
 
 module.exports = <%- ModelName %>Route;

package/tmpl/files/module.server/layers/routes.manifest.ejs

@@ -32,21 +32,18 @@ module.exports = {
 		create: {
 			method: "put",
 			actionSignature: ACTION_SIGNATURES.CREATE,
-			title: "<%- ModuleName %>:form_title_create",
-			description: "<%- ModuleName %>:form_description_create",
+			title: "not-node:crud_create_action_form_title",
+			description: "not-node:crud_create_action_form_description",
 			rules: [
 				{
 					auth: true,
-					root: true,
-					fields: [
-						<%- fields.map((entry) => `"${entry}"`).join(',')  %>,
-						<% if (ownage){ %>"owner",<% } %>
-					],
+					role: "admin",
+					fields: [<%- fields.map((entry) => `"${entry}"`).join(',')  %>,<% if (ownage){ %>"owner",<% } %>],
 				},
 				{
 					auth: true,
 					role: ["client", "confirmed"],
-					fields: ["title"],
+					fields: [<% if (fields && Array.isArray(fields)) { %><% for(let field of fields){ %>"<%- field %>",<% } %><% } %>],
 				},
 			],
 			data: ["record"],
@@ -57,12 +54,12 @@ module.exports = {
 		get: {
 			method: "get",
 			actionSignature: ACTION_SIGNATURES.READ,
-			title: "<%- ModuleName %>:form_title_details",
-			description: "<%- ModuleName %>:form_description_details",
+			title: "not-node:crud_read_action_form_title",
+			description: "not-node:crud_read_action_form_description",
 			rules: [
 				{
 					auth: true,
-					root: true,
+					role: "admin",
 					fields: [
 						"_id",
 						<% if (increment){ %>"<%- modelName %>ID",<% } %>
@@ -89,20 +86,9 @@ module.exports = {
 		getRaw: {
 			method: "get",
 			actionSignature: ACTION_SIGNATURES.READ,
-			title: "<%- ModuleName %>:form_title_details",
-			description: "<%- ModuleName %>:form_description_details",
-			rules: [
-				{
-					auth: true,
-					root: true,
-					fields: [
-						"_id",
-						<% if (increment){ %>"<%- modelName %>ID",<% } %>
-						<%- fields.map((entry) => `"${entry}"`).join(',')  %>,
-						<% if (ownage){ %>"owner","ownerModel",<% } %>
-						<% if (dates){ %>"createdAt","updatedAt",<% } %>
-					],
-				},
+			title: "not-node:crud_read_action_form_title",
+			description: "not-node:crud_read_action_form_description",
+			rules: [				
 				{
 					auth: true,
 					role: "admin",
@@ -129,14 +115,14 @@ module.exports = {
 		<% } %>
 		<% if (Object.hasOwn(actions,'update')){ %>
 		update: {
-			title: "<%- ModuleName %>:form_title_update",
-			actionSignature: ACTION_SIGNATURES.UPDATE,
-			description: "<%- ModuleName %>:form_description_update",
+			title: "not-node:crud_update_action_form_title",
+			description: "not-node:crud_update_action_form_description",
+			actionSignature: ACTION_SIGNATURES.UPDATE,			
 			method: "post",
 			rules: [
 				{
 					auth: true,
-					root: true,
+					role: ["admin"],
 					fields: [
 						<%- fields.map((entry) => `"${entry}"`).join(',')  %>,
 						<% if (ownage){ %>"owner", "ownerModel",<% } %>
@@ -155,13 +141,13 @@ module.exports = {
 		<% if (Object.hasOwn(actions,'delete')){ %>
 		delete: {
 			actionSignature: ACTION_SIGNATURES.DELETE,
-			title: "<%- ModuleName %>:form_title_delete",
-			description: "<%- ModuleName %>:form_description_delete",
+			title: "not-node:crud_delete_action_form_title",
+			description: "not-node:crud_delete_action_form_description",
 			method: "delete",
 			rules: [
 				{
 					auth: true,
-					root: true,
+					role: ["admin"],
 				},
 				{
 					auth: true,
@@ -176,19 +162,16 @@ module.exports = {
 		listAndCount: {
 			method: "get",
 			actionSignature: ACTION_SIGNATURES.READ,
+			title: "not-node:crud_listAndCount_action_form_title",
+			description: "not-node:crud_listAndCount_action_form_description",
 			data: ["pager", "sorter", "filter", "search"],
-			rules: [
+			rules: [				
 				{
 					auth: true,
-					root: true,
+					role: ["admin"],
 				},
 				{
-					auth: true,
-					role: "admin",
-				},
-				{
-					auth: true,
-					role: ["client", "confirmed"],
+					auth: true					
 				},
 			],
 			postFix: actionNamePath,
@@ -199,15 +182,14 @@ module.exports = {
 			method: "get",
 			actionSignature: ACTION_SIGNATURES.READ,
 			data: ["record", "sorter"],
+			title: "not-node:crud_listAll_action_form_title",
+			description: "not-node:crud_listAll_action_form_description",
 			fields: [
 				<%- fields.map((entry) => `"${entry}"`).join(',')  %>,
 				<% if (dates){ %>"createdAt","updatedAt",<% } %>
 			],
 			postFix: actionNamePath,
-			rules: [
-				{
-					root: true,
-				},
+			rules: [				
 				{
 					auth: true,
 					role: ["manager"],