@opengis/gis 0.2.93 → 0.2.95

package/server/routes/permissions/controllers/catalog.permissions.edit.js

@@ -1,22 +1,22 @@
-export default async function catalogPermissionsEdit(req, reply) {
-    const { pg, params, body } = req;
-    const { uid } = params;
-    if (!uid) return reply.status(403).send({ status: 403, message: 'access restricted' });
-    if (!body?.length) return reply.status(400).send({ status: 400, message: 'body is empty' });
-
-    try {
-        await pg.one(`delete from gis.services_users_rel where user_id = $1`, [uid]);
-
-        const sql = [];
-        body.map(el => {
-            const insertSql = `('${el?.service_id}','${uid}','${uid}',${(el?.actions?.length) ? `'{${el?.actions?.map(action => `"${action}"`)}}'::text[]` : 'null'})`;
-            sql.push(insertSql);
-        });
-
-        await pg.query(`insert into gis.services_users_rel (service_id,user_id,created_by,actions) values ${sql?.join(',')}`);
-        return reply.status(201).send({ status: 201, message: `Inserted ${body?.length} permissions` });
-    }
- catch (err) {
-        return reply.status(500).send({ status: 500, message: err.toString() });
-    }
-}
+export default async function catalogPermissionsEdit(req, reply) {
+    const { pg, params, body } = req;
+    const { uid } = params;
+    if (!uid) return reply.status(403).send({ status: 403, message: 'access restricted' });
+    if (!body?.length) return reply.status(400).send({ status: 400, message: 'body is empty' });
+
+    try {
+        await pg.one(`delete from gis.services_users_rel where user_id = $1`, [uid]);
+
+        const sql = [];
+        body.map(el => {
+            const insertSql = `('${el?.service_id}','${uid}','${uid}',${(el?.actions?.length) ? `'{${el?.actions?.map(action => `"${action}"`)}}'::text[]` : 'null'})`;
+            sql.push(insertSql);
+        });
+
+        await pg.query(`insert into gis.services_users_rel (service_id,user_id,created_by,actions) values ${sql?.join(',')}`);
+        return reply.status(201).send({ status: 201, message: `Inserted ${body?.length} permissions` });
+    }
+ catch (err) {
+        return reply.status(500).send({ status: 500, message: err.toString() });
+    }
+}

package/server/routes/permissions/controllers/catalog.permissions.js

