@opengis/admin 0.1.52 → 0.1.54

package/dist/style.css

@@ -1 +1 @@
-.map-popup__vertical[data-v-3f5a9aff]{overflow:auto;max-height:300px}.map-popup__vertical[data-v-3f5a9aff]::-webkit-scrollbar{width:6px;height:6px;background-color:#f5f5f5}.map-popup__vertical[data-v-3f5a9aff]::-webkit-scrollbar-thumb{border-radius:5px;background-color:#dedede}.map-popup__vertical[data-v-3f5a9aff]::-webkit-scrollbar-track{background-color:#f5f5f5}.map__popup-body[data-v-3f5a9aff]{table-layout:fixed;width:100%}.map__popup-body-item[data-v-3f5a9aff]:not(:last-child){border-bottom:1px solid #eeeeee}.map__popup-body-item td[data-v-3f5a9aff]{width:50%;word-wrap:break-word;text-align:start}.map__popup-body-item td[data-v-3f5a9aff]:first-child{font-weight:600}.popup-image[data-v-deb51e0a]{max-width:100%;max-height:220px;margin-bottom:10px;-o-object-fit:contain;object-fit:contain}.maplibregl-ctrl-bottom-right,.maplibregl-popup-close-button{display:none}.widget-file .vs-button{background-color:#2563eb;color:#fff;font-size:.875rem;line-height:1.25rem;font-weight:600}.ui-dialog__modal div.flex.justify-between.items-center.py-3.px-4.border-b{border-bottom-width:0px;--tw-text-opacity: 1;color:#1f2937;font-weight:500;font-size:1.125rem;line-height:1.75rem;padding-bottom:0rem}.ui-dialog__modal .ui-dialog__content .p-4{padding-top:0rem}.widget-images__item-desc span:first-child:after{content:"";width:2px;height:2px;border-radius:50%;display:flex;align-items:center;background:#676a6c;margin:0 5px}.disabled{cursor:not-allowed!important}.item__text-content,.item{transition:all .5s cubic-bezier(.4,0,.2,1)}.item:hover .item__text-content{opacity:.8}.vs-widget-images .vs-button{background-color:#2563eb;color:#fff;font-size:.875rem;line-height:1.25rem;font-weight:600}.ProseMirror-focused{outline:none}.editor-toolbar{background-color:#f9fafb}.editor-content{min-height:160px}button{transition:background-color .2s ease;outline:none}button:focus{outline:none}.editor-content ul{margin-left:20px}.editor-content ul>li{list-style:disc}.editor-content ol{list-style-type:decimal;margin-left:20px}.editor-content pre{background-color:#e7e7e7;border-radius:4px;padding:0 2px}.mention-popup{background-color:#fafafa;padding:10px;border-radius:10px;box-shadow:0 4px 6px #0000001a;max-width:200px;overflow-y:auto;width:auto}.mention{padding:2px 4px;border-radius:8px;background-color:#e7e7e7}.mention-option{padding:5px 10px;cursor:pointer;transition:background-color .2s;border-radius:8px}.mention-option:hover{background-color:#f0f0f0}.border-top:not(:first-child){--tw-border-opacity: 1;border-color:#e5e7eb;border-top-width:1px}.widget-comment-form .vs-button{padding:.625rem 1rem;font-size:.75rem;line-height:1rem;font-weight:500}.widget-comment-form .vs-button:focus{border:transparent;--tw-ring-opacity: 1;--tw-ring-color: rgb(191 219 254);--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(4px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 rgba(0, 0, 0, 0))}li[data-v-95b2773a]{cursor:move}.grid[data-v-9b7dd8fb]{display:grid;grid-template-columns:repeat(12,minmax(0,1fr));gap:1rem}.admin-wrapper[data-v-e777119e]{display:flex;height:100vh;align-items:start}.vs-popover__content>div{padding:.25rem}.hs-accordion-heading[data-v-4139bc00]{display:flex;align-items:center}.hs-accordion-toggle[data-v-4139bc00]{cursor:pointer}.hs-accordion-content[data-v-4139bc00]{padding-left:1.5rem}.table-info-card .editor-container{min-width:200px;width:270px}.slide-fade-enter-active[data-v-bbbe9039],.slide-fade-leave-active[data-v-bbbe9039]{transition:all .3s linear}.slide-fade-enter-from[data-v-bbbe9039],.slide-fade-leave-to[data-v-bbbe9039]{transform:translate(20px);opacity:0}
+.vs-popover>div{text-align:start}.map-popup__vertical[data-v-3f5a9aff]{overflow:auto;max-height:300px}.map-popup__vertical[data-v-3f5a9aff]::-webkit-scrollbar{width:6px;height:6px;background-color:#f5f5f5}.map-popup__vertical[data-v-3f5a9aff]::-webkit-scrollbar-thumb{border-radius:5px;background-color:#dedede}.map-popup__vertical[data-v-3f5a9aff]::-webkit-scrollbar-track{background-color:#f5f5f5}.map__popup-body[data-v-3f5a9aff]{table-layout:fixed;width:100%}.map__popup-body-item[data-v-3f5a9aff]:not(:last-child){border-bottom:1px solid #eeeeee}.map__popup-body-item td[data-v-3f5a9aff]{width:50%;word-wrap:break-word;text-align:start}.map__popup-body-item td[data-v-3f5a9aff]:first-child{font-weight:600}.popup-image[data-v-deb51e0a]{max-width:100%;max-height:220px;margin-bottom:10px;-o-object-fit:contain;object-fit:contain}.maplibregl-ctrl-bottom-right,.maplibregl-popup-close-button{display:none}.widget-file .vs-button{background-color:#2563eb;color:#fff;font-size:.875rem;line-height:1.25rem;font-weight:600}.ui-dialog__modal div.flex.justify-between.items-center.py-3.px-4.border-b{border-bottom-width:0px;--tw-text-opacity: 1;color:#1f2937;font-weight:500;font-size:1.125rem;line-height:1.75rem;padding-bottom:0rem}.ui-dialog__modal .ui-dialog__content .p-4{padding-top:0rem}.widget-images__item-desc span:first-child:after{content:"";width:2px;height:2px;border-radius:50%;display:flex;align-items:center;background:#676a6c;margin:0 5px}.disabled{cursor:not-allowed!important}.item__text-content,.item{transition:all .5s cubic-bezier(.4,0,.2,1)}.item:hover .item__text-content{opacity:.8}.vs-widget-images .vs-button{background-color:#2563eb;color:#fff;font-size:.875rem;line-height:1.25rem;font-weight:600}.ProseMirror-focused{outline:none}.editor-toolbar{background-color:#f9fafb}.editor-content{min-height:160px}button{transition:background-color .2s ease;outline:none}button:focus{outline:none}.editor-content ul{margin-left:20px}.editor-content ul>li{list-style:disc}.editor-content ol{list-style-type:decimal;margin-left:20px}.editor-content pre{background-color:#e7e7e7;border-radius:4px;padding:0 2px}.mention-popup{background-color:#fafafa;padding:10px;border-radius:10px;box-shadow:0 4px 6px #0000001a;max-width:200px;overflow-y:auto;width:auto}.mention{padding:2px 4px;border-radius:8px;background-color:#e7e7e7}.mention-option{padding:5px 10px;cursor:pointer;transition:background-color .2s;border-radius:8px}.mention-option:hover{background-color:#f0f0f0}.border-top:not(:first-child){--tw-border-opacity: 1;border-color:#e5e7eb;border-top-width:1px}.widget-comment-form .vs-button{padding:.625rem 1rem;font-size:.75rem;line-height:1rem;font-weight:500}.widget-comment-form .vs-button:focus{border:transparent;--tw-ring-opacity: 1;--tw-ring-color: rgb(191 219 254);--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(4px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 rgba(0, 0, 0, 0))}li[data-v-95b2773a]{cursor:move}.grid[data-v-ed2cfe89]{display:grid;grid-template-columns:repeat(12,minmax(0,1fr));gap:1rem}.admin-wrapper[data-v-e777119e]{display:flex;height:100vh;align-items:start}.vs-popover__content>div{padding:.25rem}.hs-accordion-heading[data-v-4139bc00]{display:flex;align-items:center}.hs-accordion-toggle[data-v-4139bc00]{cursor:pointer}.hs-accordion-content[data-v-4139bc00]{padding-left:1.5rem}.table-info-card .editor-container{min-width:200px;width:270px}.slide-fade-enter-active[data-v-bbbe9039],.slide-fade-leave-active[data-v-bbbe9039]{transition:all .3s linear}.slide-fade-enter-from[data-v-bbbe9039],.slide-fade-leave-to[data-v-bbbe9039]{transform:translate(20px);opacity:0}

package/package.json

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

package/plugin.js

@@ -2,7 +2,6 @@ import fp from 'fastify-plugin';
 import path from 'node:path';
 
 import { addHook, getTemplatePath, getTemplate, pgClients } from '@opengis/fastify-table/utils.js';
-// import { addHook, getTemplatePath, getTemplate, pgClients } from './utils.js'; // test!
 
 import config from './config.js';
 import getMenu from './server/routes/menu/controllers/getMenu.js';
@@ -154,6 +153,7 @@ async function plugin(fastify, opts = config) {
   // API
 
   fastify.register(import('./server/routes/properties/index.mjs'), opts);
+  fastify.register(import('./server/routes/calendar/index.mjs'), opts);
   fastify.register(import('./server/routes/notifications/index.mjs'), opts);
   fastify.register(import('./server/routes/templates/index.mjs'), opts);
   fastify.register(import('./server/routes/menu/index.mjs'), opts);

package/server/routes/calendar/controllers/calendar.data.js

@@ -0,0 +1,89 @@
+import { /* getSelectVal, */ getMeta, getTemplate } from '@opengis/fastify-table/utils.js';
+
+export default async function calendarData({
+    pg, funcs, params = {}, query = {}, session = {},
+}) {
+    const { name } = params;
+    const { uid } = session.passport?.user || {};
+    if (!name) {
+        return { message: 'not enough params: name', status: 400 };
+    }
+    const { date, sql } = query;
+    
+    try {
+        const body = await getTemplate('calendar', name);
+
+        if (!body) {
+            return { message: `calendar not found: ${name}`, status: 404 };
+        }
+
+        const {
+            title,
+            table,
+            query: query1 = '1=1',
+            meta = {},
+            filter = [],
+        } = body;
+
+        if (!table) {
+            return { message: 'not enough calendar params: table', status: 404 };
+        }
+        if (!pg.pk?.[table]) {
+            return { message: `table pkey not found: ${table}`, status: 404 };
+        }
+
+        const filterWhere = filter?.length && query.filter?.length
+            ? filter.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true))
+                .map((el) => {
+                    const val = query.filter.split(',').find((e) => e?.split('=')?.shift()?.includes(el.column || el.name))?.split('=')?.pop();
+                    if (val) return el.column && val ? `(${[`${el.column}::text='${val.replace(/'/g,"''")}'::text`, el.query].filter((el) => el).join(' and ')})` : el.query;
+                }).filter((el) => el).join(' and ')
+            : undefined;
+        // console.log(filterWhere);
+
+        const queryWhere = await funcs.handlebars.compile(query1)({ uid });
+        const filterDate = date ? `date_trunc('month', "${meta?.date || meta?.start}"::date)='${date}'::date` : undefined;
+        const where = [queryWhere, filterDate, filterWhere].filter((el) => el).join(' and ');
+
+        const filtersByColumn = filter.filter((el) => (Object.hasOwn(el, 'enabled') ? el?.enabled : true) && el?.column);
+        
+        const filters = [];
+        if (filtersByColumn?.length) {
+            await Promise.all(filtersByColumn.map(async (el) => {
+                const { rows: filterData = [] } = await pg.query(`select "${el.column}" as id, count(*) from ${table} 
+                where ${el.query || '1=1'} and ${filterWhere || '1=1'} group by "${el.column}"`);
+                if (!filterData?.length) return;
+                
+                // const clsData = await getSelectVal({ pg, name: el.cls, values: filterData.map((el) => el.id) });
+                const clsData = el.cls ? await getTemplate(['cls', 'select'], el.cls) : undefined;
+                
+                if (!el.cls) {
+                    filterData.forEach((el1) => filters.push(el1));
+                    return;
+                }
+
+                filterData.forEach((el1) => {
+                    const cls = clsData.find((item) => item.id === el1.id.toString());
+                    Object.assign(el1, { title: cls?.text, color: cls?.color });
+                    filters.push(el1);
+                });
+            }));
+        }
+
+        const tableMeta = await getMeta({ pg, table });
+        const columnList = tableMeta?.columns?.map((el) => el?.name);
+        const columns = Object.keys(meta).filter((el) => ['date', 'start','end','title','status'].includes(el) && columnList.includes(meta[el])).map((el) => `"${meta[el]}" as ${el}`);
+        
+        if (!columns?.length) {
+            return { message: `calendar param meta is invalid: invalid/empty keys`, status: 404 };
+        }
+
+        const q = `select ${columns.join(',')} from ${table} where ${where}`;
+        if (sql) return q;
+
+        const { rows = [] } = await pg.query(q); 
+        return { title, filters, rows };
+    } catch (err) {
+        return { error: err.toString(), status: 500 };
+    }
+}

