@opengis/gis 0.2.176 → 0.2.178

package/server/routes/registers/functions/map.registry.js

@@ -1,87 +1,87 @@
-import { pgClients, getFilterSQL, getTemplate } from "@opengis/fastify-table/utils.js";
-
-import { BadRequestError, NotFoundError } from "@opengis/fastify-table/errors.js";
-
-import { attachClassifiers } from './classifiers.js';
-
-export default async function mapRegistry({
-    slug, id, filter, limit: queryLimit, page = 1
-}, pg = pgClients.client) {
-    if (!slug || !id) {
-        throw BadRequestError('Params slug and id is required');
-    }
-
-    const mapTemplate = await getTemplate('map', slug);
-
-    if (!mapTemplate) {
-        throw NotFoundError('Template not found');
-    }
-
-    const listWidget = mapTemplate.widgets?.find(w => w.type === 'list' && w.visible !== false && w.id === id);
-
-    if (!listWidget) {
-        throw NotFoundError('List widget not found');
-    }
-
-    const {
-        table,
-        pk,
-        query: baseQuery = '1=1',
-        order,
-        config = {},
-        name = '',
-    } = listWidget;
-
-    const { columns = [], filters = [], limit: configLimit = 20 } = config;
-    const limit = queryLimit || configLimit;
-    const offset = limit * (page - 1);
-    const selectColumns = columns.map(col => col.name);
-
-    const classifiers = columns
-        .filter(col => col.data && ["select", "badge", "tags"].includes(col.format))
-        .map(col => ({ name: col.name, classifier: col.data }));
-
-
-    const { q: sqlFilter } = filter
-        ? await getFilterSQL({ table, filter })
-        : { q: '1=1' };
-
-    const whereConditions = [baseQuery, sqlFilter].filter(Boolean).join(" AND ");
-    const whereClause = whereConditions ? `WHERE ${whereConditions}` : "";
-
-    const sqlBase = `FROM ${table} ${whereClause}`;
-    const sqlOrder = order ? `ORDER BY ${order}` : "";
-    const sqlLimit = `LIMIT $1::bigint OFFSET $2::bigint`;
-    const sqlSelect = `SELECT ${pk} as id, ${selectColumns.join(", ")} 
-    ${sqlBase}`;
-    const dataQuery = `${sqlSelect} ${sqlOrder} ${sqlLimit}`;
-    const totalQuery = `SELECT COUNT(*) ${sqlBase}`;
-
-    const [dataRes, countRes] = await Promise.all([
-        pg.query(dataQuery, [limit, offset]),
-        pg.query(totalQuery)
-    ]);
-
-    const rows = await attachClassifiers(dataRes?.rows, classifiers);
-    const total = parseInt(countRes?.rows[0]?.count || 0, 10);
-
-    const listViewConfig = {};
-    columns.forEach(col => {
-        if (col.view_type === 'title') listViewConfig.title = col?.name;
-        if (col.view_type === 'subtitle') listViewConfig.subtitle = col?.name;
-    });
-
-    return {
-        name,
-        rows,
-        total,
-        columns,
-        filters,
-        config: {
-            ...listWidget,
-            list: {
-                ...listViewConfig
-            }
-        }
-    };
-}
+import { pgClients, getFilterSQL, getTemplate } from "@opengis/fastify-table/utils.js";
+
+import { BadRequestError, NotFoundError } from "@opengis/fastify-table/errors.js";
+
+import { attachClassifiers } from './classifiers.js';
+
+export default async function mapRegistry({
+    slug, id, filter, limit: queryLimit, page = 1
+}, pg = pgClients.client) {
+    if (!slug || !id) {
+        throw BadRequestError('Params slug and id is required');
+    }
+
+    const mapTemplate = await getTemplate('map', slug);
+
+    if (!mapTemplate) {
+        throw NotFoundError('Template not found');
+    }
+
+    const listWidget = mapTemplate.widgets?.find(w => w.type === 'list' && w.visible !== false && w.id === id);
+
+    if (!listWidget) {
+        throw NotFoundError('List widget not found');
+    }
+
+    const {
+        table,
+        pk,
+        query: baseQuery = '1=1',
+        order,
+        config = {},
+        name = '',
+    } = listWidget;
+
+    const { columns = [], filters = [], limit: configLimit = 20 } = config;
+    const limit = queryLimit || configLimit;
+    const offset = limit * (page - 1);
+    const selectColumns = columns.map(col => col.name);
+
+    const classifiers = columns
+        .filter(col => col.data && ["select", "badge", "tags"].includes(col.format))
+        .map(col => ({ name: col.name, classifier: col.data }));
+
+
+    const { q: sqlFilter } = filter
+        ? await getFilterSQL({ table, filter })
+        : { q: '1=1' };
+
+    const whereConditions = [baseQuery, sqlFilter].filter(Boolean).join(" AND ");
+    const whereClause = whereConditions ? `WHERE ${whereConditions}` : "";
+
+    const sqlBase = `FROM ${table} ${whereClause}`;
+    const sqlOrder = order ? `ORDER BY ${order}` : "";
+    const sqlLimit = `LIMIT $1::bigint OFFSET $2::bigint`;
+    const sqlSelect = `SELECT ${pk} as id, ${selectColumns.join(", ")} 
+    ${sqlBase}`;
+    const dataQuery = `${sqlSelect} ${sqlOrder} ${sqlLimit}`;
+    const totalQuery = `SELECT COUNT(*) ${sqlBase}`;
+
+    const [dataRes, countRes] = await Promise.all([
+        pg.query(dataQuery, [limit, offset]),
+        pg.query(totalQuery)
+    ]);
+
+    const rows = await attachClassifiers(dataRes?.rows, classifiers);
+    const total = parseInt(countRes?.rows[0]?.count || 0, 10);
+
+    const listViewConfig = {};
+    columns.forEach(col => {
+        if (col.view_type === 'title') listViewConfig.title = col?.name;
+        if (col.view_type === 'subtitle') listViewConfig.subtitle = col?.name;
+    });
+
+    return {
+        name,
+        rows,
+        total,
+        columns,
+        filters,
+        config: {
+            ...listWidget,
+            list: {
+                ...listViewConfig
+            }
+        }
+    };
+}

