@opengis/cms 0.0.34 → 0.0.35

package/module/cms/cls/content.status.json

@@ -0,0 +1,18 @@
+[
+    {
+        "id": "draft",
+        "text": "Чернетка"
+    },
+    {
+        "id": "published",
+        "text": "Опубліковано"
+    },
+    {
+        "id": "archived",
+        "text": "Архівовано"
+    },
+    {
+        "id": "delayPublished",
+        "text": "Затримка публікації"
+    }
+]

package/module/cms/cls/user_type.json

@@ -0,0 +1,10 @@
+[
+    {
+        "id": "regular",
+        "text": "Звичайний"
+    },
+    {
+        "id": "admin",
+        "text": "Admin"
+    }
+]

package/module/cms/form/admin.users.form.json

@@ -0,0 +1,78 @@
+{
+    "schema": {
+        "user_name": {
+            "type": "Text",
+            "rules": [
+                "required"
+            ],
+            "ua": "Ім'я",
+            "i": "Вноситься ім'я користувача, що буде відображатися у системі"
+        },
+        "sur_name": {
+            "type": "Text",
+            "rules": [
+                "required"
+            ],
+            "ua": "Прізвище",
+            "i": "Вноситься прізвище користувача, що буде відображатися у системі"
+        },
+        "father_name": {
+            "ua": "По-батькові",
+            "type": "Text"
+        },
+        "phone": {
+            "type": "Text",
+            "mask": "+389999999999",
+            "ua": "Телефон",
+            "i": "Вноситься телефон користувача"
+        },
+        "email": {
+            "type": "Text",
+            "ua": "E-mail",
+            "i": "Вноситься електронна адреса користувача",
+            "rules": [
+                "email"
+            ]
+        },
+        "login": {
+            "type": "Text",
+            "ua": "Логін",
+            "i": "Вноситься довільний логін користувача латинськими літерами, що буде використовуватися для входу в систему",
+            "rules": [
+                "required"
+            ]
+        },
+        "password": {
+            "type": "Text",
+            "ua": "Пароль",
+            "rules": [
+                "required",
+                {
+                    "type": "regexp",
+                    "pattern": "^.{8,}$",
+                    "message": "Пароль повинен бути більше 8 символів"
+                }
+            ],
+            "i": "Вноситься пароль, що буде використовуватися для входу в систему (рекомендоване використання складних паролів)"
+        },
+        "avatar": {
+            "type": "File",
+            "ua": "Аватар",
+            "i": "Додається зображення, що буде відображено в системі у якості аватара цього користувача"
+        },
+        "user_type": {
+            "type": "Select",
+            "ua": "Тип користувача",
+            "i": "Вноситься тип користувача",
+            "data": "user_type"
+        },
+        "enabled": {
+            "type": "Switcher",
+            "label": "Доступ"
+        },
+        "twofa": {
+            "type": "Switcher",
+            "label": "Двофакторна авторизація"
+        }
+    }
+}

package/module/cms/select/cms.page_type.sql

@@ -0,0 +1,2 @@
+select content_type_id, name || ' (' || title || ')' from site.content_types
+WHERE type = 'single'

package/module/cms/select/collection.sql

@@ -0,0 +1 @@
+SELECT content_type_id, name  FROM site.content_types where type='collection'

package/module/cms/select/news_tag_id.sql

@@ -0,0 +1,12 @@
+select a.id, a.title, tags from data.news a
+left join lateral(select array_agg(tag_id) as tags from site.tag_data b where a.id=b.data_id)b on 1=1
+
+where 
+case when '{{parent}}'<> '' 
+        then '{{parent}}'=any(b.tags)
+        else true 
+    end
+
+    and status='published' 
+
+order by a.updated_at

package/module/cms/select/tag_id.sql

@@ -0,0 +1 @@
+select tag_id, value from site.tags order by value

package/module/cms/table/admin.users.table.json

