@opengis/cms 0.0.16 → 0.0.18

package/module/cms/table/collection.default.table.json

@@ -0,0 +1,102 @@
+{
+    "table": "site.contents",
+    "columns": [
+        {
+            "label": "Slug",
+            "name": "slug",
+            "parent": "title",
+            "required": true,
+            "type": "slug"
+        },
+        {
+            "label": "Title",
+            "name": "title",
+            "required": true,
+            "type": "text",
+            "localization": true
+        },
+        {
+            "label": "Status",
+            "name": "status",
+            "type": "select",
+            "data": "content.status",
+            "options": [
+                {
+                    "id": "draft",
+                    "text": "Draft"
+                },
+                {
+                    "id": "published",
+                    "text": "Published"
+                },
+                {
+                    "id": "archived",
+                    "text": "Archived"
+                },
+                {
+                    "id": "delayPublished",
+                    "text": "Delay Published"
+                }
+            ],
+            "required": true
+        },
+        {
+            "label": "Publish at",
+            "name": "published_at",
+            "required": true,
+            "type": "datetime"
+        },
+        {
+            "label": "Зображення",
+            "name": "main_image",
+            "type": "mediaselect"
+        }
+    ],
+    "filters": [
+        {
+            "extra": false,
+            "id": "status",
+            "name": "status",
+            "title": "Статус",
+            "type": "Check",
+            "data": "content.status",
+            "ua": "Статус"
+        },
+        {
+            "extra": false,
+            "label": "Publish at",
+            "name": "published_at",
+            "type": "Date"
+        },
+        {
+            "extra": false,
+            "label": "Закріплені",
+            "name": "is_pin",
+            "type": "Check"
+        },
+        {
+            "extra": false,
+            "name": "tag_list",
+            "type": "Tags",
+            "sql": "id in (select b.data_id from site.tags a left join site.tag_data b on a.tag_id=b.tag_id where a.tag_id=any($1))",
+            "label": "Теги"
+        },
+        {
+            "extra": false,
+            "columns": "slug,title",
+            "id": "search",
+            "name": "search",
+            "placeholder": "Пошук по тексту",
+            "title": "Пошук по тексту",
+            "type": "Text"
+        },
+        {
+            "extra": false,
+            "id": "created_at",
+            "name": "created_at",
+            "title": "Дата створення",
+            "type": "Date",
+            "ua": "Дата створення"
+        }
+    ]
+}

package/module/cms/table/single.default.table.json

@@ -0,0 +1,115 @@
+{
+    "table": "site.contents",
+    "columns": [
+        {
+            "label": "Slug",
+            "name": "slug",
+            "parent": "title",
+            "required": true,
+            "type": "slug"
+        },
+        {
+            "label": "Title",
+            "name": "title",
+            "required": true,
+            "type": "text",
+            "localization": true
+        },
+        {
+            "label": "Status",
+            "name": "status",
+            "type": "select",
+            "data": "content.status",
+            "options": [
+                {
+                    "id": "draft",
+                    "text": "Draft"
+                },
+                {
+                    "id": "published",
+                    "text": "Published"
+                },
+                {
+                    "id": "archived",
+                    "text": "Archived"
+                },
+                {
+                    "id": "delayPublished",
+                    "text": "Delay Published"
+                }
+            ],
+            "required": true
+        },
+        {
+            "label": "Publish at",
+            "name": "published_at",
+            "required": true,
+            "type": "datetime"
+        },
+        {
+            "label": "Контент",
+            "name": "single_body",
+            "type": "richtext",
+            "localization": true
+        },
+        {
+            "name": "single_sections",
+            "label": "Секції",
+            "type": "reference",
+            "localization": true
+        },
+        {
+            "label": "Зображення",
+            "name": "main_image",
+            "type": "mediaselect"
+        }
+    ],
+    "filters": [
+        {
+            "extra": false,
+            "id": "status",
+            "name": "status",
+            "title": "Статус",
+            "type": "Check",
+            "data": "content.status",
+            "ua": "Статус"
+        },
+        {
+            "extra": false,
+            "label": "Publish at",
+            "name": "published_at",
+            "type": "Date"
+        },
+        {
+            "extra": false,
+            "label": "Контент",
+            "name": "single_body",
+            "sql": "content_id in (select object_id from site.content_data where field_key='single_body' and field_value ~ $1)",
+            "type": "Text"
+        },
+        {
+            "extra": false,
+            "name": "tag_list",
+            "type": "Tags",
+            "sql": "content_id in (select b.data_id from site.tags a left join site.tag_data b on a.tag_id=b.tag_id where a.tag_id=any($1))",
+            "label": "Теги"
+        },
+        {
+            "extra": false,
+            "columns": "slug,title",
+            "id": "search",
+            "name": "search",
+            "placeholder": "Пошук по тексту",
+            "title": "Пошук по тексту",
+            "type": "Text"
+        },
+        {
+            "extra": false,
+            "id": "created_at",
+            "name": "created_at",
+            "title": "Дата створення",
+            "type": "Date",
+            "ua": "Дата створення"
+        }
+    ]
+}