package/server/routes/registers/registers.route.js

@@ -1,80 +1,91 @@
-import gisRegistry from './functions/gis.registry.js';
-import gisRegistryList from './functions/gis.registry.list.js';
-// import mapRegistry from './functions/map.registry.js';
-import gisExport from './functions/gis.export.js';
-import addGisRegistry from './functions/add.registry.js';
-import deleteGisRegistry from './functions/del.registry.js';
-
-import {
-    gisRegistrySchema,
-    gisRegistryListSchema,
-    addGisRegistrySchema,
-    editGisRegistrySchema,
-    deleteGisRegistrySchema,
-    gisExportSchema,
-} from './registers.schema.js';
-
-const publicParams = { config: { policy: 'L0', package: 'gis' } };
-
-async function route(app) {
-    app.get('/gis-registry/:slug', { ...publicParams, schema: gisRegistrySchema }, async ({ params, query, pg }) => {
-        const result = await gisRegistry({
-            slug: params.slug,
-            search: query.search,
-            filter: query.filter,
-            page: query.page,
-            limit: query.limit,
-            sql: query.sql,
-        }, pg);
-        return result;
-    });
-    app.get('/gis-registry/:slug/:objectId', { ...publicParams, schema: gisRegistrySchema }, async ({ params, query, pg }) => {
-        const result = await gisRegistry({
-            slug: params.slug,
-            objectId: params.objectId,
-            search: query.search,
-            filter: query.filter,
-            page: query.page,
-            limit: query.limit,
-            sql: query.sql,
-        }, pg);
-        return result;
-    });
-    app.get('/gis-registry', { ...publicParams, schema: gisRegistryListSchema }, async ({ query, pg }) => {
-        const result = await gisRegistryList({
-            page: query.page,
-            limit: query.limit,
-            search: query.search,
-        }, pg);
-        return result;
-    });
-    app.post('/gis-registry/:slug?', { ...publicParams, schema: addGisRegistrySchema }, async ({ method, params, body, user, pg }) => {
-        const result = await addGisRegistry({
-            method, slug: params.slug, body, uid: user?.uid,
-        }, pg);
-        return result;
-    });
-    app.put('/gis-registry/:slug', { ...publicParams, schema: editGisRegistrySchema }, async ({ method, params, body, user, pg }) => {
-        const result = await addGisRegistry({
-            method, slug: params.slug, body, uid: user?.uid,
-        }, pg);
-        return result;
-    });
-    app.delete('/gis-registry/:slug', { ...publicParams, schema: deleteGisRegistrySchema }, async ({ params, user, pg }) => {
-        const result = await deleteGisRegistry({
-            slug: params.slug,
-            uid: user?.uid,
-        }, pg);
-        return result;
-    });
-    // app.get('/map-registry/:slug/:id', { ...publicParams, schema: mapRegistrySchema }, mapRegistry);
-    app.get('/gis-export/:type/:slug', { ...publicParams, schema: gisExportSchema }, async ({ params, query, pg }, reply) => {
-        const result = await gisExport({
-            slug: params.slug,
-            type: params.type,
-            format: query.format,
-        }, pg);
-        return reply.headers(result.headers).send(result.data);
-    });
-}
-export default route;
+import gisRegistry from './functions/gis.registry.js';
+import gisRegistryList from './functions/gis.registry.list.js';
+// import mapRegistry from './functions/map.registry.js';
+import gisExport from './functions/gis.export.js';
+import addGisRegistry from './functions/add.registry.js';
+import deleteGisRegistry from './functions/del.registry.js';
+import gisSuggest from './functions/gis.suggest.js';
+
+import {
+    gisRegistrySchema,
+    gisRegistryListSchema,
+    addGisRegistrySchema,
+    editGisRegistrySchema,
+    deleteGisRegistrySchema,
+    gisExportSchema,
+    gisSuggestSchema,
+} from './registers.schema.js';
+
+const publicParams = { config: { policy: 'L0', package: 'gis' } };
+
+async function route(app) {
+    app.get('/gis-registry/:slug', { ...publicParams, schema: gisRegistrySchema }, async ({ params, query, pg }) => {
+        const result = await gisRegistry({
+            slug: params.slug,
+            search: query.search,
+            filter: query.filter,
+            page: query.page,
+            limit: query.limit,
+            sql: query.sql,
+        }, pg);
+        return result;
+    });
+    app.get('/gis-registry/:slug/:objectId', { ...publicParams, schema: gisRegistrySchema }, async ({ params, query, pg }) => {
+        const result = await gisRegistry({
+            slug: params.slug,
+            objectId: params.objectId,
+            search: query.search,
+            filter: query.filter,
+            page: query.page,
+            limit: query.limit,
+            sql: query.sql,
+        }, pg);
+        return result;
+    });
+    app.get('/gis-registry', { ...publicParams, schema: gisRegistryListSchema }, async ({ query, pg }) => {
+        const result = await gisRegistryList({
+            page: query.page,
+            limit: query.limit,
+            search: query.search,
+        }, pg);
+        return result;
+    });
+    app.post('/gis-registry/:slug?', { ...publicParams, schema: addGisRegistrySchema }, async ({ method, params, body, user, pg }) => {
+        const result = await addGisRegistry({
+            method, slug: params.slug, body, uid: user?.uid,
+        }, pg);
+        return result;
+    });
+    app.put('/gis-registry/:slug', { ...publicParams, schema: editGisRegistrySchema }, async ({ method, params, body, user, pg }) => {
+        const result = await addGisRegistry({
+            method, slug: params.slug, body, uid: user?.uid,
+        }, pg);
+        return result;
+    });
+    app.delete('/gis-registry/:slug', { ...publicParams, schema: deleteGisRegistrySchema }, async ({ params, user, pg }) => {
+        const result = await deleteGisRegistry({
+            slug: params.slug,
+            uid: user?.uid,
+        }, pg);
+        return result;
+    });
+    // app.get('/map-registry/:slug/:id', { ...publicParams, schema: mapRegistrySchema }, mapRegistry);
+    app.get('/gis-export/:type/:slug', { ...publicParams, schema: gisExportSchema }, async ({ params, query, pg }, reply) => {
+        const result = await gisExport({
+            slug: params.slug,
+            type: params.type,
+            format: query.format,
+        }, pg);
+        return reply.headers(result.headers).send(result.data);
+    });
+    app.get('/gis-suggest/:token', { ...publicParams, schema: gisSuggestSchema }, async ({ params, query, pg }) => {
+        const result = await gisSuggest({
+            token: params.token,
+            key: query.key,
+            val: query.val,
+            limit: query.limit,
+        }, pg);
+        return result;
+    });
+}
+export default route;