@opengis/admin 0.4.34 → 0.4.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.4.34",
+  "version": "0.4.36",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",

package/server/helpers/list/descriptionList.js

@@ -17,8 +17,11 @@ export default async function descriptionList(data, opt) {
 
     // no data
     if (hash.nodata && !data) {
-        const noDataText = typeof hash.nodata == 'string' ? hash.nodata : '<div class="bg-gray-200 text-center p-6 rounded-xl"><h3 class="text-lg font-semibold">Інформація відсутня</h3></div>';
-        return noDataText
+        const noDataText =
+            typeof hash.nodata == 'string'
+                ? hash.nodata
+                : '<div class="bg-gray-200 dark:bg-transparent dark:text-white text-center p-6 rounded-xl"><h3 class="text-lg font-semibold">Інформація відсутня</h3></div>';
+        return noDataText;
     }
     if (!hash.columns) return 'columns empty'
     const keys = hash.columns.split(hash.divider || ',').map(el => hash.comma ? el.trim().replace(new RegExp(hash.comma || '#', 'g'), ',') : el.trim());
@@ -35,12 +38,22 @@ export default async function descriptionList(data, opt) {
 
         const d1 = await format(data[key], key, data) || '-';
 
-        result.push(`<div class="grid grid-cols-1 gap-1 py-3 sm:grid-cols-3 sm:gap-4 even:bg-gray-50 text-[12px]">
-            <dt class="text-gray-900">${nameHBS || name}</dt>
-            <dd class="text-gray-700 sm:col-span-2">${d1}</dd>
+        result.push(`
+            <div class="grid grid-cols-1 gap-1 py-3 sm:grid-cols-3 sm:gap-4 
+                        even:bg-gray-50 dark:bg-transparent bg-white
+                        text-[12px] text-gray-700 dark:text-white">
+                <dt class="text-gray-900 dark:text-white">${nameHBS || name}</dt>
+                <dd class="text-gray-700 dark:text-white sm:col-span-2">${d1}</dd>
             </div>
         `);
 
     }
-    return '<dl class=" divide-y divide-gray-100 py-[5px] w-full">' + result.join('') + '</dl>';
+    return `
+        <div class="min-w-full relative overflow-auto 
+            divide-y divide-gray-200 dark:divide-gray-700
+            bg-white dark:bg-transparent 
+            text-[12px] text-gray-600 dark:text-white">
+            ${result.join('')}
+        </div>
+    `;
 }

package/server/helpers/list/tableList.js

@@ -31,7 +31,7 @@ export default async function tableList(data, opt) {
     const keys = hash.columns.split(hash.divider || ',').map(el => hash.comma ? el.trim().replace(new RegExp(hash.comma, 'g'), ',') : el.trim()).concat(hash.uid && hash.table && hash.id && !hash.noactions ? ['Дії', 'actions'] : []);
 
     const result = [];
-    result.push('<thead class="text-left font-medium text-gray-700"> <tr>');
+    result.push('<thead class="text-left font-medium text-gray-700 dark:text-white dark:bg-transparent"> <tr>');
 
     // thead 
     const skip = {}
@@ -48,16 +48,19 @@ export default async function tableList(data, opt) {
         if (skip[name]) continue;
 
         const isActionsColumn = hash.noactions && i === keys.length - 2;
-        result.push(`<th class="py-2 min-w-[200px] ${isActionsColumn ? 'last:min-w-[60px] last:max-w-[60px] last:bg-white last:sticky last:right-0' : ''}">
-                    ${nameHBS || name}
-        </th>`)
+        result.push(`
+            <th class="py-2 min-w-[200px] ${isActionsColumn
+                ? 'last:min-w-[60px] last:max-w-[60px] last:bg-white last:sticky last:right-0'
+                : ''}">
+                ${nameHBS || name}
+            </th>`);
     }
-    result.push('</tr></thead><tbody class="divide-y divide-gray-200">');
+     result.push('</tr></thead><tbody class="divide-y divide-gray-200 dark:divide-gray-700">');
 
     // body 
     for (let k = 0; k < data.length; k += 1) {
         const row = data[k];
-        result.push('<tr class="bg-white odd:bg-gray-50 ">');
+         result.push('<tr class="bg-white odd:bg-gray-50 dark:bg-transparent dark:odd:bg-transparent">');
         const obj = { form: hash.form, table: hash.table, id: row[hash.id] }
         const token = hash.table ? setToken({ ids: [JSON.stringify(obj)], uid: hash.uid, array: 1 })[0] : null;
         for (let i = 0; i < keys.length; i += 2) {
@@ -70,9 +73,10 @@ export default async function tableList(data, opt) {
             const tokenData = key == 'actions' ? token : null;
             const d1 = key.includes('{{') ? await handlebars.compile(key)({ ...row, token, hash }) || '-' : null
             const isActionsColumn = hash.noactions && i === keys.length - 2;
-            result.push(`<td class="py-2 pr-5 ${isActionsColumn ? 'last:sticky last:right-0' : ''}">
-                               ${d1 || format(tokenData || row[key], key, row, hash)}
-                            </td>`);
+            result.push(`
+                <td class="py-2 pr-5 ${isActionsColumn ? 'last:sticky last:right-0' : ''} dark:text-white">
+                    ${d1 || format(tokenData || row[key], key, row, hash)}
+                </td>`);
 
         }
         // action token 
@@ -82,5 +86,10 @@ export default async function tableList(data, opt) {
     result.push('</tbody>');
 
     //    console.log(Date.now() - time)
-    return '<table class="min-w-full relative divide-y-2 divide-gray-200 bg-white min-w-full overflow-auto divide-y-2 divide-gray-200 bg-white text-[12px] text-gray-600">' + result.join('') + '</table>';
+    return `<table class="min-w-full relative overflow-auto 
+        divide-y-2 divide-gray-200 dark:divide-gray-700
+        bg-white dark:bg-transparent 
+        text-[12px] text-gray-600 dark:text-white">
+        ${result.join('')}
+    </table>`;
 }

package/server/plugins/hook.js

@@ -110,11 +110,11 @@ export default async function plugin(fastify) {
                     clsQuery.push(`insert into admin.cls(name,type,data,module,hash) values('${name}','sql','${(loadTemplate?.sql || loadTemplate)?.replace(/'/g, "''")}', '${module?.replace(/'/g, "''")}','${el.hash}')`);
                     if (config.trace) console.log(name, type, 'insert fresh select');
                     return el.hash;
-                } else if (type === 'cls' && loadTemplate?.length && el.update) {
+                } else if (type === 'cls' && loadTemplate?.length && (el.update || Object.hasOwn(loadTemplate?.[0] || {}, 'color'))) {
                     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)`);
+                insert into admin.cls(code,name,parent,icon,color,data) 
+                select value->>'id',value->>'text','${name}',value->>'icon',value->>'color',value->>'data' 
+                from json_array_elements('${JSON.stringify(loadTemplate).replace(/'/g, "''")}'::json) on conflict (code,parent) do update set color=excluded.color;`);
                     if (config.trace) console.log(name, type, 'insert fresh cls');
                     return el.hash;
                 } else if (hashes.includes(el.hash)) {