@@ -0,0 +1,54 @@
+{
+  "ua": "Користувачі",
+  "key": "uid",
+  "order": "cdate desc",
+  "access": "admin",
+  "sqlColumns": "*",
+  "form": "admin.users.form",
+  "table": "admin.users",
+  "sql": [
+    {
+      "name": "social_auth_sql",
+      "sql": "select social_auth_obj,social_auth_date from admin.users_social_auth where uid=t.uid limit 1"
+    },
+    {
+      "sql": "SELECT coalesce(sur_name, '') || ' ' || coalesce(user_name, '') || ' ' || coalesce(father_name, '') as full_name FROM admin.users WHERE uid = t.uid",
+      "name": "full_name_sql"
+    }
+  ],
+  "columns": [
+    {
+      "ua": "ПІБ",
+      "name": "full_name",
+      "format": "select",
+      "data": "full_name_sql"
+    },
+    {
+      "ua": "Тип користувача",
+      "name": "user_type_text",
+      "format": "select",
+      "data": "user_type_text"
+    },
+    {
+      "ua": "Статус доступу",
+      "name": "enabled"
+    }
+  ],
+  "filters": [
+    {
+      "label": "Тип користувача",
+      "type": "Check",
+      "name": "user_type",
+      "data": "user_type"
+    }
+  ],
+  "meta": {
+    "title": "full_name",
+    "search": "user_name,user_rnokpp"
+  },
+  "actions": [
+    "edit",
+    "del",
+    "add"
+  ]
+}

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

@@ -0,0 +1,96 @@
+{
+    "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,
+            "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,114 @@
+{
+    "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",
+            "type": "Text"
+        },
+        {
+            "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/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@opengis/cms",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "description": "cms",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
   "license": "EULA",
   "files": [
+    "module",
     "dist",
     "server",
     "plugin.js"

package/plugin.js

@@ -39,7 +39,7 @@ export default async function (app) {
   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));
+    const customTables = await pg.query('select array_agg(table_name) from site.content_types where table_name is not null').catch(err => console.log(err)).then(el => el?.rows?.[0]?.array_agg || []);
 
     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));

package/server/migrations/fixes.sql

@@ -42,12 +42,12 @@ left join lateral (select content_type_id from site.content_types b where a.type
 -- seamless migration finish
 
 --- insert default content types start
-insert into site.content_types(content_type_id,name,title,type,columns)
+insert into site.content_types(content_type_id,name,title,type,columns,template,uid)
 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;
+,'','1') 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,template,uid)
+values('pages','pages','default','','1') on conflict(content_id) do nothing;
 --- insert default content types finish
 
 alter table site.contents add column if not exists meta json;
@@ -83,7 +83,8 @@ 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 DROP CONSTRAINT if exists contents_status_check;
+-- select * from site.contents where not status = ANY (ARRAY['draft'::text, 'published'::text, 'archived'::text, 'delayPublished'::text])
 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

package/server/migrations/site.sql

