@opengis/cms 0.0.49 → 0.0.50

package/package.json

@@ -1,67 +1,68 @@
-{
-  "name": "@opengis/cms",
-  "version": "0.0.49",
-  "description": "cms",
-  "type": "module",
-  "author": "Softpro",
-  "main": "./dist/index.js",
-  "license": "EULA",
-  "files": [
-    "module",
-    "dist",
-    "server",
-    "plugin.js",
-    "utils.js",
-    "utils.d.ts",
-    "input-types.json"
-  ],
-  "scripts": {
-    "patch": "npm version patch && git push && npm publish",
-    "test": "node --test test/**/*.test.js",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "dev": "NODE_ENV=dev bun --env-file=.env.ip server ",
-    "admin": "vite admin",
-    "build": "vite build && vite build admin",
-    "build:lib": "vite build",
-    "proxy": "vite dev admin",
-    "start": "bun --env-file=.env.ip server",
-    "prod": "NODE_ENV=production bun --env-file=.env.ip  server ",
-    "ip": "bun --env-file=.env.ip server",
-    "demo": "node --env-file=.env.demo --env-file=.env server",
-    "i18n:sync": "node i18n-sync.cjs",
-    "prepublishOnly": "bun build:lib",
-    "softpro": "bun --env-file=.env.softpro server",
-    "softpro1": "NODE_ENV=production bun --env-file=.env.prod-softpro.local server"
-  },
-  "dependencies": {},
-  "resolutions": {
-    "rollup": "4.30.0"
-  },
-  "devDependencies": {
-    "@fastify/compress": "^8.1.0",
-    "@opengis/core": "^0.0.30",
-    "@opengis/fastify-table": "^2.0.137",
-    "@opengis/filter": "^0.1.31",
-    "@opengis/form": "^0.0.109",
-    "@opengis/richtext": "0.0.38",
-    "@vueuse/head": "2.0.0",
-    "js-yaml": "^4.1.0",
-    "lucide-vue-next": "0.344.0",
-    "vite": "5.1.4",
-    "vue": "^3.5.17",
-    "vue-i18n": "11.1.5",
-    "vue-router": "4.4.3",
-    "vuedraggable": "4.1.0",
-    "@tailwindcss/typography": "0.5.10",
-    "@tsconfig/node22": "^22.0.2",
-    "@vitejs/plugin-vue": "5.0.4",
-    "autoprefixer": "10.4.18",
-    "eslint": "8.49.0",
-    "postcss": "8.4.35",
-    "sass": "^1.92.1",
-    "tailwindcss": "3.4.1",
-    "typescript": "~5.8.0",
-    "vitest": "3.2.4",
-    "vue-tsc": "^2.2.10"
-  }
-}
+{
+  "name": "@opengis/cms",
+  "version": "0.0.50",
+  "description": "cms",
+  "type": "module",
+  "author": "Softpro",
+  "main": "./dist/index.js",
+  "license": "EULA",
+  "files": [
+    "module",
+    "locales",
+    "dist",
+    "server",
+    "plugin.js",
+    "utils.js",
+    "utils.d.ts",
+    "input-types.json"
+  ],
+  "scripts": {
+    "patch": "npm version patch && git push && npm publish",
+    "test": "node --test test/**/*.test.js",
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
+    "dev": "NODE_ENV=dev bun --env-file=.env.ip server ",
+    "admin": "vite admin",
+    "build": "vite build && vite build admin",
+    "build:lib": "vite build",
+    "proxy": "vite dev admin",
+    "start": "bun --env-file=.env.ip server",
+    "prod": "NODE_ENV=production bun --env-file=.env.ip  server ",
+    "ip": "bun --env-file=.env.ip server",
+    "demo": "node --env-file=.env.demo --env-file=.env server",
+    "i18n:sync": "node i18n-sync.cjs",
+    "prepublishOnly": "bun build:lib",
+    "softpro": "bun --env-file=.env.softpro server",
+    "softpro1": "NODE_ENV=production bun --env-file=.env.prod-softpro.local server"
+  },
+  "dependencies": {},
+  "resolutions": {
+    "rollup": "4.30.0"
+  },
+  "devDependencies": {
+    "@fastify/compress": "^8.1.0",
+    "@opengis/core": "^0.0.30",
+    "@opengis/fastify-table": "^2.0.137",
+    "@opengis/filter": "^0.1.31",
+    "@opengis/form": "^0.0.109",
+    "@opengis/richtext": "0.0.38",
+    "@vueuse/head": "2.0.0",
+    "js-yaml": "^4.1.0",
+    "lucide-vue-next": "0.344.0",
+    "vite": "5.1.4",
+    "vue": "^3.5.17",
+    "vue-i18n": "11.1.5",
+    "vue-router": "4.4.3",
+    "vuedraggable": "4.1.0",
+    "@tailwindcss/typography": "0.5.10",
+    "@tsconfig/node22": "^22.0.2",
+    "@vitejs/plugin-vue": "5.0.4",
+    "autoprefixer": "10.4.18",
+    "eslint": "8.49.0",
+    "postcss": "8.4.35",
+    "sass": "^1.92.1",
+    "tailwindcss": "3.4.1",
+    "typescript": "~5.8.0",
+    "vitest": "3.2.4",
+    "vue-tsc": "^2.2.10"
+  }
+}

