@opengis/gis 0.2.180 → 0.2.182

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.180",
+  "version": "0.2.182",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",

package/server/routes/registers/functions/getTableColumnMeta.js

@@ -13,6 +13,7 @@ export default async function getTableColumnMeta(
         table,
         template,
         column: queryColumn,
+        cls,
         filtered,
         startsWith,
         key,
@@ -41,8 +42,9 @@ export default async function getTableColumnMeta(
         ? await getFilter({ pg, table: template }).then((el) => el.list)
         : null;
 
-    const { data: clsName } =
-        (filters || []).find((el) => el.name === queryColumn) || {};
+    const { data: clsName } = cls
+        ? { data: cls }
+        : (filters || []).find((el) => el.name === queryColumn) || {};
     const { arr, sql: select } =
         (await getSelect(clsName || queryColumn, pg)) || // cls name === table:column
         (await getSelect(queryColumn, pg)) || // cls name === column name

package/server/routes/registers/functions/gis.suggest.js

@@ -55,6 +55,7 @@ export default async function gisSuggest({ token, key, val, uid, lang = 'ua', li
     const clsMeta = await getTableColumnMeta({
         table: registry.table_name,
         column: name,
+        cls,
         filtered: !!(key || val),
         key,
     });
@@ -70,7 +71,7 @@ export default async function gisSuggest({ token, key, val, uid, lang = 'ua', li
         "''"
     );
 
-    // table:column + cls
+    // table:column w/ out cls
     if (arr && !cls) {
         const sqlCls = count
             ? `select value, count(*) from (select ${pg.pgType?.[dataTypeID]?.includes("[]")
@@ -138,31 +139,6 @@ export default async function gisSuggest({ token, key, val, uid, lang = 'ua', li
         }
     }
 
-    // cls
-    if (arr) {
-        const lower = key?.toLowerCase();
-        const data1 =
-            key || val
-                ? arr
-                    ?.filter(
-                        (el) =>
-                            !lower ||
-                            (el[lang] || el.text)?.toLowerCase()?.indexOf(lower) !== -1
-                    )
-                    ?.filter((el) => !val || val?.split?.(",")?.includes?.(el.id))
-                : arr;
-        const data = data1.slice(0, Math.min(limit1 || limit, limit));
-
-        return {
-            time: Date.now() - time,
-            limit,
-            count: data.length,
-            total: arr.length,
-            mode: "array",
-            data,
-        };
-    }
-
     // table:column as select query
     const args = [];
     const where = [];
@@ -231,7 +207,37 @@ export default async function gisSuggest({ token, key, val, uid, lang = 'ua', li
             Object.assign(el, { id: "null", text: "Показати порожні значення" })
         );
 
-    // table:column + select
+    const ids = data.map((el) => el.text);
+
+    // table:column w/ cls
+    if (arr) {
+        const lower = key?.toLowerCase();
+        const data1 =
+            key || val
+                ? arr
+                    ?.filter(
+                        (el) =>
+                            !lower ||
+                            (el[lang] || el.text)?.toLowerCase()?.indexOf(lower) !== -1
+                    )
+                    ?.filter((el) => !val || val?.split?.(",")?.includes?.(el.id))
+                : arr;
+        const data2 = data1.filter((el) => ids.includes(el.id)).slice(0, Math.min(limit1 || limit, limit));
+        data2.forEach((el) => Object.assign(el, { count: data.find((e) => e.text === el.id)?.count || 0 }));
+        if (data.find((el) => el.id === 'null') && !data2.find((el) => el.id === 'null')) {
+            data2.push(data.find((el) => el.id === 'null'));
+        }
+        return {
+            time: Date.now() - time,
+            limit,
+            count: data2.length,
+            total: arr.length,
+            mode: "array",
+            data: data2,
+        };
+    }
+
+    // table:column w/ select
     if (!cls) {
         const { name: clsName = name, type = "select" } =
             getColumnCLS(registry.table_name, name) || {};
@@ -263,6 +269,15 @@ export default async function gisSuggest({ token, key, val, uid, lang = 'ua', li
         };
     }
 
+    await metaFormat(
+        {
+            rows: data,
+            cls: { text: cls },
+            sufix: false,
+        },
+        pg
+    );
+
     return {
         time: Date.now() - time,
         limit,

package/server/routes/registers/functions/handleRegistryRequest.js

@@ -35,7 +35,7 @@ export async function handleRegistryRequest({
     const { arr, sql } = el.data ? await getSelect(el.data, pg) : {};
 
     const r = {
-      ...el, id: el.name || el.id, type: el.type, api: `/api/gis-suggest/${hash}`, options: arr, sql,
+      ...el, id: el.name || el.id, type: el.type, api: `/api/gis-suggest/${hash}`, options: arr, select: sql
     };
 
     const unique = await rclient.setnx(redisKey, 1);