@@ -64,7 +64,7 @@ CREATE TABLE if not exists site.content_types (
     table_name VARCHAR(50),
     columns json,
     status VARCHAR (20) DEFAULT 'draft' CHECK (status::text = ANY (ARRAY['draft', 'published', 'archived']::text[])),
-    visible BOOLEAN DEFAULT TRUE, 
+    visible BOOLEAN DEFAULT TRUE,
     localized BOOLEAN DEFAULT FALSE,
     type VARCHAR(20) NOT NULL DEFAULT 'collection' CHECK (type::text = ANY (ARRAY['collection', 'single']::text[])),
     schema JSONB,
@@ -78,6 +78,20 @@ CREATE TABLE if not exists site.content_types (
     updated_by text REFERENCES admin.users(uid)
 );
 
+ALTER TABLE site.content_types add COLUMN if not exists table_name text;
+ALTER TABLE site.content_types add COLUMN if not exists title text;
+ALTER TABLE site.content_types add COLUMN if not exists status text;
+ALTER TABLE site.content_types add COLUMN if not exists visible boolean default true;
+ALTER TABLE site.content_types add COLUMN if not exists localized boolean default false;
+ALTER TABLE site.content_types add COLUMN if not exists schema jsonb;
+ALTER TABLE site.content_types add COLUMN if not exists icon text;
+ALTER TABLE site.content_types add COLUMN if not exists color text;
+ALTER TABLE site.content_types add COLUMN if not exists created_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.content_types add COLUMN if not exists updated_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.content_types add COLUMN if not exists created_by text REFERENCES admin.users(uid);
+ALTER TABLE site.content_types add COLUMN if not exists updated_by text REFERENCES admin.users(uid);
+ALTER TABLE site.content_types add COLUMN if not exists preview_path text;
+
 ALTER TABLE if exists site.content_types ALTER COLUMN table_name DROP NOT NULL;
 ALTER TABLE if exists site.content_types ADD COLUMN if not exists columns json;
 
@@ -145,6 +159,14 @@ CREATE TABLE if not exists site.menus (
 );
 
 alter table site.menus add column if not exists locale VARCHAR(20) not null default 'uk';
+alter table site.menus add column if not exists content text;
+alter table site.menus add column if not exists items json;
+alter table site.menus add column if not exists description text;
+ALTER TABLE site.menus add COLUMN if not exists created_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.menus add COLUMN if not exists updated_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.menus add COLUMN if not exists created_by text REFERENCES admin.users(uid);
+ALTER TABLE site.menus add COLUMN if not exists updated_by text REFERENCES admin.users(uid);
+
 ALTER TABLE site.menus DROP CONSTRAINT if exists menus_name_key;
 ALTER TABLE site.menus DROP CONSTRAINT if exists menus_name_locale_unique;
 alter table site.menus drop column if exists lang;
@@ -189,8 +211,8 @@ CREATE INDEX if not exists idx_roles_name ON site.roles(name);
 -- drop table if exists site.permissions cascade;
 CREATE TABLE if not exists site.permissions (
     permission_id text PRIMARY KEY default next_id(),
-    role_id text references site.roles(role_id), 
-    user_id text references admin.users(uid), 
+    role_id text references site.roles(role_id),
+    user_id text references admin.users(uid),
     content_type_id text references site.content_types(content_type_id),
     subject VARCHAR(100) NOT NULL,
     actions TEXT[] NOT NULL check (actions && (ARRAY['read', 'create', 'delete', 'edit']::text[])),
@@ -229,7 +251,7 @@ CREATE TABLE if not exists site.tokens (
     last_used TIMESTAMP NULL, -- When the token was last used (nullable)
     created_at TIMESTAMP NOT NULL default now(), -- When the token was created
     updated_at TIMESTAMP NOT NULL default now(), -- When the token was updated
-    created_by TEXT, -- Who created the token 
+    created_by TEXT, -- Who created the token
     updated_by TEXT, -- When updated the token
     expiration_date TIMESTAMP, -- (nullable) Expiration date of the token
     token_type TEXT CHECK (token_type IN ('CMA', 'PAT')), -- Type of token
@@ -348,6 +370,19 @@ CREATE TABLE if not exists site.contents (
     FOREIGN KEY (updated_by) REFERENCES admin.users(uid)
 );
 
+alter table site.contents add column if not exists  space_id text;
+alter table site.contents add column if not exists  content_type_id text;
+ALTER TABLE site.contents add COLUMN if not exists created_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.contents add COLUMN if not exists updated_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.contents add COLUMN if not exists created_by text REFERENCES admin.users(uid);
+ALTER TABLE site.contents add COLUMN if not exists updated_by text REFERENCES admin.users(uid);
+ALTER TABLE site.contents add COLUMN if not exists published_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.contents add COLUMN if not exists revision INTEGER NOT NULL DEFAULT 1;
+ALTER TABLE site.contents add COLUMN if not exists locale TEXT NOT NULL DEFAULT 'uk'::text;
+ALTER TABLE site.contents add COLUMN if not exists published_by text;
+ALTER TABLE site.contents add COLUMN if not exists slug text;
+ALTER TABLE site.contents add COLUMN if not exists meta json;
+
 COMMENT ON COLUMN site.contents.content_id IS 'Unique identifier for the content item (entry)';
 COMMENT ON COLUMN site.contents.space_id IS 'FK to the space this content belongs to';
 COMMENT ON COLUMN site.contents.content_type_id IS 'FK to the content type definition';
@@ -380,6 +415,21 @@ CREATE TABLE if not exists site.content_data (
     constraint content_data_content_id_fkey FOREIGN KEY (content_id) REFERENCES site.contents(content_id) on delete cascade
 );
 
+
+alter table site.content_data add column  if not exists field_key text not null;
+alter table site.content_data add column  if not exists field_type text;
+alter table site.content_data add column  if not exists field_value text;
+alter table site.content_data add column  if not exists field_value_object json;
+alter table site.content_data add column  if not exists locale text;
+alter table site.content_data add column  if not exists field_id text;
+alter table site.content_data add column  if not exists object_id text;
+ALTER TABLE site.content_data add COLUMN if not exists created_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.content_data add COLUMN if not exists updated_at TIMESTAMP DEFAULT NOW();
+ALTER TABLE site.content_data add COLUMN if not exists created_by text REFERENCES admin.users(uid);
+ALTER TABLE site.content_data add COLUMN if not exists updated_by text REFERENCES admin.users(uid);
+
+
+
 -- create unique index for slug
 CREATE UNIQUE INDEX if not exists content_data_slug_unique ON site.content_data (field_value) WHERE field_key = 'slug';