@opengis/gis 0.1.77 → 0.1.78

package/server/routes/gis/registers/funcs/classifiers.js

@@ -1,4 +1,4 @@
-import { getSelectVal } from '@opengis/fastify-table/utils.js';
+import { getSelectVal, getSelect } from '@opengis/fastify-table/utils.js';
 
 export async function attachClassifiers(rowOrRows, classifiers = []) {
     const rows = Array.isArray(rowOrRows) ? rowOrRows : [rowOrRows];
@@ -35,3 +35,49 @@ export async function attachClassifiers(rowOrRows, classifiers = []) {
 
     return rowOrRows;
 }
+
+export async function populateFilterOptions({ pg, table, filters, columns, whereConditions }) {
+    if (!filters?.length || !table || !columns?.length) return;
+
+    const optimizedSQL = `select * from ${table} where ${whereConditions || '1=1'}`;
+
+    await Promise.all(
+        filters
+            .filter(
+                (el) =>
+                    el.id &&
+                    el.type !== "Autocomplete" &&
+                    !el.sql &&
+                    !el.options?.find?.((item) => item.sql)
+            )
+            .map(async (el) => {
+                const cls = el.data ? await getSelect(el.data, pg) : null;
+
+                if (!cls && !el.type?.includes?.("Check")) return;
+                const { dataTypeID } = (columns || []).find((item) => item.name === el.id) || {};
+
+                const q = pg.pgType[dataTypeID || '']?.includes("[]")
+                    ? `select unnest(${el.id})::text as id,count(*) from (${optimizedSQL})q group by unnest(${el.id}) limit 100`
+                    : `select ${el.id}::text as id,count(*) from (${optimizedSQL})q group by ${el.id} limit 100`;
+
+                const countArr = await pg.queryCache(q, { table });
+
+                if (countArr.timeout) {
+                    Object.assign(el, { timeout: countArr.timeout });
+                    console.warn("timeout filter", table, el.id);
+                }
+
+                const ids = countArr.rows.map((el1) => el1.id);
+
+                const clsData = await getSelectVal({ pg, values: ids, name: el.data });
+
+                const options = countArr.rows.map((cel) => {
+                    const data = cls?.arr?.find?.(
+                        (c) => c.id?.toString?.() === cel.id?.toString?.()
+                    ) || { text: clsData?.[cel.id]?.text || clsData?.[cel.id] || cel.id };
+                    return { ...cel, id: cel.id === null ? "null" : cel.id, ...data };
+                });
+                Object.assign(el, { options });
+            })
+    );
+}

package/server/routes/gis/registers/funcs/handleRegistryRequest.js

@@ -1,4 +1,4 @@
-import { attachClassifiers } from './classifiers.js';
+import { attachClassifiers, populateFilterOptions } from './classifiers.js';
 import { extractVisibleColumns } from './columns.js';
 import { getMeta, getFilterSQL } from "@opengis/fastify-table/utils.js";
 
@@ -84,6 +84,14 @@ export async function handleRegistryRequest({ settings, query, object_id, offset
         if (col.view_type === 'subtitle') listConfig.subtitle = col.name;
     }
 
+    await populateFilterOptions({
+        pg,
+        table: table_name,
+        filters: activeFilters,
+        columns,
+        whereConditions
+    });
+
     return {
         register_id,
         name,