@opengis/cms 0.0.52 → 0.0.54

package/package.json

@@ -1,68 +1,68 @@
-{
-  "name": "@opengis/cms",
-  "version": "0.0.52",
-  "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.143",
-    "@opengis/filter": "^0.1.31",
-    "@opengis/form": "^0.0.109",
-    "@opengis/richtext": "0.0.45",
-    "@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.54",
+  "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.143",
+    "@opengis/filter": "^0.1.31",
+    "@opengis/form": "^0.0.109",
+    "@opengis/richtext": "0.0.45",
+    "@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/functions/getTags.js

@@ -0,0 +1,30 @@
+import { createHash } from 'node:crypto';
+
+import { config, getRedis, pgClients } from '@opengis/fastify-table/utils.js';
+import { createMockReply } from './utils/mock.reply.js';
+
+import getTagsApi from '../routes/tags/controllers/get.tags.js';
+
+const pg = pgClients.client;
+const rclient = getRedis();
+
+export default async function getTags({ page = 1, limit = 16, search, ttl = 3600 } = {}) {
+
+    const crudInc = await rclient.get(`pg:site.contents:tags`) || 0;
+
+    const cacheKey = createHash('md5').update([config.pg?.database, 'cms:tags', crudInc, page, limit, search].join(':')).digest('hex');
+    const cacheData = ttl === 0 ? null : JSON.parse(await rclient.get(cacheKey));
+
+    if (cacheData) {
+        return { cache: true, ...cacheData };
+    }
+
+    const mockReply = createMockReply();
+    const result = await getTagsApi({ pg, query: { page, limit, search } }, mockReply);
+
+    if (ttl) {
+        await rclient.set(cacheKey, JSON.stringify(result), 'EX', ttl);
+    }
+
+    return result;
+}

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

@@ -82,7 +82,11 @@ export default async function listMedia(req, reply) {
         Object.assign(result, { rootDir });
     }
 
-    const filteredFiles = (search ? allItems.filter(el => el.name.includes(search)) : items).filter(el => el.isFile());
+    // TODO: Фільтрувати по stats.mtime?
+    const allowedNames = Boolean(query?.filter) || Boolean(q) ? new Set(rows.map(r => r.filename)) : null;
+    const filteredFiles = (search ? allItems.filter(el => el.name.includes(search)) : items)
+        .filter(el => el.isFile())
+        .filter(el => !allowedNames || allowedNames.has(el.name));
 
     const files = await Promise.all(filteredFiles.map(async el => {
         const media = rows.find(row => row.filename === el.name);

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

@@ -21,7 +21,7 @@ export async function translateContent({
         return reply.status(400).send({ error: 'not enough query params: to', code: 400 });
     }
 
-    const { id, collection = 'pages', from = 'uk', to, nocache } = query;
+    const { id, collection = 'pages', from = 'uk', to, nocache, skip } = query;
     const { id: collectionId, table, columns = [] } = await getCollectionId(collection, pg);
 
     if (!collectionId) {
@@ -34,7 +34,7 @@ export async function translateContent({
         return reply.status(400).send({ error: 'collection does not contain any fields with localization enabled', code: 400 });
     }
 
-    const result = await insertContentLocalization({ table, id, from, to, nocache, schemaKeys, user }, pg);
+    const result = await insertContentLocalization({ table, id, from, to, nocache, skip, schemaKeys, user }, pg);
 
     if (result?.error) {
         return reply.status(result.code).send(result);
@@ -80,7 +80,7 @@ export async function translateCollection({
 
         send(`target localization already exists for ${ids.length - filteredIds.length}/${ids.length} rows`);
 
-        await sequence(debug ? filteredIds.slice(0, 1) : filteredIds, { send, pg, from, to, table, nocache: true, schemaKeys, user }, insertContentLocalization);
+        await sequence(debug ? filteredIds.slice(0, 1) : filteredIds, { send, pg, from, to, table, nocache: true, skip, schemaKeys, user }, insertContentLocalization);
         return send('translation complete', true);
     } catch (err) {
         return send(err.toString(), true);

package/server/routes/cms/utils/insertContentLocalization.js

@@ -2,7 +2,7 @@ import { dataInsert, pgClients } from "@opengis/fastify-table/utils.js";
 
 import requestTranslation from "./requestTranslation.js";
 
-export default async function insertContentLocalization({ send = () => { }, table, id, from, to, nocache, schemaKeys, user }, pg = pgClients.client) {
+export default async function insertContentLocalization({ send = () => { }, table, id, from, to, nocache, skip, schemaKeys, user }, pg = pgClients.client) {
     if (!to) {
         const resp = { error: 'not enough query params: to', code: 400 };
         send(resp.error + ': ' + id);
@@ -17,10 +17,13 @@ export default async function insertContentLocalization({ send = () => { }, tabl
         return resp;
     }
 
+    const targetLocalization = await pg.query('select json_object_agg(split_part(field_key,\':\',1),field_value) from site.localization where object_id=$1 and field_key is not null and split_part(field_key,\':\',2)=$2', [row.id, to])
+        .then(el => el.rows?.[0]?.json_object_agg);
+
     const localizationExists = await pg.query('select 1 from site.localization where object_id=$1 and field_key is not null and split_part(field_key,\':\',2)=$2', [row.id, to])
         .then(el => el.rowCount);
 
-    if (localizationExists && !nocache) {
+    if (localizationExists && !nocache && !skip) {
         const resp = { error: 'target localization already exists', code: 400 };
         send(resp.error + ': ' + id);
         return resp;
@@ -38,9 +41,18 @@ export default async function insertContentLocalization({ send = () => { }, tabl
     const obj = { ...row, ...localization };
 
     const entries = Object.entries(obj).filter(([key, value]) => value && schemaKeys.includes(key) && (typeof value === 'string' || (Array.isArray(value) && value?.[0] && typeof value?.[0] === 'object' && Object.keys(value).length)));
-    const skipped = schemaKeys.filter(key => !entries.map(([el]) => el).includes(key));
+    // do not old localization overwrite by default
+    const filteredEntries = skip && targetLocalization ? entries.filter(([key]) => !Object.keys(targetLocalization).includes(key)) : entries;
+
+    if (skip && targetLocalization && !filteredEntries.length) {
+        const resp = { error: 'nothing to localize after skipping of fields with existing localization', code: 400 };
+        send(resp.error + ': ' + id);
+        return resp;
+    }
+
+    const skipped = schemaKeys.filter(key => !filteredEntries.map(([el]) => el).includes(key));
 
-    const { result, error, code = 200 } = await requestTranslation(entries, from, to);
+    const { result, error, code = 200 } = await requestTranslation(filteredEntries, from, to);
 
     if (error && code) {
         send(error + ': ' + id);
@@ -67,6 +79,12 @@ export default async function insertContentLocalization({ send = () => { }, tabl
             console.log('deleted existing localizations: ', deleted, id);
         }
 
+        if (skip) {
+            const deleted = await client.query('delete from site.localization where object_id=$1 and not split_part(field_key,\':\',1)<>any($2)', [id, Object.keys(targetLocalization)]).then(el => el.rowCount || 0);
+            send(`deleted existing localizations1: ${deleted}, ${id}`);
+            console.log('deleted existing localizations1: ', deleted, id);
+        }
+
         await Promise.all(arr.map(async row => dataInsert({
             pg: client,
             table: 'site.localization',

package/server/routes/contentType/controllers/getContentType.js

@@ -23,9 +23,16 @@ export default async function builderGet({ pg = pgClients.client, params = {} },
   ).then(el => el.rows?.[0] || {});
   Object.assign(row, { space });
 
-  const loadTable = params.id === 'pages' ? await getTemplate('table', 'single.default.table') : {};
+  // const loadTable = params.id === 'pages' ? await getTemplate('table', 'single.default.table') : {};
+  // const columns = params.id === 'pages' ? loadTable?.columns : row.columns;
+
+  const loadTable = params.id === 'pages'
+    ? await getTemplate('table', 'single.default.table')
+    : await getTemplate('table', 'collection.default.table');
+  const { columns: defaultColumns = [] } = loadTable || {};
+  defaultColumns.forEach(col => Object.assign(col, { default: true }));
+  const columns = (defaultColumns || []).concat(row.columns.filter(col => !defaultColumns.map(el => el.name).includes(col.name)));
 
-  const columns = params.id === 'pages' ? loadTable?.columns : row.columns;
   Object.assign(row, { columns });
 
   // filter system / hidden

package/server/routes/tags/controllers/get.tags.js

@@ -11,6 +11,6 @@ export default async function getTags(req, reply) {
 
     const { rows } = await pg.query(selectSql);
 
-    return reply.code(200).send({ message: { total, filtered, rows }, status: 200 })
+    return reply.status(200).send({ message: { total, filtered, rows }, status: 200 })
 
 }

package/utils.js

@@ -3,5 +3,6 @@ export { default as getContent } from "./server/functions/getContent.js";
 export { default as getSettings } from "./server/routes/cms/functions/getSettings.js";
 export { default as getUser } from "./server/functions/getUser.js";
 export { default as getSearchData } from "./server/functions/getSearchData.js";
+export { default as getTags } from "./server/functions/getTags.js";
 
 export default null;

package/dist/MonacoEditor.vue_vue_type_script_setup_true_lang-CTKNG0qR.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, createElementBlock as p, openBlock 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) => (v(), p("div", {
-      ref_key: "editorContainer",
-      ref: n,
-      style: w({ width: a.width, height: a.height })
-    }, null, 4));
-  }
-});
-export {
-  C as _
-};