@opengis/cms 0.0.50 → 0.0.51

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

@@ -1,4 +1,6 @@
-import { config, pgClients, getFilterSQL } from '@opengis/fastify-table/utils.js';
+import { pgClients, getFilterSQL } from '@opengis/fastify-table/utils.js';
+
+import additionalData from '../utils/additionalData.js';
 
 const filterList = [
   {
@@ -55,11 +57,12 @@ export default async function searchContent({
   const limit = Math.min(query.limit || 16, maxLimit);
   const offset = (page - 1) * limit;
 
-  const { q } = filter ? await getFilterSQL({
+  const { q } = filter || search ? await getFilterSQL({
     pg,
     table: 'site.contents',
     filter,
     search,
+    searchColumn: 'a.slug,a.title',
     query: `status='published'`,
     filterList,
   }) : { q: `status='published'` };
@@ -121,10 +124,12 @@ export default async function searchContent({
     }[!!asc];
 
     const { optimizedSQL = `SELECT * FROM data."${table}" where status='published' ORDER BY ${order}` } =
-      filter ? await getFilterSQL({
+      filter || search ? await getFilterSQL({
         pg,
         table: `data."${table}"`,
         filter,
+        search,
+        searchColumn: 'slug,title',
         query: `status='published'`,
         filterList: collectionFilters,
         order: 'published_at DESC NULLS LAST'
@@ -141,6 +146,8 @@ export default async function searchContent({
       return { rows: [], /*total: total // totals[`data.${table}`] || totals[`data."${table}"`] || 0*/ };
     });
 
+    // await additionalData(pg, items, locale);
+
     return {
       rows: items.map(el => ({
         ...row,

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/routes/cms/utils/additionalData.js

@@ -22,7 +22,7 @@ export default async function additionalData(pg, rows, locale, fields = '*') {
         const localization = localizations.find(el => el.object_id === row.id);
         const localizationKeys = Object.keys(localization?.json_object_agg || {}).filter(key => row[key.split(':').shift()]);
         const localizationObj1 = Object.entries(localization?.json_object_agg || {}).filter(([key]) => rows.length > 1 ? true : localizationKeys.includes(key)).reduce((acc, curr) => ({ ...acc, [curr[0]]: typeof curr[1] === 'string' && curr[1].startsWith('[') && curr[1].endsWith(']') ? JSON.parse(curr[1]) : curr[1] }), {});
-        const localizationObj = fields?.length ? Object.fromEntries(Object.entries(localizationObj1).filter(([key]) => fields.split(',').includes(key.split(':').shift()))) : localizationObj1;
+        const localizationObj = fields?.length && fields !== '*' ? Object.fromEntries(Object.entries(localizationObj1).filter(([key]) => fields.split(',').includes(key.split(':').shift()))) : localizationObj1;
         if (locale && locale !== 'uk') {
             Object.assign(row, Object.keys(localizationObj).reduce((acc, curr) => ({ ...acc, [curr.replace(`:${locale}`, '')]: localizationObj[curr] }), {}));
         } else if (!locale) {

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-C8cip9Ci.js

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