@opengis/gis 0.2.7 → 0.2.8

package/module/gis/table/gis.services.table.json

@@ -26,7 +26,8 @@
       "ua": "Назва",
       "meta": "title",
       "name": "name",
-      "link": "/service/{id}",      
+      "link": "/service/{id}",
+      "width": 200,      
       "format": "text"
     },
     {
@@ -35,14 +36,15 @@
       "edit":true,
       "width": 300,
       "format": "text"
+
     },
     {
       "ua": "Група",
       "name": "group_id",
-      "width": 300,
+      "width": 220,
       "edit":true,
       "data": "gis.group_list",
-      "format": "select"
+      "format": "badge"
     },
     {
       "ua": "Ключові слова",
@@ -67,6 +69,7 @@
       "ua": "Публічний",
       "name": "is_public",      
       "edit":true,
+      "width": 100,
       "format": "boolean"
     },
     {
@@ -74,6 +77,7 @@
       "name": "is_active",
       "data": "yes_no",
       "edit":true,
+      "width": 100,
       "format": "boolean"
     },
     {
@@ -81,6 +85,7 @@
       "name": "is_downloadable",
       "data": "yes_no",
       "edit":true,
+      "width": 180,
       "format": "boolean"
     }
   ],

package/module/test/cls/doc_status.json

@@ -1,32 +1,32 @@
-[
-    {
-        "id": "1",
-        "text": "Діючий",
-        "color": "#1ab394"
-    },
-    {
-        "id": "2",
-        "text": "Зупинений",
-        "color": "#ed82c8"
-    },
-    {
-        "id": "3",
-        "text": "Скасований",
-        "color": "#4a4a4a"
-    },
-    {
-        "id": "5",
-        "text": "Проектний",
-        "color": "#6495ed"
-    },
-    {
-        "id": "7",
-        "text": "Очікує розгляду",
-        "color": "#92b8ef"
-    },
-    {
-        "id": "10",
-        "text": "Архівний",
-        "color": "#d48428"
-    }
+[
+    {
+        "id": "1",
+        "text": "Діючий",
+        "color": "#1ab394"
+    },
+    {
+        "id": "2",
+        "text": "Зупинений",
+        "color": "#ed82c8"
+    },
+    {
+        "id": "3",
+        "text": "Скасований",
+        "color": "#4a4a4a"
+    },
+    {
+        "id": "5",
+        "text": "Проектний",
+        "color": "#6495ed"
+    },
+    {
+        "id": "7",
+        "text": "Очікує розгляду",
+        "color": "#92b8ef"
+    },
+    {
+        "id": "10",
+        "text": "Архівний",
+        "color": "#d48428"
+    }
 ]

package/module/test/map/mbd.json

@@ -18,7 +18,7 @@
     {
       "type": "layers",
       "position": "bottom-left",
-      "visible": false
+      "visible": true
     },
     {
       "type": "dataset",

package/module/test/select/core.user_uid.sql

@@ -1 +1 @@
-select uid, coalesce(coalesce(sur_name,'')||coalesce(' '||user_name,'') ||coalesce(' '||father_name,''),login) as text from admin.users
+select uid, coalesce(coalesce(sur_name,'')||coalesce(' '||user_name,'') ||coalesce(' '||father_name,''),login) as text from admin.users

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@opengis/core": "^0.0.23",
-    "@opengis/fastify-table": "^2.0.32",
+    "@opengis/fastify-table": "^2.0.43",
     "@opengis/filter": "^0.1.11",
     "@opengis/form": "^0.0.48",
     "@opengis/table": "^0.0.27",

package/server/plugins/vite.js

@@ -26,14 +26,14 @@ async function plugin(fastify, opts) {
     });
 
     // this is middleware for vite's dev server
-    fastify.addHook('onRequest', async (request, reply) => {
-      const { user } = request.session?.passport || {};
-      if (!user && config.pg && !config.auth?.disable) {
-        return reply.redirect('/login');
-      }
+    fastify.addHook('onRequest', async (req, reply) => {
+      const { user } = req.session?.passport || {};
+      // console.log(req.url);
+
       const next = () => new Promise((resolve) => {
-        viteServer.middlewares(request.raw, reply.raw, () => resolve());
+        viteServer.middlewares(req.raw, reply.raw, () => resolve());
       });
+
       await next();
     });
   }
@@ -61,8 +61,9 @@ async function plugin(fastify, opts) {
 
   fastify.get('*', async (req, reply) => {
     const { user } = req.session?.passport || {};
-    if (!user && config.pg && !config.auth?.disable) {
-      // return reply.redirect('/login');
+    // console.log(req.url);
+    if (!user && req.url !== '/login') {
+      return reply.redirect('/login');
     }
     if (!isProduction) return null; // admin vite
     const stream = fs.createReadStream('admin/dist/index.html');

package/server/routes/map/maps/get.map.js

@@ -43,14 +43,28 @@ export default async function getMap({ params = {}, pg = pgClients.client }, rep
 
     const obj = loadTemplate;
 
+    const layers = [];
+
+    if (Array.isArray(obj?.ogc) && obj.ogc.length && ['string', 'number'].includes(typeof obj.ogc[0])) {
+      await Promise.all(obj.ogc.map(async (layer) => {
+        const ogcData = await pg.query('select ogc_service_id as id, url as service_url, * from gis.ogc_service where ogc_service_id=$1', [layer]).then(el => el.rows?.[0]);
+        layers.push({
+          ...(ogcData || {}), id: layer, /* center: [], bbox: null, filters: [], style: { color: 'red' }, */ visible: !!ogcData, type: 'ogc',
+        });
+      }));
+    }
+
     if (Array.isArray(obj?.layers) && typeof obj?.layers?.[0] === 'string') {
-      const layers = await Promise.all(obj.layers.map(async (layer) => {
+      await Promise.all(obj.layers.map(async (layer) => {
         const layerData = await getTemplate('layer', layer);
         const serviceData = layerData || await pg.query('select service_id as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center from gis.services where service_id=$1', [layer]).then(el => el.rows?.[0]);
-        Object.assign(serviceData, { count: totals[serviceData.source_path || ''] || 0 });
-        serviceData.style = typeof serviceData.style === 'object' ? serviceData.style : yaml.load(serviceData.style);
-        return { ...serviceData, id: layer, visible: true };
+        Object.assign(serviceData || {}, { count: totals[serviceData?.source_path || ''] || 0 });
+        if (serviceData) { serviceData.style = typeof serviceData.style === 'object' ? serviceData.style : yaml.load(serviceData.style); }
+        layers.push({ ...(serviceData || {}), id: layer, visible: !!serviceData });
       }));
+    }
+
+    if (obj?.layers || obj?.ogc) {
       return {
         maps, ...rows[0], ...obj, layers,
       };