@opengis/gis 0.2.153 → 0.2.154

package/module/test/table/data_address.street.table.json

@@ -1,70 +1,70 @@
-{
-    "key": "str_id",
-    "table": "data_address.street",
-    "controls": [
-        "search",
-        "list",
-        "add"
-    ],
-    "form": "data_address.street.form",
-    "access": "user",
-    "sqlColumns": "*",
-    "order": "cdate desc",
-    "columns": [
-        {
-            "ua": "Назва вулиці",
-            "meta": "title",
-            "name": "name",
-            "format": "text"
-        },
-        {
-            "ua": "Статус",
-            "name": "status",
-            "data": "address.status",
-            "format": "select"
-        },
-        {
-            "ua": "Тип об'єкта",
-            "name": "type",
-            "data": "str_type",
-            "format": "select"
-        },
-        {
-            "ua": "Територіальна належність",
-            "name": "parent",
-            "data": "address.atu.object_id_all",
-            "width": 300,
-            "format": "select"
-        },
-        {
-            "ua": "Довжина вулиці",
-            "name": "str_length",
-            "html": "{{num_format str_length dec='2'}}",
-            "format": "number"
-        },
-        {
-            "ua": "Версія",
-            "name": "version",
-            "format": "text"
-        }
-    ],
-    "meta": {
-        "search": "name",
-        "title": "name"
-    },
-    "ua": "Вулиці",
-    "filterList": [
-        {
-            "ua": "Тип об'єкта",
-            "name": "type",
-            "data": "str_type",
-            "type": "Autocomplete"
-        },
-        {
-            "ua": "Статус",
-            "name": "status",
-            "data": "address.status",
-            "type": "Autocomplete"
-        }
-    ]
+{
+    "key": "str_id",
+    "table": "data_address.street",
+    "controls": [
+        "search",
+        "list",
+        "add"
+    ],
+    "form": "data_address.street.form",
+    "access": "user",
+    "sqlColumns": "*",
+    "order": "cdate desc",
+    "columns": [
+        {
+            "ua": "Назва вулиці",
+            "meta": "title",
+            "name": "name",
+            "format": "text"
+        },
+        {
+            "ua": "Статус",
+            "name": "status",
+            "data": "address.status",
+            "format": "select"
+        },
+        {
+            "ua": "Тип об'єкта",
+            "name": "type",
+            "data": "str_type",
+            "format": "select"
+        },
+        {
+            "ua": "Територіальна належність",
+            "name": "parent",
+            "data": "address.atu.object_id_all",
+            "width": 300,
+            "format": "select"
+        },
+        {
+            "ua": "Довжина вулиці",
+            "name": "str_length",
+            "html": "{{num_format str_length dec='2'}}",
+            "format": "number"
+        },
+        {
+            "ua": "Версія",
+            "name": "version",
+            "format": "text"
+        }
+    ],
+    "meta": {
+        "search": "name",
+        "title": "name"
+    },
+    "ua": "Вулиці",
+    "filterList": [
+        {
+            "ua": "Тип об'єкта",
+            "name": "type",
+            "data": "str_type",
+            "type": "Autocomplete"
+        },
+        {
+            "ua": "Статус",
+            "name": "status",
+            "data": "address.status",
+            "type": "Autocomplete"
+        }
+    ]
 }

package/module/test/table/data_bp_myo.bp.table.json

@@ -1,123 +1,123 @@
-{
-  "key": "bp_id",
-  "table": "data_bp_myo.bp",
-  "actions": [
-    "add",
-    "edit",
-    "del"
-  ],
-  "controls": [
-    "search",
-    "list",
-    "add"
-  ],
-  "access": "user",
-  "order": "cdate desc",
-  "meta": {
-    "title": "bp_code",
-    "search": "bp_code,bp_number,bp_reg_num,bp_issued_name,bp_customer_name,bp_object_name"
-  },
-  "title": "Будівельні паспорти",
-  "form": "data_bp_myo.bp.form",
-  "columns": [
-    {
-      "ua": "Реєстраційний номер МБК",
-      "name": "bp_number",
-      "width": 100,
-      "format": "text"
-    },
-    {
-      "ua": "Реєстраційний номер в ЄДЕССБ",
-      "meta": "title",
-      "name": "bp_code",
-      "hidden": true,
-      "format": "text"
-    },
-    {
-      "ua": "Реєстраційний номер",
-      "name": "bp_reg_num",
-      "width": 100,
-      "format": "text"
-    },
-    {
-      "ua": "Назва об’єкта будівництва",
-      "name": "bp_object_name",
-      "width": 300,
-      "format": "text"
-    },
-    {
-      "ua": "Адреса",
-      "name": "address",
-      "width": 300,
-      "format": "text"
-    },
-    {
-      "ua": "Вид будівництва",
-      "name": "bp_build_type",
-      "data": "bp_build_type",
-      "width": 150,
-      "format": "badge"
-    },
-    {
-      "ua": "Дата видачі",
-      "name": "bp_issued_date",
-      "width": 100,
-      "format": "date"
-    },
-    {
-      "ua": "Статус реєстрації",
-      "name": "bp_doc_status",
-      "data": "doc_status",
-      "width": 150,
-      "hidden": true,
-      "format": "badge"
-    },
-    {
-      "ua": "Назва органу, що видав",
-      "name": "bp_issued_name",
-      "width": 300,
-      "hidden": true,
-      "format": "text"
-    },
-    {
-      "ua": "Замовник",
-      "name": "bp_customer_name",
-      "width": 300,
-      "format": "text"
-    },
-    {
-      "ua": "Кадастрові номери",
-      "name": "land_number",
-      "format": "slot",
-      "hidden": true,
-      "slot": {
-        "content": "<p v-for=\"item in data?.land_number\">{{item}}</p>"
-      }
-    },
-    {
-      "ua": "Версія документу",
-      "name": "obj_version",
-      "format": "text",
-      "hidden": true
-    }
-  ],
-  "filterList": [
-    {
-      "ua": "Вид будівництва",
-      "name": "bp_build_type",
-      "data": "bp_build_type",
-      "type": "Check"
-    },
-    {
-      "ua": "Дата видачі",
-      "name": "bp_issued_date",
-      "type": "Date"
-    },
-    {
-      "ua": "Статус документа",
-      "name": "bp_doc_status",
-      "data": "doc_status",
-      "type": "Check"
-    }
-  ]
+{
+  "key": "bp_id",
+  "table": "data_bp_myo.bp",
+  "actions": [
+    "add",
+    "edit",
+    "del"
+  ],
+  "controls": [
+    "search",
+    "list",
+    "add"
+  ],
+  "access": "user",
+  "order": "cdate desc",
+  "meta": {
+    "title": "bp_code",
+    "search": "bp_code,bp_number,bp_reg_num,bp_issued_name,bp_customer_name,bp_object_name"
+  },
+  "title": "Будівельні паспорти",
+  "form": "data_bp_myo.bp.form",
+  "columns": [
+    {
+      "ua": "Реєстраційний номер МБК",
+      "name": "bp_number",
+      "width": 100,
+      "format": "text"
+    },
+    {
+      "ua": "Реєстраційний номер в ЄДЕССБ",
+      "meta": "title",
+      "name": "bp_code",
+      "hidden": true,
+      "format": "text"
+    },
+    {
+      "ua": "Реєстраційний номер",
+      "name": "bp_reg_num",
+      "width": 100,
+      "format": "text"
+    },
+    {
+      "ua": "Назва об’єкта будівництва",
+      "name": "bp_object_name",
+      "width": 300,
+      "format": "text"
+    },
+    {
+      "ua": "Адреса",
+      "name": "address",
+      "width": 300,
+      "format": "text"
+    },
+    {
+      "ua": "Вид будівництва",
+      "name": "bp_build_type",
+      "data": "bp_build_type",
+      "width": 150,
+      "format": "badge"
+    },
+    {
+      "ua": "Дата видачі",
+      "name": "bp_issued_date",
+      "width": 100,
+      "format": "date"
+    },
+    {
+      "ua": "Статус реєстрації",
+      "name": "bp_doc_status",
+      "data": "doc_status",
+      "width": 150,
+      "hidden": true,
+      "format": "badge"
+    },
+    {
+      "ua": "Назва органу, що видав",
+      "name": "bp_issued_name",
+      "width": 300,
+      "hidden": true,
+      "format": "text"
+    },
+    {
+      "ua": "Замовник",
+      "name": "bp_customer_name",
+      "width": 300,
+      "format": "text"
+    },
+    {
+      "ua": "Кадастрові номери",
+      "name": "land_number",
+      "format": "slot",
+      "hidden": true,
+      "slot": {
+        "content": "<p v-for=\"item in data?.land_number\">{{item}}</p>"
+      }
+    },
+    {
+      "ua": "Версія документу",
+      "name": "obj_version",
+      "format": "text",
+      "hidden": true
+    }
+  ],
+  "filterList": [
+    {
+      "ua": "Вид будівництва",
+      "name": "bp_build_type",
+      "data": "bp_build_type",
+      "type": "Check"
+    },
+    {
+      "ua": "Дата видачі",
+      "name": "bp_issued_date",
+      "type": "Date"
+    },
+    {
+      "ua": "Статус документа",
+      "name": "bp_doc_status",
+      "data": "doc_status",
+      "type": "Check"
+    }
+  ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.153",
+  "version": "0.2.154",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
@@ -53,7 +53,7 @@
   },
   "devDependencies": {
     "@opengis/core": "^0.0.23",
-    "@opengis/fastify-table": "^2.3.4",
+    "@opengis/fastify-table": "^2.4.10",
     "@opengis/filter": "0.1.35",
     "@opengis/form": "^0.0.133",
     "@opengis/table": "^0.0.27",
@@ -63,13 +63,13 @@
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-vue": "^9.33.0",
     "@vue/eslint-config-typescript": "^12.0.0",
-    "vue-eslint-parser": "^10.4.0",
+    "vue-eslint-parser": "^10.4.1",
     "lucide-vue-next": "^0.577.0",
     "sass-embedded": "1.86.3",
     "typescript": "^5.9.3",
-    "vite": "^6.4.1",
-    "vue": "^3.5.29",
+    "vite": "^6.4.3",
+    "vue": "^3.5.38",
     "vue-router": "4.5.1",
     "vuedraggable": "^4.1.0"
   }
-}
+}

package/plugin.js

@@ -1,55 +1,55 @@
-import fp from 'fastify-plugin';
-
-import {
-  config, addHook, getMeta, pgClients, execMigrations,
-} from '@opengis/fastify-table/utils.js';
-
-config.prefix = config.prefix || '/api';
-import { join, dirname } from 'path';
-import { fileURLToPath } from 'url';
-import mapnikLogger from './server/routes/mapnik/controllers/mapnikLogger.js';
-import mapnikStat from './server/routes/mapnik/controllers/mapnikStat.js';
-
-const dir = dirname(fileURLToPath(import.meta.url));
-
-execMigrations(join(dir, 'server/migrations'), pgClients.client).catch(err => console.error(err.toString()));
-
-const columnType = {
-  text: 'text',
-  'character varying': 'text',
-  character: 'text',
-  date: 'date',
-  boolean: 'yes/no',
-  numeric: 'number',
-  integer: 'number',
-  'double precision': 'number',
-  'timestamp without time zone': 'date',
-  'timestamp with time zone': 'date',
-  'text[]': 'array',
-  'integer[]': 'array',
-  'character varying[]': 'array',
-};
-const adminParams = { config: { policy: 'L1', role: 'admin' }, package: 'gis' };
-async function plugin(app, opts = config) {
-  // API
-  app.register(import('./server/routes/map/index.mjs'), opts);
-  app.register(import('./server/plugins/crons.js'), opts);
-  app.register(import('./server/routes/gis/index.mjs'), opts);
-  app.register(import('./server/routes/permissions/index.mjs'), opts);
-  app.register(import('./server/routes/mapnik/index.js'), opts);
-  app.get('/logger-gis/stat', adminParams, mapnikStat);
-  app.get('/logger-gis/*', adminParams, mapnikLogger);
-
-  addHook('afterData', async ({
-    pg = pgClients.client, payload, id, template,
-  }) => {
-    if (!template) return null;
-    const table = { 'gis.services.table': payload?.rows?.[0]?.source_path, 'gis.registers.table': payload?.rows?.[0]?.table_name }[template];
-    if (!table || !payload.columns?.length || !id || !pgClients?.client?.pk?.[table]) return null;
-
-    const { columns = [] } = await getMeta({ table, pg });
-    // payload.rows[0].token = payload.tokens?.edit; // token with ignore filtering of payload keys check
-    Object.assign(payload, { fields: columns?.map?.(({ name, title, dataTypeID }) => ({ name, title: title || name, type: columnType[pg?.pgType?.[dataTypeID] || 'text'] })).filter(el => el.type) });
-  });
-}
-export default fp(plugin);
+import fp from 'fastify-plugin';
+
+import {
+  config, addHook, getMeta, pgClients, execMigrations,
+} from '@opengis/fastify-table/utils.js';
+
+config.prefix = config.prefix || '/api';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+import mapnikLogger from './server/routes/mapnik/controllers/mapnikLogger.js';
+import mapnikStat from './server/routes/mapnik/controllers/mapnikStat.js';
+
+const dir = dirname(fileURLToPath(import.meta.url));
+
+execMigrations(join(dir, 'server/migrations'), pgClients.client).catch(err => console.error(err.toString()));
+
+const columnType = {
+  text: 'text',
+  'character varying': 'text',
+  character: 'text',
+  date: 'date',
+  boolean: 'yes/no',
+  numeric: 'number',
+  integer: 'number',
+  'double precision': 'number',
+  'timestamp without time zone': 'date',
+  'timestamp with time zone': 'date',
+  'text[]': 'array',
+  'integer[]': 'array',
+  'character varying[]': 'array',
+};
+const adminParams = { config: { policy: 'L1', role: 'admin' }, package: 'gis' };
+async function plugin(app, opts = config) {
+  // API
+  app.register(import('./server/routes/map/index.mjs'), opts);
+  app.register(import('./server/plugins/crons.js'), opts);
+  app.register(import('./server/routes/gis/index.mjs'), opts);
+  app.register(import('./server/routes/permissions/index.mjs'), opts);
+  app.register(import('./server/routes/mapnik/index.js'), opts);
+  app.get('/logger-gis/stat', adminParams, mapnikStat);
+  app.get('/logger-gis/*', adminParams, mapnikLogger);
+
+  addHook('afterData', async ({
+    pg = pgClients.client, payload, id, template,
+  }) => {
+    if (!template) return null;
+    const table = { 'gis.services.table': payload?.rows?.[0]?.source_path, 'gis.registers.table': payload?.rows?.[0]?.table_name }[template];
+    if (!table || !payload.columns?.length || !id || !pgClients?.client?.pk?.[table]) return null;
+
+    const { columns = [] } = await getMeta({ table, pg });
+    // payload.rows[0].token = payload.tokens?.edit; // token with ignore filtering of payload keys check
+    Object.assign(payload, { fields: columns?.map?.(({ name, title, dataTypeID }) => ({ name, title: title || name, type: columnType[pg?.pgType?.[dataTypeID] || 'text'] })).filter(el => el.type) });
+  });
+}
+export default fp(plugin);

package/server/migrations/array_intersect.sql

@@ -1,14 +1,14 @@
-CREATE OR REPLACE FUNCTION public.array_intersect(
-    anyarray,
-    anyarray)
-  RETURNS anyarray AS
-$BODY$
-
-    SELECT ARRAY(
-        SELECT UNNEST($1)
-        INTERSECT
-        SELECT UNNEST($2)
-    );
-$BODY$
-  LANGUAGE sql VOLATILE
+CREATE OR REPLACE FUNCTION public.array_intersect(
+    anyarray,
+    anyarray)
+  RETURNS anyarray AS
+$BODY$
+
+    SELECT ARRAY(
+        SELECT UNNEST($1)
+        INTERSECT
+        SELECT UNNEST($2)
+    );
+$BODY$
+  LANGUAGE sql VOLATILE
   COST 100;

package/server/migrations/cartocss.sql

@@ -1,27 +1,27 @@
-create schema if not exists gis;
-
-create table if not exists gis.cartocss(
-    cartocss_id  text      default next_id() not null primary key,
-    cartocss_key text                              not null constraint cartocss_key_unique unique,
-    name         text                              not null,
-    description  text,
-    config       jsonb,
-    style        text,
-    created_at   timestamp default now(),
-    created_by   text,
-    updated_by   text,
-    updated_at   timestamp,
-    group_id     text constraint services_group_id_fkey references group_list,
-    is_public    boolean   default false           not null,
-    enabled      boolean   default true            not null,
-    is_static boolean not null default false,
-    geom public.geometry
-);
-
-alter table gis.cartocss add column if not exists geom public.geometry;
-alter table gis.cartocss add column if not exists source_path text;
-alter table gis.cartocss add column if not exists card_auto boolean not null default false;
-alter table gis.cartocss add column if not exists card_html text;
-alter table gis.cartocss add column if not exists card_table text;
-alter table gis.cartocss add column if not exists card_columns text;
-alter table gis.cartocss add column if not exists is_static boolean not null default false;
+create schema if not exists gis;
+
+create table if not exists gis.cartocss(
+    cartocss_id  text      default next_id() not null primary key,
+    cartocss_key text                              not null constraint cartocss_key_unique unique,
+    name         text                              not null,
+    description  text,
+    config       jsonb,
+    style        text,
+    created_at   timestamp default now(),
+    created_by   text,
+    updated_by   text,
+    updated_at   timestamp,
+    group_id     text constraint services_group_id_fkey references group_list,
+    is_public    boolean   default false           not null,
+    enabled      boolean   default true            not null,
+    is_static boolean not null default false,
+    geom public.geometry
+);
+
+alter table gis.cartocss add column if not exists geom public.geometry;
+alter table gis.cartocss add column if not exists source_path text;
+alter table gis.cartocss add column if not exists card_auto boolean not null default false;
+alter table gis.cartocss add column if not exists card_html text;
+alter table gis.cartocss add column if not exists card_table text;
+alter table gis.cartocss add column if not exists card_columns text;
+alter table gis.cartocss add column if not exists is_static boolean not null default false;