package/server/routes/cms/controllers/getPermissions.js

@@ -1,16 +1,16 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-export default async function getPermissions(req, reply) {
-    const { pg = pgClients.client, params = {}, user = {} } = req;
-
-    if (!user?.uid) {
-        return reply.status(401).send('unauthorized');
-    }
-
-    const { rows = [] } = await pg.query(
-        `select * from site.permissions where ${params.id ? 'user_id=$1' : 'true'}`,
-        [params.id].filter(Boolean),
-    );
-
-    return { permissions: rows };
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function getPermissions(req, reply) {
+    const { pg = pgClients.client, params = {}, user = {} } = req;
+
+    if (!user?.uid) {
+        return reply.status(401).send('unauthorized');
+    }
+
+    const { rows = [] } = await pg.query(
+        `select * from site.permissions where ${params.id ? 'user_id=$1' : 'true'}`,
+        [params.id].filter(Boolean),
+    );
+
+    return { permissions: rows };
 }

package/server/routes/cms/controllers/listMedia.js

@@ -2,9 +2,22 @@ import path from 'node:path';
 import { existsSync, mkdirSync } from 'node:fs';
 import { readdir, stat } from 'node:fs/promises';
 
-import { config, getFolder, pgClients, getMimeType } from '@opengis/fastify-table/utils.js';
+import { config, getFolder, pgClients, getMimeType, getFilterSQL } from '@opengis/fastify-table/utils.js';
 import { createHash } from 'node:crypto';
 
+const filterList = [
+    {
+        name: "created_at",
+        type: "Date",
+        ua: "Дата створення"
+    },
+    {
+        name: "updated_at",
+        type: "Date",
+        ua: "Дата редагування"
+    }
+]
+
 // path.resolve() converts POSIX paths from getFolder to valid Windows paths (Bun/Node fs require this on Windows)
 const rootDir = path.resolve(getFolder(config, 'local'));
 const dir = '/files';
@@ -39,12 +52,15 @@ export default async function listMedia(req, reply) {
     const allItems = isDirectory ? await readdir(dirpath, { withFileTypes: true, recursive: true }) : [];
     const items = isDirectory ? await readdir(dirpath, { withFileTypes: true }) : [];
 
+    const { q = '' } = await getFilterSQL({ table: 'site.media', filter: query?.filter, filterList, pg });
+
     const rows = await pg.query(
         `select 
             media_id as id, filename, filetype, filesize, url, description, alt,
             mime, preview_url, created_at, updated_at, created_by, updated_by
         from site.media
-        where ${subdir ? 'subdir = $1' : (search ? '1=1' : 'subdir is null')} ${search ? `and filename ilike '%${search.replace(/'/g, "''")}%'` : ''}`,
+        where ${subdir ? 'subdir = $1' : (search ? '1=1' : 'subdir is null')} ${search ? `and filename ilike '%${search.replace(/'/g, "''")}%'` : ''}
+        ${q ? ` and (${q})` : ''}`,
         [subdir].filter(Boolean),
     ).then(el => el.rows || []); // ?.filter(row => items.map(el => el.name).includes(row.filename))
 

package/server/routes/cms/controllers/setPermissions.js

@@ -1,50 +1,50 @@
-import { logger, pgClients, dataInsert } from '@opengis/fastify-table/utils.js';
-
-export default async function setPermissions(req, reply) {
-    const { pg = pgClients.client, params = {}, user = {}, body = {} } = req;
-
-    if (!user?.uid) {
-        return reply.status(401).send('unauthorized');
-    }
-
-    if (!params.id) {
-        return reply.status(400).send('not enough params: id');
-    }
-
-    const client = await pg.connect()
-    const result = {};
-    try {
-        await client.query('BEGIN');
-
-        const { rowCount = 0 } = await client.query(
-            `delete from site.permissions where user_id=$1`,
-            [params.id].filter(Boolean),
-        );
-
-        Object.assign(result, { deleted: rowCount });
-
-        if (Array.isArray(body.permissions) && body.permissions?.length) {
-            body.permissions.forEach((el) => {
-                Object.assign(el, { user_id: el.user_id || params.id });
-            });
-
-            await Promise.all(body.permissions.map(async (el) => dataInsert({
-                pg: client,
-                table: 'site.permissions',
-                data: el,
-                uid: user.uid,
-            })));
-
-            Object.assign(result, { inserted: body.permissions.length });
-        }
-
-        await client.query('COMMIT');
-        return reply.status(200).send(result);
-    } catch (err) {
-        await client.query('ROLLBACK');
-        logger.file('cms/permissions', { error: err.toString(), stack: err.stack });
-        return reply.status(500).send('set permissions error');
-    } finally {
-        client.release();
-    }
+import { logger, pgClients, dataInsert } from '@opengis/fastify-table/utils.js';
+
+export default async function setPermissions(req, reply) {
+    const { pg = pgClients.client, params = {}, user = {}, body = {} } = req;
+
+    if (!user?.uid) {
+        return reply.status(401).send('unauthorized');
+    }
+
+    if (!params.id) {
+        return reply.status(400).send('not enough params: id');
+    }
+
+    const client = await pg.connect()
+    const result = {};
+    try {
+        await client.query('BEGIN');
+
+        const { rowCount = 0 } = await client.query(
+            `delete from site.permissions where user_id=$1`,
+            [params.id].filter(Boolean),
+        );
+
+        Object.assign(result, { deleted: rowCount });
+
+        if (Array.isArray(body.permissions) && body.permissions?.length) {
+            body.permissions.forEach((el) => {
+                Object.assign(el, { user_id: el.user_id || params.id });
+            });
+
+            await Promise.all(body.permissions.map(async (el) => dataInsert({
+                pg: client,
+                table: 'site.permissions',
+                data: el,
+                uid: user.uid,
+            })));
+
+            Object.assign(result, { inserted: body.permissions.length });
+        }
+
+        await client.query('COMMIT');
+        return reply.status(200).send(result);
+    } catch (err) {
+        await client.query('ROLLBACK');
+        logger.file('cms/permissions', { error: err.toString(), stack: err.stack });
+        return reply.status(500).send('set permissions error');
+    } finally {
+        client.release();
+    }
 }

package/server/templates/select/core.user_mentioned.sql

@@ -1,2 +1,2 @@
-select uid, coalesce(sur_name,'')||coalesce(' '||user_name,'') as text, email from admin.users
+select uid, coalesce(sur_name,'')||coalesce(' '||user_name,'') as text, email from admin.users
 where enabled order by coalesce(sur_name,'')||coalesce(' '||user_name,'')

package/dist/MonacoEditor.vue_vue_type_script_setup_true_lang-B1DrxmQX.js

@@ -1,84 +0,0 @@
-import { defineComponent as s, mergeModels as c, useModel as m, ref as f, onMounted as h, watch as d, onBeforeUnmount as g, openBlock as p, createElementBlock as v, normalizeStyle as w } from "vue";
-async function M() {
-  if (window.monaco)
-    return window.monaco;
-  const a = "https://cdn.jsdelivr.net/npm/monaco-editor@0.45.0/min";
-  return window.require || (window.require = { paths: { vs: `${a}/vs` } }, await new Promise((o, l) => {
-    const n = document.createElement("script");
-    n.src = `${a}/vs/loader.min.js`, n.onload = () => o(), n.onerror = l, document.head.appendChild(n);
-  })), new Promise((o) => {
-    window.require(["vs/editor/editor.main"], () => o(window.monaco));
-  });
-}
-const C = /* @__PURE__ */ s({
-  __name: "MonacoEditor",
-  props: /* @__PURE__ */ c({
-    language: { default: "javascript" },
-    theme: { default: "vs-dark" },
-    width: { default: "100%" },
-    height: { default: "100%" },
-    options: { default: () => ({
-      minimap: { enabled: !1 }
-    }) }
-  }, {
-    modelValue: {
-      required: !0
-    },
-    modelModifiers: {}
-  }),
-  emits: ["update:modelValue"],
-  setup(a) {
-    const o = a, l = m(a, "modelValue"), n = f(null);
-    let e = null, i = null;
-    return h(async () => {
-      var t;
-      if (n.value)
-        try {
-          i = await M();
-          const r = ((t = l.value) == null ? void 0 : t.replace(/\\n/g, `
-`)) || "";
-          e = i.editor.create(n.value, {
-            value: r,
-            language: o.language,
-            theme: o.theme,
-            automaticLayout: !0,
-            ...o.options
-          }), e.onDidChangeModelContent(() => {
-            const u = (e == null ? void 0 : e.getValue()) || "";
-            l.value = u;
-          });
-        } catch (r) {
-          console.error("Failed to load Monaco Editor:", r);
-        }
-    }), d(
-      () => l.value,
-      (t) => {
-        if (e) {
-          const r = (t == null ? void 0 : t.replace(/\\n/g, `
-`)) || "";
-          r !== e.getValue() && e.setValue(r);
-        }
-      },
-      { immediate: !0 }
-    ), d(
-      () => o.language,
-      (t) => {
-        e && t && i && i.editor.setModelLanguage(e.getModel(), t);
-      }
-    ), d(
-      () => o.theme,
-      (t) => {
-        e && t && i && i.editor.setTheme(t);
-      }
-    ), g(() => {
-      e && (e.dispose(), e = null);
-    }), (t, r) => (p(), v("div", {
-      ref_key: "editorContainer",
-      ref: n,
-      style: w({ width: a.width, height: a.height })
-    }, null, 4));
-  }
-});
-export {
-  C as _
-};