@opengis/admin 0.3.40 → 0.3.42

package/dist/{profile-page-wPxhrzAG.js → profile-page-B8ZKBocp.js}

@@ -1,4 +1,4 @@
-import { _ as n, f as m } from "./import-file-D7kmC9pj.js";
+import { _ as n, f as m } from "./import-file-KkQTE8rh.js";
 import { u as p } from "./user-B_2kh6ic.js";
 import { resolveComponent as f, openBlock as u, createElementBlock as d, createElementVNode as o, createBlock as h, createCommentVNode as b } from "vue";
 const x = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.3.40",
+  "version": "0.3.42",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",
@@ -48,8 +48,8 @@
     "@fullcalendar/vue3": "^6.1.15",
     "@opengis/fastify-auth": "^1.0.73",
     "@opengis/fastify-file": "^1.0.42",
-    "@opengis/fastify-table": "^1.2.88",
-    "@opengis/v3-core": "^0.3.93",
+    "@opengis/fastify-table": "^1.2.96",
+    "@opengis/v3-core": "^0.3.112",
     "@opengis/v3-filter": "^0.0.72",
     "@tiptap/core": "^2.8.0",
     "@tiptap/extension-color": "^2.8.0",
@@ -95,4 +95,4 @@
     "vitepress-plugin-tabs": "^0.5.0",
     "vitepress-sidebar": "1.30.2"
   }
-}
+}

package/server/plugins/hook.js

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { createHash } from 'node:crypto';
-import { readFileSync } from 'node:fs';
+import { readFileSync, writeFileSync } from 'node:fs';
 
 import {
     getTemplatePath, addHook, getToken, getTemplate, config, pgClients, initPG, getRedis, logger,
@@ -12,6 +12,9 @@ import printTemplates from '../routes/print/controllers/printTemplates.js';
 const { client } = pgClients;
 
 const rclient = getRedis();
+const cwd = process.cwd();
+
+const logDir = path.join(cwd, 'log/migration');
 
 export default async function plugin(fastify) {
     const user1 = config?.auth?.disable || process.env.NODE_ENV !== 'admin' ? { uid: '1' } : null;
@@ -116,33 +119,44 @@ export default async function plugin(fastify) {
             ?.map((el) => ({ name: el[0], module: path.basename(path.dirname(path.dirname(el[1]))), type: { 'json': 'cls', 'sql': 'select' }[el[2]] }))
         if (!cls?.length) return;
 
-        const dupes = cls.filter((el, idx, arr) => arr.map((item) => item.name).indexOf(el.name) !== idx);
-        //console.log('cls insert skip dupes', dupes.map((el) => el.name));
-
         try {
             const hashes = await rclient.hgetall('cls-insert-hashes').then(obj => Object.keys(obj));
-            const names = await pgClients.client.query(`select array_agg(name) from admin.cls where parent is null`).then(el => el.rows?.[0]?.array_agg || []);
+            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);
             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);
-                const hash = createHash('md5').update(type === 'cls' ? JSON.stringify(loadTemplate) : (loadTemplate?.sql || loadTemplate)).digest('hex');
-                if (type === 'select' && (!hashes.includes(hash) || !names.includes(name))) {
-                    clsQuery.push(`insert into admin.cls(name,type,data,module) values('${name}','sql','${(loadTemplate?.sql || loadTemplate)?.replace(/'/g, "''")}', '${module?.replace(/'/g, "''")}')`);
-                    return hash;
-                } else if (type === 'cls' && loadTemplate?.length && (!hashes.includes(hash) || !names.includes(name))) {
-                    clsQuery.push(`insert into admin.cls(name,type, module) values('${name}','json', '${module?.replace(/'/g, "''")}'); 
+                el.hash = createHash('md5').update(type === 'cls' ? JSON.stringify(loadTemplate) : (loadTemplate?.sql || loadTemplate)).digest('hex');
+                el.dbhash = dbdata[name];
+
+                // check for changes by redis hash / dropped from db / changed at git project
+                el.update = !hashes.includes(el.hash) || !names.includes(name) || el.hash !== el.dbhash;
+
+                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');
+                    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)`);
-                    return hash;
-                } else if (hashes.includes(hash)) {
+                    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');
+                    return el.hash;
                 } else {
                     console.log(name, type, 'empty');
+                    return el.hash;
                 }
             }));
 
-            const { rowCount = 0 } = await client.query('delete from admin.cls where $1::text[] && array[name,parent]', [cls.map(el => el.name)]);
+            // debug
+            writeFileSync(path.join(logDir, `${path.basename(cwd)}-${client.options?.database}-cls.sql`), clsQuery.filter((el) => el).join(';'));
+            writeFileSync(path.join(logDir, `${path.basename(cwd)}-${client.options?.database}-cls.json`), JSON.stringify(cls));
+
+            const { rowCount = 0 } = await client.query('delete from admin.cls where $1::text[] && array[name,parent]', [cls.filter(el => el.update).map(el => el.name)]);
             console.log('admin/hook old cls deleted', rowCount);
             if (clsQuery.filter((el) => el).length) {
                 console.log('admin/hook cls sql start', clsQuery?.length);