From c501b254d5e421729a9b940a2aed41480b5c54a1 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Mon, 9 Sep 2024 11:43:15 +0200
Subject: [PATCH 1/4] feat: refs #7584 restriction noInclude

---
 mylogger.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mylogger.js b/mylogger.js
index 2e8b6a7..31023ab 100644
--- a/mylogger.js
+++ b/mylogger.js
@@ -522,9 +522,9 @@ module.exports = class MyLogger {
           `[${action}]`[actionColor[action]],
           `${logInfo.name}: ${originFk}, ${modelName}: ${modelId}`
         );
-
+      const noInclude = tableInfo.rowExcludeField && !row.editorFk;
       try {
-        if (isDelete) {
+        if (isDelete && (!tableInfo.rowExcludeField || noInclude)) {
           [[deleteRow]] = await logInfo.fetchStmt.execute([
             modelName, modelId, originFk
           ]);
@@ -540,7 +540,7 @@ module.exports = class MyLogger {
         }
         if (!conf.testMode && (!isDelete || !deleteRow)) {
           async function log(originFk) {
-            if (originFk == null) return;
+            if (originFk == null ||noInclude) return;
             await logInfo.addStmt.execute([
               originFk,
               row[tableInfo.userField] ?? null,

From 6b53029c065b7f6f693cb0ea05128a6d05bff5fe Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Mon, 9 Sep 2024 11:49:21 +0200
Subject: [PATCH 2/4] feat: refs #7584 tabulaciones y saltos de linea

---
 mylogger.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mylogger.js b/mylogger.js
index 31023ab..c53d3dc 100644
--- a/mylogger.js
+++ b/mylogger.js
@@ -522,7 +522,9 @@ module.exports = class MyLogger {
           `[${action}]`[actionColor[action]],
           `${logInfo.name}: ${originFk}, ${modelName}: ${modelId}`
         );
+
       const noInclude = tableInfo.rowExcludeField && !row.editorFk;
+
       try {
         if (isDelete && (!tableInfo.rowExcludeField || noInclude)) {
           [[deleteRow]] = await logInfo.fetchStmt.execute([
@@ -540,7 +542,7 @@ module.exports = class MyLogger {
         }
         if (!conf.testMode && (!isDelete || !deleteRow)) {
           async function log(originFk) {
-            if (originFk == null ||noInclude) return;
+            if (originFk == null || noInclude) return;
             await logInfo.addStmt.execute([
               originFk,
               row[tableInfo.userField] ?? null,

From 80ac579a476b558b143e3a1419a2a2c091c03183 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 16 Oct 2024 08:50:29 +0200
Subject: [PATCH 3/4] feat: refs #7584 modificaciones vistas con juan

---
 config/logs.yml | 1 +
 mylogger.js     | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/config/logs.yml b/config/logs.yml
index 6d35364..c7fa7fd 100644
--- a/config/logs.yml
+++ b/config/logs.yml
@@ -4,6 +4,7 @@ logMainShowField: false
 upperCaseTable: true
 userField: editorFk
 rowExcludeField: logExclude
+ignoreSystem: false
 excludeRegex: '__$'
 showFields:
   - name
diff --git a/mylogger.js b/mylogger.js
index c53d3dc..2e8b6a7 100644
--- a/mylogger.js
+++ b/mylogger.js
@@ -523,10 +523,8 @@ module.exports = class MyLogger {
           `${logInfo.name}: ${originFk}, ${modelName}: ${modelId}`
         );
 
-      const noInclude = tableInfo.rowExcludeField && !row.editorFk;
-
       try {
-        if (isDelete && (!tableInfo.rowExcludeField || noInclude)) {
+        if (isDelete) {
           [[deleteRow]] = await logInfo.fetchStmt.execute([
             modelName, modelId, originFk
           ]);
@@ -542,7 +540,7 @@ module.exports = class MyLogger {
         }
         if (!conf.testMode && (!isDelete || !deleteRow)) {
           async function log(originFk) {
-            if (originFk == null || noInclude) return;
+            if (originFk == null) return;
             await logInfo.addStmt.execute([
               originFk,
               row[tableInfo.userField] ?? null,

From f75df4e19f64f232d73fa3b48227453acd2d117b Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Fri, 18 Oct 2024 12:55:17 +0200
Subject: [PATCH 4/4] feat: refs #7584 ignoreSystem

---
 lib/model-loader.js | 3 ++-
 mylogger.js         | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/model-loader.js b/lib/model-loader.js
index 0c3a998..ca1663a 100644
--- a/lib/model-loader.js
+++ b/lib/model-loader.js
@@ -94,7 +94,8 @@ module.exports = class ModelLoader {
     ];
     const globalProps = [
       'userField',
-      'rowExcludeField'
+      'rowExcludeField',
+      'ignoreSystem'
     ];
   
     for (const [schema, table, tableInfo] of schemaMap) {
diff --git a/mylogger.js b/mylogger.js
index 2e8b6a7..6700069 100644
--- a/mylogger.js
+++ b/mylogger.js
@@ -305,14 +305,16 @@ module.exports = class MyLogger {
     const table = evt.tableMap[evt.tableId];
     const tableName = table.tableName;
     const tableInfo = this.schemaMap.get(table.parentSchema, tableName);
+    
     if (!tableInfo) return;
-
+    
     const action = actions[eventName];
-    const {rowExcludeField} = tableInfo;
+    const {rowExcludeField, ignoreSystem} = tableInfo;
     const changes = [];
 
     function isExcluded(row) {
-      return rowExcludeField && row[rowExcludeField];
+      return (rowExcludeField && row[rowExcludeField])
+        || (ignoreSystem && row.editorFk == null);
     }
 
     function cast(value, type) {