@opengis/cms 0.0.59 → 0.0.61

package/dist/{contentForm-Buku-lel.js → contentForm-CLStrfSg.js}

@@ -4,7 +4,7 @@ import { ArrowLeft as Je, HelpCircle as He, Settings as Ke, Save as qe, Loader2
 import { useI18n as Qe } from "vue-i18n";
 import { g as We } from "./getField-CpwVE28P.js";
 import { inputs as x, VForm as ue } from "@opengis/form";
-import { notify as F } from "@opengis/core";
+import { notify as P } from "@opengis/core";
 const Xe = [
   {
     key: "title",
@@ -66,16 +66,16 @@ const Xe = [
     ), be = h(
       () => import("./VsPreview-DwETkOpb.js")
     ), he = h(
-      () => import("./CollectionsBreadcrumb-HePNJb-d.js")
+      () => import("./CollectionsBreadcrumb-BCxeRikP.js")
     );
     x["vs-input-custom-datatable"] = fe, x["vs-input-reference"] = de, x["vs-input-texteditor"] = me, x["vs-input-mediaselect"] = E, x["vs-input-file"] = E, x["vs-input-image"] = E, x["vs-input-richtext-md"] = pe, x["vs-input-integer"] = ve, x["vs-input-relation-link"] = ye;
-    const { t: c, locale: G } = Qe(), V = Ue(), d = Oe(), Q = le("cms.menu", null) || le("menu", p([])), _ = p([]), D = p({}), W = p({}), I = p({}), N = p(""), M = p(!0), R = Be(), U = R == null ? void 0 : R.appContext, we = (U == null ? void 0 : U.config.globalProperties) || {}, X = Ee(we, "$settings"), P = m(() => {
+    const { t: r, locale: G } = Qe(), V = Ue(), d = Oe(), Q = le("cms.menu", null) || le("menu", p([])), _ = p([]), D = p({}), W = p({}), I = p({}), N = p(""), M = p(!0), R = Be(), U = R == null ? void 0 : R.appContext, we = (U == null ? void 0 : U.config.globalProperties) || {}, X = Ee(we, "$settings"), B = m(() => {
       var e;
       return ((e = X.value) == null ? void 0 : e.cms) || {};
-    }), ke = m(() => Array.isArray(P.value.locales) ? P.value.locales : []), O = m(
+    }), ke = m(() => Array.isArray(B.value.locales) ? B.value.locales : []), O = m(
       () => ke.value.filter(Boolean)
     ), Y = m(
-      () => P.value.locale || O.value[0] || "uk"
+      () => B.value.locale || O.value[0] || "uk"
     );
     De(
       X,
@@ -114,14 +114,14 @@ const Xe = [
       return Xe.flatMap((t) => {
         const o = {
           ...t,
-          label: c(t.label)
+          label: r(t.label)
         };
         if (!t.localization || e.length === 0)
           return [o];
         const a = e.map((n) => ({
           ...t,
           key: `${t.key}:${n}`,
-          label: `${c(t.label)} (${n})`,
+          label: `${r(t.label)} (${n})`,
           localization: !1
         }));
         return [o, ...a];
@@ -129,21 +129,18 @@ const Xe = [
     }), g = p({}), i = p({
       title: "",
       status: "draft"
-    }), J = p(null), L = p(""), B = m(
-      () => {
-        var e;
-        return (((e = i.value) == null ? void 0 : e.type) || J.value) === "single";
-      }
+    }), J = p(null), L = p(""), F = m(
+      () => J.value === "single"
     ), Te = m(() => {
       const e = [
-        { id: "content", name: c("cms.builder.content") },
-        { id: "seo", name: c("cms.builder.seo") },
-        { id: "tags", name: c("cms.builder.tags") }
+        { id: "content", name: r("cms.builder.content") },
+        { id: "seo", name: r("cms.builder.seo") },
+        { id: "tags", name: r("cms.builder.tags") }
       ];
-      return N.value && e.push({ id: "preview", name: c("cms.builder.preview") }), e;
+      return N.value && e.push({ id: "preview", name: r("cms.builder.preview") }), e;
     }), A = p("content"), ee = m(() => {
-      var s, r, l, k, f, b, y, T, oe;
-      const e = ((s = d.params) == null ? void 0 : s.collection) || ((r = d.params) == null ? void 0 : r.id), t = (l = i.value) == null ? void 0 : l.content_type_id, o = t ? (f = (k = Q.value) == null ? void 0 : k.find((K) => K.id === t)) == null ? void 0 : f.title : null;
+      var s, c, l, k, f, b, y, T, oe;
+      const e = ((s = d.params) == null ? void 0 : s.collection) || ((c = d.params) == null ? void 0 : c.id), t = (l = i.value) == null ? void 0 : l.content_type_id, o = t ? (f = (k = Q.value) == null ? void 0 : k.find((K) => K.id === t)) == null ? void 0 : f.title : null;
       if (o)
         return o;
       if (L.value)
@@ -154,24 +151,24 @@ const Xe = [
       if (a)
         return a;
       const n = (T = d.params) == null ? void 0 : T.id;
-      return B.value && n && e === n && ((oe = i.value) != null && oe.title) ? i.value.title : e === "pages" ? c("cms.articles.title") : e;
+      return F.value && n && e === n && ((oe = i.value) != null && oe.title) ? i.value.title : e === "pages" ? r("cms.articles.title") : e;
     }), Se = m(() => {
       var t, o;
-      const e = B.value ? "cms.builder.editPage" : "cms.builder.editCollection";
-      return ((t = i.value) == null ? void 0 : t.title) || ((o = d.params) != null && o.id ? c(e) : c("cms.articles.createArticle"));
+      const e = F.value ? "cms.builder.editPage" : "cms.builder.editCollection";
+      return ((t = i.value) == null ? void 0 : t.title) || ((o = d.params) != null && o.id ? r(e) : r("cms.articles.createArticle"));
     }), Ve = m(() => {
-      var s, r, l;
-      const e = ((s = d.params) == null ? void 0 : s.collection) || ((r = d.params) == null ? void 0 : r.id), t = (l = d.params) == null ? void 0 : l.id, o = Se.value, a = o === ee.value, n = [
+      var s, c, l;
+      const e = ((s = d.params) == null ? void 0 : s.collection) || ((c = d.params) == null ? void 0 : c.id), t = (l = d.params) == null ? void 0 : l.id, o = Se.value, a = o === ee.value, n = [
         {
-          label: ee.value,
+          label: F.value ? r("cms.navigation.singletons") : ee.value,
           route: `collections/${e}`
         }
       ];
       return t ? n.push({
-        label: a ? c("cms.collections.edit") : o,
+        label: a ? r("cms.collections.edit") : o,
         route: `collections/${e}/${t}`
       }) : n.push({
-        label: c("cms.articles.createArticle"),
+        label: r("cms.articles.createArticle"),
         route: `collections/${e}/create`
       }), n;
     }), Ae = (e) => {
@@ -186,9 +183,9 @@ const Xe = [
           throw new Error("Failed to fetch article");
         const s = await n.json();
         if (_.value = (s == null ? void 0 : s.columns) || [], s != null && s.preview_path && (N.value = s == null ? void 0 : s.preview_path), J.value = (s == null ? void 0 : s.type) || null, s.rows) {
-          let r = s.rows;
-          Array.isArray(r) || (r = [r]), i.value = r[0];
-          const l = ((o = r[0]) == null ? void 0 : o.content_type_id) || e;
+          let c = s.rows;
+          Array.isArray(c) || (c = [c]), i.value = c[0];
+          const l = ((o = c[0]) == null ? void 0 : o.content_type_id) || e;
           if (l) {
             const k = await fetch(`/api/cms-type/${l}`);
             if (k.ok) {
@@ -196,7 +193,7 @@ const Xe = [
               L.value = (f == null ? void 0 : f.title) || (f == null ? void 0 : f.name) || L.value;
             }
           }
-          await ce(), (a = r[0]) != null && a.meta ? g.value = { ...r[0].meta } : g.value = {
+          await ce(), (a = c[0]) != null && a.meta ? g.value = { ...c[0].meta } : g.value = {
             title: "",
             description: "",
             keywords: "",
@@ -249,12 +246,12 @@ const Xe = [
       const e = (t = i.value) == null ? void 0 : t.content_type_id;
       return e ? `/collections/${e}/edit` : null;
     }), ze = () => {
-      var o, a, n;
+      var o, a, n, s;
       if (!H.value)
         return;
       const e = ((o = d.params) == null ? void 0 : o.collection) || ((a = d.params) == null ? void 0 : a.id), t = (n = d.params) == null ? void 0 : n.id;
       if (e && t) {
-        V.push(`/collections/${e}/${t}/edit`);
+        V.push(`/collections/${(s = i.value) == null ? void 0 : s.content_type_id}/edit`);
         return;
       }
       V.push(H.value);
@@ -265,24 +262,24 @@ const Xe = [
       try {
         (await fetch(
           `/api/cms-translate?id=${t}&collection=${e}&to=en&nocache=1`
-        )).ok ? (F({
-          title: c("cms.collections.translateContentSuccess"),
-          message: c("cms.collections.translateContentSuccess"),
+        )).ok ? (P({
+          title: r("cms.collections.translateContentSuccess"),
+          message: r("cms.collections.translateContentSuccess"),
           type: "success"
-        }), await te(e, t)) : F({
-          title: c("cms.collections.translateContentError"),
-          message: c("cms.collections.translateContentError"),
+        }), await te(e, t)) : P({
+          title: r("cms.collections.translateContentError"),
+          message: r("cms.collections.translateContentError"),
           type: "error"
         });
       } finally {
         z.value = !1;
       }
     }, Fe = async (e) => {
-      var r, l, k, f;
-      const t = (r = d.params) == null ? void 0 : r.collection, o = (l = d.params) == null ? void 0 : l.id, a = await D.value.validate();
+      var c, l, k, f;
+      const t = (c = d.params) == null ? void 0 : c.collection, o = (l = d.params) == null ? void 0 : l.id, a = await D.value.validate();
       if (a) {
-        F({
-          title: c("cms.validation"),
+        P({
+          title: r("cms.validation"),
           message: JSON.stringify(a),
           type: "warning"
         });
@@ -322,21 +319,21 @@ const Xe = [
           } catch (y) {
             console.warn("Could not parse response to get ID:", y);
           }
-        F({
-          title: c("cms.common.success"),
-          message: c("cms.common.successMessage"),
+        P({
+          title: r("cms.common.success"),
+          message: r("cms.common.successMessage"),
           type: "success"
         });
       } catch (b) {
-        console.error("Submit error:", b), F({
-          title: c("cms.common.error"),
+        console.error("Submit error:", b), P({
+          title: r("cms.common.error"),
           message: "Помилка збереження",
           type: "error"
         });
       }
     };
     return (e, t) => {
-      var o, a, n, s, r;
+      var o, a, n, s, c;
       return w(), $("div", Ye, [
         u("div", Ze, [
           C(v(he), {
@@ -353,7 +350,7 @@ const Xe = [
                 C(v(Je), { class: "w-5 h-5" })
               ]),
               u("h1", st, j(e.$t(
-                B.value ? "cms.builder.editPage" : "cms.builder.editCollection"
+                F.value ? "cms.builder.editPage" : "cms.builder.editCollection"
               )) + ' "' + j(i.value.title) + '" ', 1),
               u("a", {
                 href: `https://cms.opengis.info/${v(G)}/guides/content/`,
@@ -364,7 +361,7 @@ const Xe = [
               ], 8, ot)
             ]),
             u("div", lt, [
-              H.value && B.value ? (w(), $("button", {
+              H.value && F.value ? (w(), $("button", {
                 key: 0,
                 onClick: ze,
                 type: "button",
@@ -389,7 +386,7 @@ const Xe = [
               (w(!0), $(Ne, null, Me(Te.value, (l) => (w(), $("button", {
                 key: l.id,
                 onClick: (k) => {
-                  A.value = l.id, console.log("cmsSettings:", P.value.value);
+                  A.value = l.id, console.log("cmsSettings:", B.value.value);
                 },
                 class: ne([
                   "inline-flex flex-1 items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm data-[state=active]:bg-blue-50 data-[state=active]:text-blue-700 data-[state=active]:border-blue-200",
@@ -476,7 +473,7 @@ const Xe = [
         ])) : S("", !0),
         A.value === "preview" ? (w(), $("div", bt, [
           C(v(be), {
-            slug: (r = i.value) == null ? void 0 : r.slug,
+            slug: (c = i.value) == null ? void 0 : c.slug,
             preview_path: N.value
           }, null, 8, ["slug", "preview_path"])
         ])) : S("", !0)

package/dist/index.js

@@ -3,12 +3,12 @@ import { useRoute as $, routeLocationKey as K } from "vue-router";
 const O = "menu", B = (s, c, a) => {
   const o = s == null ? void 0 : s.trim(), l = a == null ? void 0 : a.trim();
   return o ? o === O ? c ? c === "create" ? { type: "createMenu", collection: o } : { type: "editMenu", collection: o, id: c } : { type: "menu", collection: o } : l === "edit" && c ? { type: "editCollection", collection: o, id: c } : c === "edit" ? { type: "editCollection", collection: o } : c ? c === "create" ? { type: "createArticle", collection: o } : { type: "editArticle", collection: o, id: c } : { type: "articles", collection: o } : { type: "collections" };
-}, R = u(() => import("./CollectionsPage-DHfPNql6.js")), L = u(() => import("./ArticlesPage-BjYzvTWM.js")), C = u(() => import("./contentForm-Buku-lel.js")), N = u(() => import("./EditCollectionPage-CqYHpEON.js")), W = u(
-  () => import("./MenuPage-3W6jZ15H.js")
+}, R = u(() => import("./CollectionsPage-DHfPNql6.js")), L = u(() => import("./ArticlesPage-CFjE_cw_.js")), C = u(() => import("./contentForm-CLStrfSg.js")), N = u(() => import("./EditCollectionPage-3Q57ptN3.js")), W = u(
+  () => import("./MenuPage-BCZB_S8j.js")
 ), j = u(
-  () => import("./MenuItemPage-B7Y9KFyb.js")
+  () => import("./MenuItemPage-BoJw885D.js")
 ), F = u(
-  () => import("./MenuAddPage-QTnwCoGh.js")
+  () => import("./MenuAddPage-D-p3gFgm.js")
 ), S = {
   collections: R,
   articles: L,
@@ -96,7 +96,7 @@ const O = "menu", B = (s, c, a) => {
     });
     return M(K, b), (e, n) => v.value ? (g(), k(x(v.value), { key: w.value })) : (g(), E("div", V, D(e.$t("cms.navigation.collections")), 1));
   }
-}), H = u(() => import("./Dashboard-CXkg_pk8.js")), J = u(() => import("./MenuWrapper-OrOv6sOb.js")), Q = q;
+}), H = u(() => import("./Dashboard-C1eGscNd.js")), J = u(() => import("./MenuWrapper-AZ_8s-zd.js")), Q = q;
 export {
   Q as Content,
   H as Dashboard,

package/dist/{vs-builder-monaco-Cw-f19gc.js → vs-builder-monaco-B3Jj0V31.js}

@@ -1,5 +1,5 @@
 import { ref as l, useModel as m, onMounted as u, openBlock as r, createElementBlock as d, createVNode as i, createCommentVNode as s } from "vue";
-import { _ as c } from "./MonacoEditor.vue_vue_type_script_setup_true_lang-C8cip9Ci.js";
+import { _ as c } from "./MonacoEditor.vue_vue_type_script_setup_true_lang-B1DrxmQX.js";
 const g = {
   __name: "vs-builder-monaco",
   props: {

package/package.json

@@ -1,69 +1,69 @@
-{
-  "name": "@opengis/cms",
-  "version": "0.0.59",
-  "description": "cms",
-  "type": "module",
-  "author": "Softpro",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "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 admin",
-    "build:lib": "vue-tsc -p tsconfig.build.json --noEmit && vite build && npm run build:types",
-    "build:types": "vue-tsc -p tsconfig.types.json",
-    "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",
-    "lemken": "bun --env-file=.env.local-lemken 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"
-  },
-  "resolutions": {
-    "rollup": "4.30.0"
-  },
-  "devDependencies": {
-    "@fastify/compress": "^8.1.0",
-    "@opengis/core": "^0.0.30",
-    "@opengis/fastify-table": "^2.0.147",
-    "@opengis/filter": "^0.1.31",
-    "@opengis/form": "^0.0.121",
-    "@tailwindcss/typography": "0.5.10",
-    "@tsconfig/node22": "^22.0.2",
-    "@vitejs/plugin-vue": "5.0.4",
-    "@vueuse/head": "2.0.0",
-    "autoprefixer": "10.4.18",
-    "eslint": "8.49.0",
-    "js-yaml": "^4.1.0",
-    "lucide-vue-next": "^0.564.0",
-    "postcss": "8.4.35",
-    "sass": "^1.92.1",
-    "tailwindcss": "3.4.1",
-    "typescript": "~5.8.0",
-    "vite": "5.1.4",
-    "vitest": "3.2.4",
-    "vue": "^3.5.17",
-    "vue-i18n": "11.1.5",
-    "vue-router": "4.4.3",
-    "vue-tsc": "^2.2.10",
-    "vuedraggable": "4.1.0"
-  }
-}
+{
+  "name": "@opengis/cms",
+  "version": "0.0.61",
+  "description": "cms",
+  "type": "module",
+  "author": "Softpro",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "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 admin",
+    "build:lib": "vue-tsc -p tsconfig.build.json --noEmit && vite build && npm run build:types",
+    "build:types": "vue-tsc -p tsconfig.types.json",
+    "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",
+    "lemken": "bun --env-file=.env.local-lemken 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"
+  },
+  "resolutions": {
+    "rollup": "4.30.0"
+  },
+  "devDependencies": {
+    "@fastify/compress": "^8.1.0",
+    "@opengis/core": "^0.0.30",
+    "@opengis/fastify-table": "^2.0.147",
+    "@opengis/filter": "^0.1.31",
+    "@opengis/form": "^0.0.121",
+    "@tailwindcss/typography": "0.5.10",
+    "@tsconfig/node22": "^22.0.2",
+    "@vitejs/plugin-vue": "5.0.4",
+    "@vueuse/head": "2.0.0",
+    "autoprefixer": "10.4.18",
+    "eslint": "8.49.0",
+    "js-yaml": "^4.1.0",
+    "lucide-vue-next": "^0.564.0",
+    "postcss": "8.4.35",
+    "sass": "^1.92.1",
+    "tailwindcss": "3.4.1",
+    "typescript": "~5.8.0",
+    "vite": "5.1.4",
+    "vitest": "3.2.4",
+    "vue": "^3.5.17",
+    "vue-i18n": "11.1.5",
+    "vue-router": "4.4.3",
+    "vue-tsc": "^2.2.10",
+    "vuedraggable": "4.1.0"
+  }
+}

package/server/migrations/fixes.sql

@@ -1,10 +1,13 @@
 create schema if not exists site;
 
-ALTER TABLE if exists site.spaces add column if not exists locales text[];
+/*ALTER TABLE if exists site.spaces add column if not exists locales text[];
 ALTER TABLE IF exists site.spaces add column if not exists default_locale text;
 ALTER TABLE if exists site.spaces alter column default_locale set default 'ua';
 update site.spaces set default_locale = 'ua' where default_locale is null;
-ALTER TABLE if exists site.spaces alter column default_locale set not null;
+ALTER TABLE if exists site.spaces alter column default_locale set not null;*/
+-- uncomment after a while or leave old data as is
+/* --- alter table site.contents drop column if exists space_id;
+drop table if exists site.spaces cascade; */
 
 ALTER TABLE if exists site.media ADD COLUMN IF NOT EXISTS subdir TEXT;
 COMMENT ON COLUMN site.media.subdir is 'Піддиректорія';

package/server/migrations/site.sql

@@ -271,7 +271,7 @@ COMMENT ON COLUMN site.tokens.token_type IS 'Type of token, such as CMA or PAT.'
 COMMENT ON COLUMN site.tokens.token_status IS 'Current status of the token (e.g., Active).';
 COMMENT ON COLUMN site.tokens.space_id IS 'Identifier for the associated space.';
 
-CREATE TABLE if not exists site.spaces (
+/*CREATE TABLE if not exists site.spaces (
     space_id text PRIMARY KEY default next_id(), -- Unique identifier for the space
     name TEXT NOT NULL, -- Human-readable name of the space
     created_at TIMESTAMP NOT NULL default now(), -- When the space was created
@@ -296,6 +296,7 @@ COMMENT ON COLUMN site.spaces.default_locale IS 'Default language/locale of the
 COMMENT ON COLUMN site.spaces.plan IS 'Plan type (e.g., "Free", "Premium")';
 
 alter table site.spaces alter column default_locale set default 'uk';
+*/
 
 CREATE TABLE if not exists site.organizations (
     organization_id TEXT PRIMARY KEY DEFAULT next_id(), -- Unique identifier for the organization
@@ -348,7 +349,7 @@ COMMENT ON COLUMN site.comments.thread_id IS 'ID of the top-level thread this co
 
 CREATE TABLE if not exists site.contents (
     content_id text PRIMARY KEY default next_id(),
-    space_id text,
+    -- space_id text,
     content_type_id text NOT NULL,
     created_at TIMESTAMP NOT NULL DEFAULT now(),
     updated_at TIMESTAMP NOT NULL DEFAULT now(),
@@ -363,7 +364,7 @@ CREATE TABLE if not exists site.contents (
     updated_by text,
     meta json,
     main_image text,
-    FOREIGN KEY (space_id) REFERENCES site.spaces(space_id),
+    -- FOREIGN KEY (space_id) REFERENCES site.spaces(space_id),
     FOREIGN KEY (content_type_id) REFERENCES site.content_types(content_type_id),
     FOREIGN KEY (created_by) REFERENCES admin.users(uid),
     FOREIGN KEY (published_by) REFERENCES admin.users(uid),

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

@@ -11,15 +11,15 @@ export default async function deleteContent(req, reply) {
     const { type, id } = params;
 
     if (!type) {
-        return reply.status(400).send('not enough params: type');
+        return reply.status(400).send({ error: 'not enough params: type', code: 400 });
     }
 
     if (!id) {
-        return reply.status(400).send('not enough params: id');
+        return reply.status(400).send({ error: 'not enough params: id', code: 400 });
     }
 
     if (id === 'pages') {
-        return reply.status(403).send('access restricted: pages contents cannot be deleted');
+        return reply.status(403).send({ error: 'access restricted: pages contents cannot be deleted', code: 403 });
     }
 
     const { ctid, dbtable } = await pg.query('select content_type_id as ctid, table_name as dbtable from site.content_types where $1 in (content_type_id, name)', [params.type])
@@ -30,7 +30,7 @@ export default async function deleteContent(req, reply) {
         where a.relam=2 and b.nspname='data'`).then(el => el.rows?.[0]?.array_agg || []) : [];
 
     if (!arr.length && type !== 'pages') {
-        return reply.status(400).send('empty schema: data');
+        return reply.status(400).send({ error: 'empty schema: data', code: 400 });
     }
 
     const table = arr.find(el => el === params.type);
@@ -47,11 +47,11 @@ export default async function deleteContent(req, reply) {
             ).then(el => el.rows?.[0] || {});
 
         if (!cid) {
-            return reply.status(404).send('contents not found');
+            return reply.status(404).send({ error: 'contents not found', code: 404 });
         }
 
         if (cid === 'pages') {
-            return reply.status(403).send('access restricted: pages contents cannot be deleted');
+            return reply.status(403).send({ error: 'access restricted: pages contents cannot be deleted', code: 403 });
         }
 
         if (status === 'archived') {
@@ -81,7 +81,7 @@ export default async function deleteContent(req, reply) {
 
     // custom table
     if (!table && !dbtable) {
-        return reply.status(400).send('invalid params: type');
+        return reply.status(400).send({ error: 'invalid params: type', code: 400 });
     }
 
     const status = await pg.query(`select status from data."${(table || dbtable)}" where id =$1`, [id]).then(el => el.rows?.[0]?.status);

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

@@ -57,11 +57,11 @@ export default async function getContent(req, reply, opt) {
     ).then(el => el.rows?.[0]?.isvalid);
 
     if (!config.local && !isValidToken && config.mode !== 'cms' && !called) {
-        return reply.status(403).send('access restricted: token');
+        return reply.status(403).send({ error: 'access restricted: token', code: 403 });
     }
 
     if (!type) {
-        return reply.status(400).send('not enough params: type');
+        return reply.status(400).send({ error: 'not enough params: type', code: 400 });
     }
 
     const { contentId, contentTypeId, meta } = params.type === 'pages'
@@ -69,7 +69,7 @@ export default async function getContent(req, reply, opt) {
         : await pg.query(`select content_id as "contentId", content_type_id as "contentTypeId", meta from site.contents where $1 in (slug, content_id, content_type_id)`, [params.type]).then(el => el.rows?.[0] || {});
 
     if (!contentId) {
-        return reply.status(404).send('content not found');
+        return reply.status(404).send({ error: 'content not found', code: 404 });
     }
 
     const { table, contentType, preview, columns: columns1 } = await pg.query(
@@ -78,7 +78,7 @@ export default async function getContent(req, reply, opt) {
     ).then(el => el.rows?.[0] || {});
 
     if (!contentType && params.type !== 'pages') {
-        return reply.status(404).send('content type not found');
+        return reply.status(404).send({ error: 'content type not found', code: 404 });
     }
 
     const loadTable = contentType === 'collection' && table
@@ -86,7 +86,7 @@ export default async function getContent(req, reply, opt) {
         : await getTemplate('table', 'single.default.table');
     const { columns: defaultColumns = [], filters: defaultFilters = [] } = loadTable || {};
 
-    defaultColumns.forEach(col => Object.assign(col, { default: true }));
+    defaultColumns.forEach(col => Object.assign(col, { defaultColumn: true }));
 
     const columns = (columns1 || []).filter(col => !defaultColumns.map(el => el.name).includes(col.name));
 
@@ -105,7 +105,7 @@ export default async function getContent(req, reply, opt) {
     }
 
     if (result?.message) {
-        return reply.status(result.status || 500).send(result.message);
+        return reply.status(result.status || 500).send({ error: result.message, code: result.status || 500 });
     }
 
     Object.assign(result, { meta });

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

@@ -4,11 +4,11 @@ import inputTypes from '../utils/inputTypes.js';
 
 export default async function getContentBySlug({ pg = pgClients.client, params = {}, headers = {} }, reply) {
   if (!params.slug) {
-    return reply.status(400).send('not enough params: slug');
+    return reply.status(400).send({ error: 'not enough params: slug', code: 400 });
   }
 
   if (!pg?.pk?.['site.content_types']) {
-    return reply.status(404).send('table not found');
+    return reply.status(404).send({ error: 'table not found', code: 404 });
   }
 
   // headers.authorization = 'Bearer tokenExample'
@@ -18,18 +18,18 @@ export default async function getContentBySlug({ pg = pgClients.client, params =
   ).then(el => el.rows?.[0]?.isvalid);
 
   if (!config.local && !isValidToken && config.mode !== 'cms') {
-    return reply.status(403).send('access restricted: token');
+    return reply.status(403).send({ error: 'access restricted: token', code: 403 });
   }
 
-  const { cid } = await pg.query(
-    `select content_id as cid from site.contents where $1 in (content_id,slug) limit 1`,
+  const cid = await pg.query(
+    `select content_id from site.contents where $1 in (content_id,slug) limit 1`,
     [params.slug],
-  ).then(el => el.rows?.[0] || {});
+  ).then(el => el.rows?.[0]?.content_id);
 
   if (cid) {
-    const { rows: data = [] } = await pg.query(
+    const data = await pg.query(
       `select field_key, field_type, field_value, field_value_object, content_id from site.content_data where content_id=$1`, [cid]
-    );
+    ).then(el => el.rows || []);
 
     const meta = await pg.query(
       'select title, status, revision, locale, slug, content_type_id, (select columns from site.content_types where content_type_id=a.content_type_id limit 1) as columns from site.contents a where content_id=$1 limit 1',
@@ -63,7 +63,7 @@ export default async function getContentBySlug({ pg = pgClients.client, params =
   const { rows: contentTypes = [] } = await pg.query(`select content_type_id as ctid, table_name as table, type from site.content_types where table_name is not null and type='collection' `);
 
   if (!contentTypes.length || contentTypes.find(row => row.table && pg.pk[row.table])) {
-    return reply.status(404).send('content not found');
+    return reply.status(404).send({ error: 'content not found', code: 404 });
   }
 
   const tlist = await pg.query(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist 
@@ -74,20 +74,20 @@ export default async function getContentBySlug({ pg = pgClients.client, params =
   const { dataid, ctid } = await pg.query(q).then(el => el.rows?.[0] || {});
 
   if (!dataid) {
-    return reply.status(404).send('content not found: 2');
+    return reply.status(404).send({ error: 'content not found: 2', code: 404 });
   }
 
   if (!ctid) {
-    return reply.status(404).send('content not found: 3');
+    return reply.status(404).send({ error: 'content not found: 3', code: 404 });
   }
 
   const meta = await pg.query('select content_type_id, type, table_name as table, title, status, name as slug, columns from site.content_types where content_type_id=$1', [ctid]).then(el => el.rows?.[0] || {});
 
   if (!meta?.table) {
-    return reply.status(404).send('content not found: 4');
+    return reply.status(404).send({ error: 'content not found: 4', code: 404 });
   }
 
-  const { rows = [] } = await pg.query(`select * from data.${meta.table} where id=$1`, [dataid]);
+  const rows = await pg.query(`select * from data.${meta.table} where id=$1`, [dataid]).then(el => el.rows || []);
 
   return reply.status(200).send({ ...meta, custom: true, rows });
 }