@@ -1,8 +1,8 @@
-export default async function catalogPermissions(req, reply) {
-    const { pg, params } = req;
-    const { uid } = params;
-    if (!uid) return reply.status(403).send({ status: 403, message: 'access restricted' });
-    const { total, layer_list } = await pg.one(
-        `select count(*)::int as total,array_agg(json_build_object('service_id',service_id,'actions',actions)) as layer_list from gis.services_users_rel where user_id=$1`, [uid]);
-    return reply.status(200).send({ status: 200, total, layer_list })
+export default async function catalogPermissions(req, reply) {
+    const { pg, params } = req;
+    const { uid } = params;
+    if (!uid) return reply.status(403).send({ status: 403, message: 'access restricted' });
+    const { total, layer_list } = await pg.one(
+        `select count(*)::int as total,array_agg(json_build_object('service_id',service_id,'actions',actions)) as layer_list from gis.services_users_rel where user_id=$1`, [uid]);
+    return reply.status(200).send({ status: 200, total, layer_list })
 }

package/server/routes/permissions/controllers/gis.catalog.js

@@ -1,80 +1,80 @@
-import getPermissions from './utils/get.permissions.js';
-
-export default async function gisCatalog(req, reply) {
-  const { pg, user } = req;
-
-  if (!user?.uid) return reply.status(403).send({ status: 403, message: 'access restricted' });
-
-  // permissions
-  const { all_layers, group_list, layer_list } = await getPermissions({ pg, uid: user.uid });
-  if (!all_layers && !group_list?.length && !layer_list?.length) {
-    return reply.status(200).send({
-      status: 204, categoriesCount: 0, layersCount: 0, servicesCount: 0, rastersCount: 0, categories: [], layers: [],
-    });
-  }
-
-  // groups
-  const selectCategories = `select group_id as category_id, group_name as name, icon from gis.group_list where enabled and ${all_layers ? '$1' : 'group_id = any($1)'}`;
-  const { rows: categories } = await pg.query(selectCategories, [all_layers ? true : group_list]);
-  const categoriesCount = categories?.length || 0;
-
-  // services
-  const selectLayers = `
-    select
-    service_id as layer_id,
-    group_id as category_id,
-    name,
-    service_type,
-    source_path,
-    geom_type /*,
-   style,
-    popup,
-    card,
-    bi,
-    legend,
-    attributes,
-    popup*/
-    from gis.services
-    where is_active and 
-    ${all_layers ? '$1' : 'service_id = any($1)'}`;
-  const { rows: services } = await pg.query(selectLayers, [all_layers ? true : layer_list]);
-  const servicesCount = services?.length || 0;
-
-  // ogc services
-  const selectOgcServices = `select ogc_service_id as layer_id,group_id as category_id,name,service as service_type,url,html from gis.ogc_service where enabled and ${all_layers ? '$1' : 'ogc_service_id = any($1)'}`;
-  const { rows: ogcServices } = await pg.query(selectOgcServices, [all_layers ? true : layer_list]);
-  const ogcServicesCount = ogcServices?.length || 0;
-
-  // rasters
-  const selectRasters = `select raster_id as layer_id, group_id as category_id,name,'raster' as service_type,source_path from gis.rasters where enabled and ${all_layers ? '$1' : 'raster_id = any($1)'}`;
-  const { rows: rasters } = await pg.query(selectRasters, [all_layers ? true : layer_list]);
-  const rastersCount = rasters?.length || 0;
-
-  // cartocss
-  const selectCartocss = `select cartocss_id as layer_id, group_id as category_id,name,'cartocss' as service_type,config from gis.cartocss where enabled and ${all_layers ? '$1' : 'cartocss_id = any($1)'}`;
-  const { rows: cartocss } = await pg.query(selectCartocss, [all_layers ? true : layer_list]);
-  const cartocssCount = cartocss?.length || 0;
-
-  const layers = [
-    ...services,
-    ...ogcServices,
-    ...rasters,
-    ...cartocss,
-  ];
-  const layersCount = layers?.length || 0;
-
-  const res = {
-    categoriesCount,
-    layersCount,
-    servicesCount,
-    ogcServicesCount,
-    rastersCount,
-    cartocssCount,
-    categories,
-    layers,
-
-  };
-  const statusCode = (!layersCount && !categoriesCount) ? 204 : 200;
-
-  return reply.status(statusCode).send(res);
-}
+import getPermissions from './utils/get.permissions.js';
+
+export default async function gisCatalog(req, reply) {
+  const { pg, user } = req;
+
+  if (!user?.uid) return reply.status(403).send({ status: 403, message: 'access restricted' });
+
+  // permissions
+  const { all_layers, group_list, layer_list } = await getPermissions({ pg, uid: user.uid });
+  if (!all_layers && !group_list?.length && !layer_list?.length) {
+    return reply.status(200).send({
+      status: 204, categoriesCount: 0, layersCount: 0, servicesCount: 0, rastersCount: 0, categories: [], layers: [],
+    });
+  }
+
+  // groups
+  const selectCategories = `select group_id as category_id, group_name as name, icon from gis.group_list where enabled and ${all_layers ? '$1' : 'group_id = any($1)'}`;
+  const { rows: categories } = await pg.query(selectCategories, [all_layers ? true : group_list]);
+  const categoriesCount = categories?.length || 0;
+
+  // services
+  const selectLayers = `
+    select
+    service_id as layer_id,
+    group_id as category_id,
+    name,
+    service_type,
+    source_path,
+    geom_type /*,
+   style,
+    popup,
+    card,
+    bi,
+    legend,
+    attributes,
+    popup*/
+    from gis.services
+    where is_active and 
+    ${all_layers ? '$1' : 'service_id = any($1)'}`;
+  const { rows: services } = await pg.query(selectLayers, [all_layers ? true : layer_list]);
+  const servicesCount = services?.length || 0;
+
+  // ogc services
+  const selectOgcServices = `select ogc_service_id as layer_id,group_id as category_id,name,service as service_type,url,html from gis.ogc_service where enabled and ${all_layers ? '$1' : 'ogc_service_id = any($1)'}`;
+  const { rows: ogcServices } = await pg.query(selectOgcServices, [all_layers ? true : layer_list]);
+  const ogcServicesCount = ogcServices?.length || 0;
+
+  // rasters
+  const selectRasters = `select raster_id as layer_id, group_id as category_id,name,'raster' as service_type,source_path from gis.rasters where enabled and ${all_layers ? '$1' : 'raster_id = any($1)'}`;
+  const { rows: rasters } = await pg.query(selectRasters, [all_layers ? true : layer_list]);
+  const rastersCount = rasters?.length || 0;
+
+  // cartocss
+  const selectCartocss = `select cartocss_id as layer_id, group_id as category_id,name,'cartocss' as service_type,config from gis.cartocss where enabled and ${all_layers ? '$1' : 'cartocss_id = any($1)'}`;
+  const { rows: cartocss } = await pg.query(selectCartocss, [all_layers ? true : layer_list]);
+  const cartocssCount = cartocss?.length || 0;
+
+  const layers = [
+    ...services,
+    ...ogcServices,
+    ...rasters,
+    ...cartocss,
+  ];
+  const layersCount = layers?.length || 0;
+
+  const res = {
+    categoriesCount,
+    layersCount,
+    servicesCount,
+    ogcServicesCount,
+    rastersCount,
+    cartocssCount,
+    categories,
+    layers,
+
+  };
+  const statusCode = (!layersCount && !categoriesCount) ? 204 : 200;
+
+  return reply.status(statusCode).send(res);
+}

package/server/routes/permissions/controllers/utils/get.permissions.js

@@ -1,43 +1,43 @@
-export default async function getPermissions({ pg, uid }) {
-  if (!uid) return { all_layers: false, group_list: [] };
-  const selectPermissions = `
-            select
-            case when a.user_type='admin' then true else a.all_layers end as all_layers,
-            b.layer_list,
-            c.group_list
-            from admin.users a
-            left join lateral (
-                select array_agg(service_id) as layer_list
-                from gis.services_users_rel
-                where user_id = a.uid
-            ) b on true
-            left join lateral (
-                select
-                array_agg(distinct group_id) as group_list
-                from
-                (
-                    select 
-                    group_id
-                    from gis.services
-                    where is_public and is_active
-                    and service_id = any(b.layer_list)
-                    union all
-                    select
-                    group_id
-                    from gis.ogc_service
-                    where enabled and 
-                    ogc_service_id = any(b.layer_list)
-                )q
-                where group_id in (
-                    select group_id
-                    from gis.group_list
-                    where enabled
-                ) 
-            ) c on true
-            where a.uid = $1
-            limit 1
-        `;
-  const { all_layers, group_list, layer_list } = await pg.query(selectPermissions, [uid]).then(el => el?.rows?.[0] || {});
-
-  return { all_layers, group_list, layer_list };
-}
+export default async function getPermissions({ pg, uid }) {
+  if (!uid) return { all_layers: false, group_list: [] };
+  const selectPermissions = `
+            select
+            case when a.user_type='admin' then true else a.all_layers end as all_layers,
+            b.layer_list,
+            c.group_list
+            from admin.users a
+            left join lateral (
+                select array_agg(service_id) as layer_list
+                from gis.services_users_rel
+                where user_id = a.uid
+            ) b on true
+            left join lateral (
+                select
+                array_agg(distinct group_id) as group_list
+                from
+                (
+                    select 
+                    group_id
+                    from gis.services
+                    where is_public and is_active
+                    and service_id = any(b.layer_list)
+                    union all
+                    select
+                    group_id
+                    from gis.ogc_service
+                    where enabled and 
+                    ogc_service_id = any(b.layer_list)
+                )q
+                where group_id in (
+                    select group_id
+                    from gis.group_list
+                    where enabled
+                ) 
+            ) c on true
+            where a.uid = $1
+            limit 1
+        `;
+  const { all_layers, group_list, layer_list } = await pg.query(selectPermissions, [uid]).then(el => el?.rows?.[0] || {});
+
+  return { all_layers, group_list, layer_list };
+}

package/server/routes/permissions/index.mjs

@@ -1,18 +1,18 @@
-import catalogPermissions from './controllers/catalog.permissions.js';
-import catalogPermissionsEdit from './controllers/catalog.permissions.edit.js';
-import gisCatalog from './controllers/gis.catalog.js';
-
-export default async function route(fastify) {
-  if (!fastify.hasRoute({ method: 'GET', url: '/api/catalog' })) {
-    console.log('\x1b[34m%s\x1b[0m', 'add catalog from gis');
-    fastify.get('/catalog', { policy: 'L2' }, gisCatalog);
-  }
-  if (!fastify.hasRoute({ method: 'GET', url: '/api/catalog-permissions/:uid' })) {
-    console.log('\x1b[34m%s\x1b[0m', 'add catalog-permissions from gis');
-    fastify.get('/catalog-permissions/:uid', { policy: 'L2' }, catalogPermissions);
-  }
-  if (!fastify.hasRoute({ method: 'POST', url: '/api/catalog-permissions/:uid' })) {
-    console.log('\x1b[34m%s\x1b[0m', 'add catalog-permissions-edit from gis');
-    fastify.post('/catalog-permissions/:uid', { policy: 'L2' }, catalogPermissionsEdit);
-  }
-}
+import catalogPermissions from './controllers/catalog.permissions.js';
+import catalogPermissionsEdit from './controllers/catalog.permissions.edit.js';
+import gisCatalog from './controllers/gis.catalog.js';
+
+export default async function route(fastify) {
+  if (!fastify.hasRoute({ method: 'GET', url: '/api/catalog' })) {
+    console.log('\x1b[34m%s\x1b[0m', 'add catalog from gis');
+    fastify.get('/catalog', { policy: 'L2' }, gisCatalog);
+  }
+  if (!fastify.hasRoute({ method: 'GET', url: '/api/catalog-permissions/:uid' })) {
+    console.log('\x1b[34m%s\x1b[0m', 'add catalog-permissions from gis');
+    fastify.get('/catalog-permissions/:uid', { policy: 'L2' }, catalogPermissions);
+  }
+  if (!fastify.hasRoute({ method: 'POST', url: '/api/catalog-permissions/:uid' })) {
+    console.log('\x1b[34m%s\x1b[0m', 'add catalog-permissions-edit from gis');
+    fastify.post('/catalog-permissions/:uid', { policy: 'L2' }, catalogPermissionsEdit);
+  }
+}

package/server/routes/root.mjs

@@ -1,3 +1,3 @@
-export default async function (fastify, opts) {
-  fastify.get(`/test`, () => { return { test: true } });
-}
+export default async function (fastify, opts) {
+  fastify.get(`/test`, () => { return { test: true } });
+}

package/utils.js

@@ -1,13 +1,13 @@
-import gisRegistry from './server/routes/gis/registers/gis.registry.js';
-import gisRegistryList from './server/routes/gis/registers/gis.registry.list.js';
-import mapRegistry from './server/routes/gis/registers/map.registry.js';
-import rootFolder from './server/plugins/mapnik/funcs/rootFolder.mjs';
-import checkRasterFile from './server/plugins/mapnik/funcs/checkRasterFile.js';
-
-export {
-  gisRegistry,
-  gisRegistryList,
-  mapRegistry,
-  rootFolder,
-  checkRasterFile,
-};
+import gisRegistry from './server/routes/gis/registers/gis.registry.js';
+import gisRegistryList from './server/routes/gis/registers/gis.registry.list.js';
+import mapRegistry from './server/routes/gis/registers/map.registry.js';
+import rootFolder from './server/plugins/mapnik/funcs/rootFolder.mjs';
+import checkRasterFile from './server/plugins/mapnik/funcs/checkRasterFile.js';
+
+export {
+  gisRegistry,
+  gisRegistryList,
+  mapRegistry,
+  rootFolder,
+  checkRasterFile,
+};