package/package.json

@@ -1,64 +1,69 @@
 {
   "name": "@opengis/cms",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "cms",
   "type": "module",
   "author": "Softpro",
   "main": "dist/cms.js",
+
   "license": "EULA",
   "files": [
     "dist/*",
+    "module/*",
+    "src/index.ts",
     "server",
     "plugin.js"
   ],
   "scripts": {
     "test": "node --test test/**/*.test.js",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "build": "cross-env APP=true vite build",
+    "build": "vite build",
+    "proxy": "vite dev",
     "build-npm": "vite build",
-    "start": "node server",
-    "prod": "cross-env NODE_ENV=production node server --cms=cms/softpro",
-    "prod-ip": "cross-env NODE_ENV=production node server --cms=cms/ip",
-    "dev": "node server --cms=cms/softpro"
+    "start": "bun --env-file=.env.ip server",
+    "prod-ip1": "node server --config=ip ",
+    "prod-softpro1": "node server --config=softpro",
+    "prod": "NODE_ENV=production bun --env-file=.env.ip  server ",
+    "prod-ip": "PORT=3019 node server --config=ip",
+    "prod-ip-test": "PORT=3025 node server --config=ip",
+    "dev": "node server --config=softpro",
+    "debug": "bun --watch server --config=softpro",
+    "ip-test": "node server --config=ip-test",
+    "ip": "node --env-file=.env.ip server",
+    "demo": "node --env-file=.env.demo --env-file=.env server",
+    "i18n:sync": "node i18n-sync.cjs",
+    "softpro": "bun --env-file=.env.softpro server"
   },
   "dependencies": {
-    "@opengis/admin": "0.4.4",
-    "@opengis/fastify-auth": "1.1.0",
-    "@opengis/fastify-file": "1.1.2",
-    "@opengis/fastify-table": "1.4.5",
-    "@opengis/v3-core": "0.3.190",
-    "@opengis/v3-filter": "0.0.74",
-    "@vitejs/plugin-vue": "5.0.4",
-    "@vueuse/core": "10.9.0",
+    "@fastify/compress": "^8.1.0",
+    "@opengis/core": "^0.0.30",
+    "@opengis/fastify-table": "^2.0.118",
+    "@opengis/filter": "^0.1.10",
+    "@opengis/form": "^0.0.70",
+    "@opengis/richtext": "0.0.38",
     "@vueuse/head": "2.0.0",
-    "cross-env": "7.0.3",
-    "fastify": "5.3.3",
-    "fastify-plugin": "5.0.1",
+    "js-yaml": "^4.1.0",
     "lucide-vue-next": "0.344.0",
-    "moment": "2.30.1",
-    "pinia": "3.0.2",
     "vite": "5.1.4",
-    "vue": "3.5.13",
+    "vue": "^3.5.17",
     "vue-i18n": "11.1.5",
-    "vue-router": "4.4.3"
+    "vue-router": "4.4.3",
+    "vuedraggable": "4.1.0"
   },
-  "overrides": {
-    "@opengis/fastify-table": "1.4.5"
+  "resolutions": {
+    "rollup": "4.30.0"
   },
   "devDependencies": {
-    "@parcel/watcher": "2.4.1",
     "@tailwindcss/typography": "0.5.10",
-    "@types/node": "20.11.25",
+    "@tsconfig/node22": "^22.0.2",
     "@vitejs/plugin-vue": "5.0.4",
     "autoprefixer": "10.4.18",
     "eslint": "8.49.0",
-    "eslint-config-airbnb": "19.0.4",
-    "eslint-plugin-import": "2.25.3",
-    "eslint-plugin-vue": "9.17.0",
     "postcss": "8.4.35",
+    "sass": "^1.92.1",
     "tailwindcss": "3.4.1",
-    "typescript": "5.2.2",
-    "vite": "5.1.4",
-    "vue-tsc": "1.8.27"
+    "typescript": "~5.8.0",
+    "vitest": "3.2.4",
+    "vue-tsc": "^2.2.10"
   }
 }

package/plugin.js

@@ -2,35 +2,75 @@ import path from 'node:path';
 import { fileURLToPath } from 'url';
 import { existsSync, readFileSync } from 'node:fs';
 
-import { config, execMigrations } from '@opengis/fastify-table/utils.js';
+import { config, execMigrations, getPGAsync } from '@opengis/fastify-table/utils.js';
+import { table } from 'node:console';
 
 const dirname = path.dirname(fileURLToPath(import.meta.url));
 
-// cross-env cms=cms/softpro npm start
-if (process.argv.find(el => el.includes('--cms'))) {
-  const subdir = process.argv.find(el => el.includes('--cms')).substring(6);
-  const cmsDir = path.join(dirname, '..', subdir).replace(/\\/g, '/'); // from app.js
-
-  const cmsConfig = existsSync(path.join(cmsDir, 'setting.json'))
-    ? JSON.parse(readFileSync(path.join(cmsDir, 'setting.json'), 'utf8'))
+// node server --config=softpro
+console.log(process.argv);
+if (process.argv.find(el => el.includes('--config'))) {
+  const filename = process.argv.find(el => el.includes('--config')).split('=').pop();
+  const cmsConfig = existsSync(`config/${filename}.json`)
+    ? JSON.parse(readFileSync(`config/${filename}.json`, 'utf8'))
     : {};
 
-  config.auth = config.auth || cmsConfig.auth;
-  config.pg = cmsConfig.pg;
-  config.cms = cmsConfig.cms || {};
-  config.cms.root = cmsDir;
-  config.folder = path.posix.join(config.folder || '', config.cms.folder || subdir);
+  console.log('cms init', cmsConfig.pg?.database);
+  Object.keys(cmsConfig).forEach(key => {
+    config[key] = cmsConfig[key];
+  });
+  config.spacename = 'default' || cmsConfig.name || filename;
+} else {
+  config.spacename = 'default' || config.spacename || process.env.NODE_ENV; // --env.file=.env.ip
 }
 
-export default async function (app, opts = config) {
-  const { prefix = '/api' } = opts;
-  if (!opts.pg || opts.cms?.provider === 'file') {
-    app.register(import('./server/routes/fileContent/index.mjs'), { prefix });
-  } else {
-    app.register(import('./server/routes/cms/index.mjs'), { prefix });
-    app.register(import('./server/routes/contentType/index.mjs'), { prefix });
-    app.register(import('./server/routes/category/index.mjs'), { prefix });
-    const pg = await getPGAsync(opts.pg);
-    execMigrations(path.join(dirname, 'migrations'), pg).catch(err => console.log(err));
+const { prefix = '/api' } = config;
+
+export default async function (app) {
+  app.register(import('./server/routes/menu/index.mjs'), { prefix });
+  app.register(import('./server/routes/migration/index.mjs'), { prefix });
+  app.register(import('./server/routes/cms/index.mjs'), { prefix });
+  app.register(import('./server/routes/cmsSpace/index.mjs'), { prefix });
+  app.register(import('./server/routes/contentType/index.mjs'), { prefix });
+  app.register(import('./server/routes/category/index.mjs'), { prefix });
+  app.register(import('./server/routes/tags/index.mjs'), { prefix });
+  app.register(import('./server/routes/logs/index.mjs'), { prefix });
+  app.register(import('./server/routes/feedback/index.mjs'), { prefix });
+  const pg = await getPGAsync(config.pg);
+  execMigrations(path.join(dirname, 'server/migrations'), pg).catch(err => console.log(err));
+  if (pg?.pk?.['site.content_types']) {
+    const customTables = await pg.query('select array_agg(table_name) from site.content_types where table_name is not null').then(el => el.rows?.[0]?.array_agg || []).catch(err => console.log(err));
+
+    await Promise.all(customTables.filter(table => pg.pk?.[`data.${table}`])?.map(async (table) => {
+      await pg.query(`alter table data.${table} add column if not exists meta json`).catch(err => console.log(err));
+      await pg.query(`alter table data.${table} add column if not exists main_image text`).catch(err => console.log(err));
+      await pg.query(`update site.content_types
+      SET columns = columns::jsonb || jsonb_build_object('name', 'main_image', 'type', 'image', 'label', 'Зображення')
+      WHERE not EXISTS (
+        SELECT 1
+        FROM jsonb_array_elements(columns::jsonb) AS obj(elem)
+        JOIN LATERAL jsonb_each_text(elem) AS kv(key, value) ON true
+        WHERE key = 'name' and value='main_image'
+      )`);
+      await pg.query(`alter table data.${table} add column if not exists published_at timestamp without time zone not null default now()`).catch(err => console.log(err));
+      await pg.query(`alter table data.${table} add column if not exists is_pin boolean DEFAULT false`).catch(err => console.log(err));
+      await pg.query(`alter table data.${table} drop column if exists publish_at`).catch(err => console.log(err));
+    }));
+
+
+
+    /*customTables.filter(table => pg.pk?.[`data.${table}`])?.forEach(table => pg.query(`alter table data.${table} add column if not exists meta json`).catch(err => console.log(err)));
+    customTables.filter(table => pg.pk?.[`data.${table}`])?.forEach(table => pg.query(`alter table data.${table} add column if not exists published_at timestamp without time zone not null default now()`).catch(err => console.log(err)));
+    customTables.filter(table => pg.pk?.[`data.${table}`])?.forEach(table => pg.query(`alter table data.${table} add column if not exists is_pin boolean DEFAULT false`).catch(err => console.log(err)));*/
+
+
+  }
+  /* if (pg?.pk?.['site.content_types'] && pg?.pk?.['site.contents']) {
+    await pg.query('insert into site.contents(content_type_id, space_id, locale) select content_type_id, $1, $2 from site.content_types where content_type_id not in (select content_type_id from site.contents)', [config.spacename || 'default', config.locale || 'ua']).catch(err => {
+      console.log(err.toString());
+    });
   }
+  if (pg?.pk?.['site.spaces']) {
+    pg.query('insert into site.spaces(space_id, name) values($1, $1) on conflict(space_id) do nothing', [config.spacename || 'default']).catch(err => console.error('spaces insert error', err.toString())); // for content site.spaces
+  } */
 }

package/server/app.js

@@ -1,18 +1,35 @@
-import { config } from '@opengis/fastify-table/utils.js';
+import { config, addHook } from '@opengis/fastify-table/utils.js';
 
+config.rateLimit = false;
 config.prefix = config.prefix || '/api';
+config.mode = config.mode || 'cms';
+// config.auth.oneUser = true;
+config.auth = config.auth || {};
+config.auth['2fa'] = config.auth['2fa'] || {};
+config.auth['2fa'].prefix = config.auth['2fa'].prefix || 'cms';
+config.auth['2fa'].sufix = config.auth['2fa'].sufix || 'login';
+
+// when frontend is implemented/used
+// config.auth.loginPage = true; // disable core loginPage api, use vue component instead
+// config.auth.link = config.auth.link || { '2fa': { login: '/2fa' } };
 
 export default async function (app) {
   // core
+  app.register(import('@fastify/compress'), { encodings: ['br', 'gzip'], });
   app.register(import('./plugins/adminHook.js'));
   app.register(import('./plugins/hook.js'));
 
   app.register(import('@opengis/fastify-table'), config);
-  // fastify.register(import('@opengis/fastify-auth'), config);
-  app.register(import('@opengis/fastify-file'), config);
 
   app.register(import('./plugins/vite.js'));
   // API
   app.register(import('./routes/root.mjs'));
   app.register(import('../plugin.js'));
+
+  addHook('errorMessage', (params) => {
+    if (params?.constraint && params.constraint === 'content_data_content_id_fkey') {
+      return 'Перед видаленням даного типу контенту, необхідно видалити всі дані, що до нього відносяться.';
+    }
+    return params?.message || 'Помилка API';
+  });
 }

package/server/functions/getDraftKey.js

@@ -0,0 +1,22 @@
+import { randomUUID } from "node:crypto";
+
+import { config, getRedis } from "@opengis/fastify-table/utils.js";
+
+const rclient = getRedis();
+const redisKey = [config.pg?.database, "draftKey"].filter(Boolean).join(":");
+
+// allow users to view content in draft status if passed as query param
+export default async function getDraftKey(nocache = false) {
+  const cacheKey = await rclient.get(redisKey);
+  const ttl = await rclient.ttl(redisKey) || 0;
+
+  if (cacheKey && !nocache) {
+    return { draftKey: cacheKey, ttl: (ttl / 60).toFixed(0) + " minutes" };
+  }
+
+  const draftKey = randomUUID().replace(/-/g, "").substring(0, 10);
+
+  // refresh every hour
+  await rclient.set(redisKey, draftKey, "EX", 60 * 60);
+  return { draftKey };
+}

package/server/index.js

@@ -1,12 +1,11 @@
 import Fastify from 'fastify';
 
-
 import appService from './app.js';
 
 import { config, logger } from '@opengis/fastify-table/utils.js';
 
 // Instantiate Fastify with some config
-const app = Fastify({ loggerInstance: logger });
+const app = Fastify({ loggerInstance: logger, maxParamLength: config.maxParamLength || 500 });
 
 // Register your application as a normal plugin.
 
@@ -17,7 +16,7 @@ process.env.PORT = process.env.PORT || config.port || 3000;
 app.listen({ host: '0.0.0.0', port: process.env.PORT }, (err) => {
   if (err) {
     console.error(err.toString());
-    app.log.error(err);
+    logger.error(err);
     process.exit(1);
   }
 });

package/server/migrations/fixes.sql

@@ -0,0 +1,124 @@
+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 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.media ADD COLUMN IF NOT EXISTS subdir TEXT;
+COMMENT ON COLUMN site.media.subdir is 'Піддиректорія';
+
+-- deprecated tables
+-- drop table if exists site.articles cascade;
+drop table if exists site.article_media cascade;
+drop table if exists site.content_attributes cascade;
+drop table if exists site.article_translations cascade;
+drop table if exists site.menu_items cascade;
+
+-- redundant columns / constraints
+ALTER TABLE if exists site.content_types DROP CONSTRAINT if exists content_types_slug_key;
+ALTER TABLE if exists site.content_types drop column if exists slug;
+ALTER TABLE if exists site.content_types drop column if exists display_name;
+ALTER TABLE if exists site.contents drop column if exists fields;
+
+DROP FUNCTION if exists site.getmenu(text);
+
+-- seamless migration start
+/*
+insert into site.contents(content_id, space_id, content_type_id, slug)
+select content_type_id, 'default', content_type_id,  min(type_name) from site.single_type_values a
+left join lateral (select content_type_id from site.content_types b where a.type_name=b.name limit 1)b on 1=1
+    where content_type_id not in (select content_id from site.contents) and content_type_id is not null
+group by content_type_id;
+insert into site.content_data(field_id, content_id, object_id, field_key, field_type, field_value)
+select distinct single_type_value_id, content_type_id, type_name, key,
+coalesce(value_type,case when substring(value from 1 for 1) = '[' then 'datalist' else 'text' end), value from site.single_type_values a
+left join lateral (select content_type_id from site.content_types b where a.type_name=b.name limit 1)b on 1=1
+    where single_type_value_id not in (select field_id from site.content_data) and content_type_id is not null
+    and case when key = 'slug' then value not in ( select field_value from site.content_data where field_key='slug') else true end;
+-- drop table if exists site.single_type_values cascade;
+*/
+-- seamless migration finish
+
+--- insert default content types start
+insert into site.content_types(content_type_id,name,title,type,columns)
+values('pages','pages','Сторінки','collection',
+'[{"name":"slug","label":"Slug","type":"slug","parent":"title","required":true},{"name":"title","label":"Title","type":"text","required":true},{"name":"status","label":"Status","type":"select","options":[{"id":"draft","text":"Draft"},{"id":"published","text":"Published"},{"id":"archived","text":"Archived"},{"id":"delayPublished","text":"Delay Published"}],"required":true},{"name":"published_at","label":"Publish at","type":"datetime","required":true}]'::json
+) on conflict(content_type_id) do update set columns=excluded.columns, type = excluded.type;
+insert into site.contents(content_id,content_type_id,space_id)
+values('pages','pages','default') on conflict(content_id) do nothing;
+--- insert default content types finish
+
+alter table site.contents add column if not exists meta json;
+alter table site.contents add column if not exists main_image text;
+/*
+ALTER TABLE if exists site.contents drop column if exists publish_at;
+ALTER TABLE if exists site.contents add column if not exists published_at timestamp without time zone;
+update site.contents set published_at=now() where published_at is null;
+ALTER TABLE if exists site.contents alter column published_at set not null;
+ALTER TABLE if exists site.contents alter column published_at set default now();
+*/
+
+alter table site.content_data add column if not exists created_by text;
+alter table site.content_data add column if not exists updated_by text;
+alter table site.content_data add column if not exists field_value_object json;
+
+--- seamless migration for content_data start
+update site.content_data
+set field_value_object=field_value::json
+where field_value_object is null
+and field_value is not null
+and field_type in ('reference-list', 'reference', 'datalist', 'filelist', 'array');
+--- seamless migration for content_data finish
+
+
+-- delete accidental dupes
+delete from site.content_data where object_id in ( select min(object_id) from site.content_data where field_key= 'slug' group by field_value having count(*) > 1 );
+
+alter table site.content_types ADD COLUMN if not exists preview_path text;
+
+-- get rid of naming inconsistency
+update site.content_types
+set columns=replace(columns::text,'publish_at', 'published_at')::json
+where columns::text like '%publish_at%';
+
+ALTER TABLE site.contents DROP CONSTRAINT contents_status_check;
+ALTER TABLE site.contents ADD CONSTRAINT contents_status_check CHECK (status = ANY (ARRAY['draft'::text, 'published'::text, 'archived'::text, 'delayPublished'::text]));
+
+UPDATE site.content_types
+SET columns = (
+  SELECT jsonb_agg(elem)
+  FROM jsonb_array_elements(columns::jsonb) elem
+  WHERE elem->>'name' <> 'status'
+)
+WHERE columns IS NOT NULL;
+
+
+UPDATE site.content_types
+SET columns = columns::jsonb || '{"name": "status", "type": "select", "label": "Status", "options": [{"id": "draft", "text": "Draft"}, {"id": "published", "text": "Published"}, {"id": "archived", "text": "Archived"}, {"id": "delayPublished", "text": "Delay Published"}], "required": true}
+'::jsonb
+WHERE columns is not null;
+
+-- remove dupes, make slug unique
+update site.content_data set content_id='pages' where content_id<>'pages' and content_id in (
+select content_id from site.contents where content_id<>'pages' and slug='pages'
+);
+
+delete from site.contents where content_id<>'pages' and slug='pages';
+
+delete from site.contents a
+where slug in (select  slug from site.contents group by slug having count(*) > 1)
+and (select count(*) from site.content_data where content_id=a.content_id) = 0;
+
+alter table site.contents drop constraint if exists site_contents_slug_unique;
+alter table site.contents add constraint site_contents_slug_unique UNIQUE (slug);
+
+alter table site.contents add column if not exists space_id text;
+alter table site.contents alter column space_id drop not null;
+update site.spaces set locales='{ua,en,de}'::text[] where space_id='default';
+
+alter table site.content_data drop constraint if exists content_data_content_id_fkey;
+alter table site.content_data add constraint content_data_content_id_fkey foreign key (content_id) references site.contents(content_id) on delete cascade;
+
+alter table site.tags add column if not exists locale jsonb;