package/server/routes/calendar/index.mjs

@@ -0,0 +1,17 @@
+import calendarData from "./controllers/calendar.data.js";
+
+const schema = {
+    query: {
+        type: 'object',
+        properties: {
+            date: {
+                type: 'string',
+                format: 'date',
+            },
+        },
+    },
+};
+
+export default async function route(fastify) {
+    fastify.get('/calendar/:name', { schema }, calendarData);
+}

package/server/routes/data/controllers/tableData.js

@@ -2,10 +2,6 @@ import {
     getMeta, getAccess, getTemplate, metaFormat, getSelectVal, gisIRColumn,
 } from "@opengis/fastify-table/utils.js";
 
-// import {
-//     getMeta, getAccess, getTemplate, metaFormat, getSelectVal, gisIRColumn,
-// } from '../../../../utils.js'; // test!
-
 import getFilterSQL from "./funcs/getFilterSQL/index.js";
 
 import assignTokens from './utils/assignTokens.js';

package/server/routes/data/schema.js

@@ -3,6 +3,5 @@ const tableDataSchema = {
         limit: { type: 'integer' },
     }
 };
-
+export { tableDataSchema }
 export default null;
-export { tableDataSchema }

package/server/routes/menu/controllers/getMenu.js

@@ -1,7 +1,6 @@
 
 import { join } from 'path';
 import { userTemplateDir } from '@opengis/fastify-table/utils.js';
