@opengis/admin 0.3.57 → 0.3.59

package/server/plugins/hook.js

@@ -123,6 +123,7 @@ export default async function plugin(fastify) {
             const hashes = await rclient.hgetall('cls-insert-hashes').then(obj => Object.keys(obj));
             const dbdata = await client.query(`select json_object_agg(name, hash) from admin.cls where parent is null`).then(el => el.rows?.[0]?.json_object_agg || {});
             const names = Object.keys(dbdata);
+            console.log('admin/hook cls promise start');
             const qHashes = await Promise.all(cls.filter((el, idx, arr) => arr.map((item) => item.name).indexOf(el.name) === idx).map(async (el) => {
                 const { name, module, type } = el;
                 const loadTemplate = await getTemplate(type, name);
@@ -134,20 +135,20 @@ export default async function plugin(fastify) {
 
                 if (type === 'select' && (loadTemplate?.sql || loadTemplate) && el.update) {
                     clsQuery.push(`insert into admin.cls(name,type,data,module,hash) values('${name}','sql','${(loadTemplate?.sql || loadTemplate)?.replace(/'/g, "''")}', '${module?.replace(/'/g, "''")}','${el.hash}')`);
-                    console.log(name, type, 'insert fresh select');
+                    if (config.trace) console.log(name, type, 'insert fresh select');
                     return el.hash;
                 } else if (type === 'cls' && loadTemplate?.length && el.update) {
                     clsQuery.push(`insert into admin.cls(name,type, module,hash) values('${name}','json', '${module?.replace(/'/g, "''")}','${el.hash}'); 
                 insert into admin.cls(code,name,parent,icon,data) 
                 select value->>'id',value->>'text','${name}',value->>'icon',value->>'data' 
                 from json_array_elements('${JSON.stringify(loadTemplate).replace(/'/g, "''")}'::json)`);
-                    console.log(name, type, 'insert fresh cls');
+                    if (config.trace) console.log(name, type, 'insert fresh cls');
                     return el.hash;
                 } else if (hashes.includes(el.hash)) {
-                    console.log(name, type, names.includes(name) ? 'skip equal hash' : 'insert missing cls');
+                    if (config.trace) console.log(name, type, names.includes(name) ? 'skip equal hash' : 'insert missing cls');
                     return el.hash;
                 } else {
-                    console.log(name, type, 'empty');
+                    if (config.trace) console.log(name, type, 'empty');
                     return el.hash;
                 }
             }));
@@ -165,6 +166,7 @@ export default async function plugin(fastify) {
                 logger.file('migration/hash', { list: qHashes.filter(el => el) });
                 console.log('admin/hook cls sql finish', clsQuery?.length);
             }
+            console.log('admin/hook cls promise finish', rowCount);
         } catch (err) {
             console.error('admin/hook cls sql error', err.toString());
             console.trace(err);

package/server/routes/data/controllers/utils/conditions.js

@@ -1,21 +1,21 @@
-function onCheck(rule, data) {
-    const val = data[rule[0]];
-    // console.log(val, rule[1], rule[2])
-    if (rule[1] === '==') return val === rule[2];
-    if (rule[1] === '!=') return val !== rule[2];
-    if (rule[1] === 'in' && rule[2].split) return rule[2].split(',').includes(val);
-    if (rule[1] === 'in' && rule[2].includes) return rule[2].includes(val);
-
-    if (rule[1] === 'not in' && rule[2].split) return !rule[2].split(',').includes(val);
-    if (rule[1] === 'not in' && rule[2].includes) return !rule[2].includes(val);
-
-    if (rule[1] === '>') return val > rule[2];
-    if (rule[1] === '<') return val < rule[2];
-}
-export default function conditions(rules, data) {
-    if (!rules?.length) return true;
-    const result = Array.isArray(rules[0]) ? !rules.filter(el => !onCheck(el, data)).length : onCheck(rules, data)
-    // console.log(rules, result)
-    return result;
-
+function onCheck(rule, data) {
+    const val = data[rule[0]];
+    // console.log(val, rule[1], rule[2])
+    if (rule[1] === '==') return val === rule[2];
+    if (rule[1] === '!=') return val !== rule[2];
+    if (rule[1] === 'in' && rule[2].split) return rule[2].split(',').includes(val);
+    if (rule[1] === 'in' && rule[2].includes) return rule[2].includes(val);
+
+    if (rule[1] === 'not in' && rule[2].split) return !rule[2].split(',').includes(val);
+    if (rule[1] === 'not in' && rule[2].includes) return !rule[2].includes(val);
+
+    if (rule[1] === '>') return val > rule[2];
+    if (rule[1] === '<') return val < rule[2];
+}
+export default function conditions(rules, data) {
+    if (!rules?.length) return true;
+    const result = Array.isArray(rules[0]) ? !rules.filter(el => !onCheck(el, data)).length : onCheck(rules, data)
+    // console.log(rules, result)
+    return result;
+
 }