-// import { userTemplateDir } from '../../../../utils.js'; // test!
 
 import { existsSync, readdirSync, readFileSync } from 'fs';
 const menuCache = [];

package/utils.js

@@ -1,50 +1,21 @@
+import yamlSafe from 'js-yaml';
+
 import getSettings from './server/routes/properties/funcs/getSettings.js';
 import setSettings from './server/routes/properties/funcs/setSettings.js';
 
-import {
-  addHook,
-  getTemplatePath,
-  pgClients,
-  applyHook,
-  userTemplateDir,
-  addTemplateDir,
-  getMeta,
-  getAccess,
-  getTemplate,
-  metaFormat,
-  getSelectVal,
-  gisIRColumn,
-} from '@opengis/fastify-table/utils.js';
+function loadSafe (yml) {
+  try {
+    return yamlSafe.load(yml);
+  } catch (err) {
+    return { error: err.toString() };
+  }
+};
 
-// import {
-//   addHook,
-//   getTemplatePath,
-//   pgClients,
-//   applyHook,
-//   userTemplateDir,
-//   addTemplateDir,
-//   getMeta,
-//   getAccess,
-//   getTemplate,
-//   metaFormat,
-//   getSelectVal,
-//   gisIRColumn,
-// } from '../fastify-table/utils.js'; // test!
+Object.assign(yamlSafe, { loadSafe });
 
 export default null;
 export {
-  addHook,
-  getTemplatePath,
-  pgClients,
-  applyHook,
+  yamlSafe,
   getSettings,
   setSettings,
-  userTemplateDir,
-  addTemplateDir,
-  getMeta,
-  getAccess,
-  getTemplate,
-  metaFormat,
-  getSelectVal,
-  gisIRColumn,
 };