@opengis/admin 0.3.39 → 0.3.41

package/server/routes/properties/schema.js

@@ -1,11 +1,11 @@
-const propertiesSchema = {
-    params: {
-      key: { type: 'string', pattern: '^([\\d\\w._]+)$' },
-    },
-    querystring: {
-      json: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    },
-};
-
-export default null;
+const propertiesSchema = {
+    params: {
+      key: { type: 'string', pattern: '^([\\d\\w._]+)$' },
+    },
+    querystring: {
+      json: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
+};
+
+export default null;
 export { propertiesSchema }

package/server/routes/report/controllers/data.js

@@ -1,76 +1,76 @@
-import { handlebars, pgClients, getTemplate, metaFormat, handlebarsSync } from '@opengis/fastify-table/utils.js';
-
-import getFilterQuery from '../utils/getFilterQuery.js';
-
-const maxLimit = 100;
-
-export default async function reportData({
-    pg = pgClients.client, params = {}, query = {}, user = {},
-}) {
-    if (!params?.name) {
-        return { message: 'not enough params: name', status: 400 };
-    }
-
-    const loadTemplate = await getTemplate('report', params.name);
-
-    if (!loadTemplate?.sql) {
-        return { message: `report not found: ${params.name}`, status: 404 };
-    }
-
-    const { uid } = user;
-
-    const { kpi, sql, meta, filters } = loadTemplate;
-    const { date, columns: metaColumns } = meta || {};
-
-    const granularity = query.granularity && date && false ? `date_trunc('${query.granularity}',${date})::date::text` : null;
-    const groupby = [meta?.groupby, granularity].filter(el => el).join(',');
-
-    const period = query.period && date ? `${date}=${query.period}` : null;
-    const filter = [query.filter, period].filter(el => el).join(';');
-
-    const limit = Math.min(maxLimit, +(query.limit || 20));
-    const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
-
-    const kpiColumns = kpi ? kpi?.map(el => `${el.sql || 'count(*)'} as "${el.name}"`)?.join(',') : '';
-    const columnsList = metaColumns || loadTemplate.columns?.map(el => el.name)?.join(',');
-
-    const qMeta = await handlebars.compile(sql)({ user, uid });
-    const { fields = [] } = await pg.query(`select * from (${qMeta})q limit 0`);
-
-    const where = filter ? getFilterQuery({ pg, filter, fields, filterList: filters })?.map?.(el => el.query)?.join(' and ') : null;
-
-    const qAgg = `select ${kpiColumns || ''} from (${qMeta})q where ${where || '1=1'}`;
-    const q = `select ${columnsList || '*'} from (${qMeta})q where ${where || '1=1'} ${groupby ? `group by ${groupby}` : ''} limit ${limit} offset ${offset}`;
-
-    if (query.sql && user?.user_type?.includes('admin')) return `${qAgg};${q}`;
-
-    const kpiData = await pg.query(qAgg).then(el => el.rows?.[0] || {});
-    kpi?.forEach(el => Object.assign(el, { count: kpiData[el.name] || '0' }));
-
-    const { rows = [] } = await pg.query(q);
-
-    const cls = meta?.cls || loadTemplate.columns
-        ?.filter(el => (el.option || el.data))
-        ?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: (curr.option || curr.data) }), {});
-
-    const titles = meta?.titles
-        || loadTemplate.columns?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.title }), {});
-
-    await metaFormat({ rows, cls, sufix: true });
-
-    const columns = loadTemplate.columns
-        || fields.map(el => ({
-            name: el.name,
-            title: titles?.[el.name] || el.name,
-            type: cls?.[el.name] ? 'Autocomplete' : 'Text',
-            format: pg.pgType?.[el.dataTypeID],
-            data: cls?.[el.name],
-        }));
-
-    return {
-        q: user?.user_type?.includes('admin') ? q : undefined,
-        kpi,
-        rows,
-        columns,
-    };
-}
+import { handlebars, pgClients, getTemplate, metaFormat, handlebarsSync } from '@opengis/fastify-table/utils.js';
+
+import getFilterQuery from '../utils/getFilterQuery.js';
+
+const maxLimit = 100;
+
+export default async function reportData({
+    pg = pgClients.client, params = {}, query = {}, user = {},
+}) {
+    if (!params?.name) {
+        return { message: 'not enough params: name', status: 400 };
+    }
+
+    const loadTemplate = await getTemplate('report', params.name);
+
+    if (!loadTemplate?.sql) {
+        return { message: `report not found: ${params.name}`, status: 404 };
+    }
+
+    const { uid } = user;
+
+    const { kpi, sql, meta, filters } = loadTemplate;
+    const { date, columns: metaColumns } = meta || {};
+
+    const granularity = query.granularity && date && false ? `date_trunc('${query.granularity}',${date})::date::text` : null;
+    const groupby = [meta?.groupby, granularity].filter(el => el).join(',');
+
+    const period = query.period && date ? `${date}=${query.period}` : null;
+    const filter = [query.filter, period].filter(el => el).join(';');
+
+    const limit = Math.min(maxLimit, +(query.limit || 20));
+    const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
+
+    const kpiColumns = kpi ? kpi?.map(el => `${el.sql || 'count(*)'} as "${el.name}"`)?.join(',') : '';
+    const columnsList = metaColumns || loadTemplate.columns?.map(el => el.name)?.join(',');
+
+    const qMeta = await handlebars.compile(sql)({ user, uid });
+    const { fields = [] } = await pg.query(`select * from (${qMeta})q limit 0`);
+
+    const where = filter ? getFilterQuery({ pg, filter, fields, filterList: filters })?.map?.(el => el.query)?.join(' and ') : null;
+
+    const qAgg = `select ${kpiColumns || ''} from (${qMeta})q where ${where || '1=1'}`;
+    const q = `select ${columnsList || '*'} from (${qMeta})q where ${where || '1=1'} ${groupby ? `group by ${groupby}` : ''} limit ${limit} offset ${offset}`;
+
+    if (query.sql && user?.user_type?.includes('admin')) return `${qAgg};${q}`;
+
+    const kpiData = await pg.query(qAgg).then(el => el.rows?.[0] || {});
+    kpi?.forEach(el => Object.assign(el, { count: kpiData[el.name] || '0' }));
+
+    const { rows = [] } = await pg.query(q);
+
+    const cls = meta?.cls || loadTemplate.columns
+        ?.filter(el => (el.option || el.data))
+        ?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: (curr.option || curr.data) }), {});
+
+    const titles = meta?.titles
+        || loadTemplate.columns?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.title }), {});
+
+    await metaFormat({ rows, cls, sufix: true });
+
+    const columns = loadTemplate.columns
+        || fields.map(el => ({
+            name: el.name,
+            title: titles?.[el.name] || el.name,
+            type: cls?.[el.name] ? 'Autocomplete' : 'Text',
+            format: pg.pgType?.[el.dataTypeID],
+            data: cls?.[el.name],
+        }));
+
+    return {
+        q: user?.user_type?.includes('admin') ? q : undefined,
+        kpi,
+        rows,
+        columns,
+    };
+}

package/server/routes/report/controllers/list.js

@@ -1,18 +1,18 @@
-import { getTemplatePath, getTemplate } from '@opengis/fastify-table/utils.js';
-
-export default async function reportList({
-    user = {},
-}) {
-    const arr = getTemplatePath('report').filter(el => el[2] === 'json').map(el => el[0]);
-
-    const rows = await Promise.all(arr.map(async (el) => {
-        const loadTemplate = await getTemplate('report', el);
-        return {
-            name: el,
-            filters: loadTemplate?.filters || [],
-            title: loadTemplate?.title || el,
-            sql: user.user_type?.includes('admin') ? loadTemplate?.sql : undefined,
-        };
-    }));
-    return { rows };
-}
+import { getTemplatePath, getTemplate } from '@opengis/fastify-table/utils.js';
+
+export default async function reportList({
+    user = {},
+}) {
+    const arr = getTemplatePath('report').filter(el => el[2] === 'json').map(el => el[0]);
+
+    const rows = await Promise.all(arr.map(async (el) => {
+        const loadTemplate = await getTemplate('report', el);
+        return {
+            name: el,
+            filters: loadTemplate?.filters || [],
+            title: loadTemplate?.title || el,
+            sql: user.user_type?.includes('admin') ? loadTemplate?.sql : undefined,
+        };
+    }));
+    return { rows };
+}

package/server/routes/report/index.mjs

@@ -1,7 +1,7 @@
-import reportData from './controllers/data.js';
-import reportList from './controllers/list.js';
-
-export default async function route(app) {
-  app.get('/reports', {}, reportList);
-  app.get('/reports/:name', {}, reportData);
-}
+import reportData from './controllers/data.js';
+import reportList from './controllers/list.js';
+
+export default async function route(app) {
+  app.get('/reports', {}, reportList);
+  app.get('/reports/:name', {}, reportData);
+}

package/server/routes/report/utils/formatValue.js

@@ -1,179 +1,179 @@
-const dateTypeList = ['date', 'timestamp', 'timestamp without time zone', 'timestamp with time zone'];
-const numberTypeList = ['float8', 'int4', 'int8', 'numeric', 'double precision', 'integer'];
-const isValidDate = (dateStr) => {
-  const [dd, mm, yyyy] = dateStr.split('.');
-  return new Date(mm + '/' + dd + '/' + yyyy).toString() !== 'Invalid Date';
-};
-
-function dt(y, m, d) {
-  return new Date(Date.UTC(y, m, d)).toISOString().slice(0, 10);
-}
-const dp = {
-  d: new Date().getDate(),
-  w: new Date().getDate() - (new Date().getDay() || 7) + 1,
-  m: new Date().getMonth(),
-  q: (new Date().getMonth() / 4).toFixed() * 3,
-  y: new Date().getFullYear(),
-};
-
-function formatDateISOString(date) {
-  if (!date?.includes('.')) return date;
-  const [day, month, year] = date.split('.');
-  return `${year}-${month}-${day}`;
-}
-
-function formatValue({
-  pg, filter = {}, name, value, operator = '=', dataTypeID, uid = 1, optimize,
-}) {
-  const { data, sql, extra } = filter;
-  const pk = false;
-
-  if (!dataTypeID && !extra) return {};
-  const fieldType = extra ? pg.pgType?.[{ Date: 1114 }[filter?.type] || 25] : pg.pgType?.[dataTypeID];
-  if (!name || !value || !fieldType) return {};
-  const filterType = filter.type?.toLowerCase();
-
-  // current day, week, month, year etc.
-  if (dateTypeList.includes(fieldType) && !value?.includes('_') && ['cd', 'cw', 'cm', 'cq', 'cy'].includes(value)) {
-    const query = {
-      cd: `${name}::date = '${dt(dp.y, dp.m, dp.d)}'::date`,
-      cw: `${name}::date >= '${dt(dp.y, dp.m, dp.w)}'::date and ${name} <= '${dt(dp.y, dp.m, dp.w + 6)}'::date`,
-      cm: `${name}::date >= '${dt(dp.y, dp.m, 1)}'::date and ${name} <= '${dt(dp.y, dp.m + 1, 0)}'::date`,
-      cq: `${name}::date >= '${dt(dp.y, dp.q, 1)}'::date and ${name} <= '${dt(dp.y, dp.q + 3, 0)}'::date`,
-      cy: `${name}::date >= '${dt(dp.y, 0, 1)}'::date and ${name}::date <= '${dt(dp.y, 11, 31)}'::date`,
-    }[value];
-    return { op: '=', query, extra };
-  }
-
-  // date range
-  if (dateTypeList.includes(fieldType) && value?.includes('_')) {
-    const [min, max] = value.split('_');
-    const query = `${name} >= '${min}'::date and ${name} <= '${max}'::date`;
-    return { op: 'between', query, extra };
-  }
-
-  // v3 filter date range, example - "01.01.2024-31.12.2024"
-  if (dateTypeList.includes(fieldType) && value?.includes('.') && value?.indexOf('-') === 10 && value?.length === 21) {
-    const [startDate, endDate] = value.split('-');
-    const min = formatDateISOString(startDate);
-    const max = formatDateISOString(endDate);
-
-    if (!isValidDate(startDate) || !isValidDate(endDate)) {
-      return { op: 'between', query: 'false', extra };
-    }
-    const query = extra && pk
-      ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_date::date >= '${min}'::date and value_date::date <= '${max}'::date)`
-      : `${name}::date >= '${min}'::date and ${name}::date <= '${max}'::date`;
-    return { op: 'between', query, extra };
-  }
-
-  // my rows
-  if (value === 'me' && uid && fieldType === 'text') {
-    return { op: '=', query: extra ? `uid = '${uid}'` : `${name}::text = '${uid}'`, extra };
-  }
-
-  const formatType = {
-    float8: 'numeric',
-    int4: 'numeric',
-    int8: 'numeric',
-    varchar: 'text',
-    bool: 'boolean',
-    geometry: 'geom',
-  }[fieldType] || 'text';
-
-  if (optimize && optimize.name !== optimize.pk) {
-    const val = filterType === 'text' ? `ilike '%${value}%'` : `= any('{${value}}')`;
-    return {
-      op: '~',
-      query: fieldType?.includes('[]')
-        ? `${optimize.pk} && (select array_agg(${optimize.pk}) from ${optimize.table} where ${name} ${val} )`
-        : `${optimize.pk} in (select ${optimize.pk} from ${optimize.table} where ${name} ${val} )`,
-      extra,
-    };
-  }
-
-  if (fieldType?.includes('[]')) {
-    return { op: 'in', query: `'{${value}}'::text[] && ${name}::text[]`, extra };
-  }
-
-  // multiple items of 1 param
-  if (value?.indexOf(',') !== -1) {
-    const values = value.split(',').filter((el) => el !== 'null');
-    if (extra && pk) {
-      const query = value?.indexOf('null') !== -1
-        ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and ( value_text is null or value_text in (${values?.map((el) => `'"${el}"'`).join(',')}) ) )`
-        : `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text in (${values?.map((el) => `'"${el}"'`).join(',')}) )`;
-      return { op: 'in', query, extra };
-    }
-    const query = value?.indexOf('null') !== -1
-      ? `( ${name} is null or ${name}::text in (${values?.map((el) => `'${el}'`).join(',')}) )`
-      : `${name}::text in (${value.split(',')?.map((el) => `'${el}'`).join(',')})`;
-    return { op: 'in', query, extra };
-  }
-
-  // v3 filter number range, example - "100_500"
-  if (numberTypeList.includes(fieldType) && value?.indexOf('_') !== -1) {
-    const [min, max] = value.split('_');
-    const query = (max === 'max' ? `${name} > ${min}` : null) || (min === 'min' ? `${name} <= ${max}` : null) || `${name} between ${min} and ${max}`;
-    return { op: 'between', query, extra };
-  }
-
-  // number range
-  if (numberTypeList.includes(fieldType) && value?.indexOf('-') !== -1) {
-    const [min, max] = value.split('-');
-    if (min === 'min' && max === 'max') return {};
-    const query = (max === 'max' ? `${name} > ${min}` : null) || (min === 'min' ? `${name} < ${max}` : null) || `${name} between ${min} and ${max}`;
-    return { op: 'between', query, extra };
-  }
-
-  if (['<', '>'].includes(operator)) {
-    const query = `${name} ${operator} '${value}'::${formatType}`;
-    return { op: operator, query, extra };
-  }
-
-  if (operator === '=' && filterType !== 'text' && !filter?.data) {
-    const query = {
-      null: `${name} is null`,
-      notnull: `${name} is not null`,
-    }[value] || `${name}::${formatType}='${value}'::${formatType}`;
-    return { op: '=', query, extra };
-  }
-
-  if (['~', '='].includes(operator)) {
-    const operator1 = (filterType === 'text' && (filter?.id || filter?.name) && operator === '=' ? '~' : operator);
-    const matchNull = { null: 'is null', notnull: 'is not null' }[value];
-    const match = matchNull || ((operator1 === '=' || filterType === 'autocomplete') ? `='${value}'` : `ilike '%${value}%'`);
-    if (extra && pk) {
-      const query = data && sql
-        ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text in ( ( with q(id,name)  as  (${sql}) select id from q where ${filterType === 'autocomplete' ? 'id' : 'name'} ${match})))`
-        : `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text ${match})`;
-      return { op: 'ilike', query, extra };
-    }
-
-    const query = filter?.data && filter?.sql
-      ? `${filter?.name || filter?.id} in ( ( with q(id,name)  as  (${filter?.sql}) select id from q where ${filterType === 'autocomplete' ? 'id' : 'name'}::text ${match}) )` // filter with cls
-      : `${name}::text ${match}`; // simple filter
-    // console.log(query);
-    return { op: 'ilike', query };
-  }
-
-  // json
-  if (name.includes('.')) {
-    const [col, prop] = name.split('.');
-    const query = ` ${col}->>'${prop}' in ('${value.join("','")}')`;
-    return { op: 'in', query, extra };
-  }
-
-  // geometry
-  if (['geometry'].includes(fieldType)) {
-    const bbox = value[0].split('_');
-
-    if (bbox?.length === 4) {
-      const query = ` ${name} && 'box(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d `;
-      return { op: '&&', query, extra };
-    }
-  }
-  return {};
-}
-
-export default formatValue;
+const dateTypeList = ['date', 'timestamp', 'timestamp without time zone', 'timestamp with time zone'];
+const numberTypeList = ['float8', 'int4', 'int8', 'numeric', 'double precision', 'integer'];
+const isValidDate = (dateStr) => {
+  const [dd, mm, yyyy] = dateStr.split('.');
+  return new Date(mm + '/' + dd + '/' + yyyy).toString() !== 'Invalid Date';
+};
+
+function dt(y, m, d) {
+  return new Date(Date.UTC(y, m, d)).toISOString().slice(0, 10);
+}
+const dp = {
+  d: new Date().getDate(),
+  w: new Date().getDate() - (new Date().getDay() || 7) + 1,
+  m: new Date().getMonth(),
+  q: (new Date().getMonth() / 4).toFixed() * 3,
+  y: new Date().getFullYear(),
+};
+
+function formatDateISOString(date) {
+  if (!date?.includes('.')) return date;
+  const [day, month, year] = date.split('.');
+  return `${year}-${month}-${day}`;
+}
+
+function formatValue({
+  pg, filter = {}, name, value, operator = '=', dataTypeID, uid = 1, optimize,
+}) {
+  const { data, sql, extra } = filter;
+  const pk = false;
+
+  if (!dataTypeID && !extra) return {};
+  const fieldType = extra ? pg.pgType?.[{ Date: 1114 }[filter?.type] || 25] : pg.pgType?.[dataTypeID];
+  if (!name || !value || !fieldType) return {};
+  const filterType = filter.type?.toLowerCase();
+
+  // current day, week, month, year etc.
+  if (dateTypeList.includes(fieldType) && !value?.includes('_') && ['cd', 'cw', 'cm', 'cq', 'cy'].includes(value)) {
+    const query = {
+      cd: `${name}::date = '${dt(dp.y, dp.m, dp.d)}'::date`,
+      cw: `${name}::date >= '${dt(dp.y, dp.m, dp.w)}'::date and ${name} <= '${dt(dp.y, dp.m, dp.w + 6)}'::date`,
+      cm: `${name}::date >= '${dt(dp.y, dp.m, 1)}'::date and ${name} <= '${dt(dp.y, dp.m + 1, 0)}'::date`,
+      cq: `${name}::date >= '${dt(dp.y, dp.q, 1)}'::date and ${name} <= '${dt(dp.y, dp.q + 3, 0)}'::date`,
+      cy: `${name}::date >= '${dt(dp.y, 0, 1)}'::date and ${name}::date <= '${dt(dp.y, 11, 31)}'::date`,
+    }[value];
+    return { op: '=', query, extra };
+  }
+
+  // date range
+  if (dateTypeList.includes(fieldType) && value?.includes('_')) {
+    const [min, max] = value.split('_');
+    const query = `${name} >= '${min}'::date and ${name} <= '${max}'::date`;
+    return { op: 'between', query, extra };
+  }
+
+  // v3 filter date range, example - "01.01.2024-31.12.2024"
+  if (dateTypeList.includes(fieldType) && value?.includes('.') && value?.indexOf('-') === 10 && value?.length === 21) {
+    const [startDate, endDate] = value.split('-');
+    const min = formatDateISOString(startDate);
+    const max = formatDateISOString(endDate);
+
+    if (!isValidDate(startDate) || !isValidDate(endDate)) {
+      return { op: 'between', query: 'false', extra };
+    }
+    const query = extra && pk
+      ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_date::date >= '${min}'::date and value_date::date <= '${max}'::date)`
+      : `${name}::date >= '${min}'::date and ${name}::date <= '${max}'::date`;
+    return { op: 'between', query, extra };
+  }
+
+  // my rows
+  if (value === 'me' && uid && fieldType === 'text') {
+    return { op: '=', query: extra ? `uid = '${uid}'` : `${name}::text = '${uid}'`, extra };
+  }
+
+  const formatType = {
+    float8: 'numeric',
+    int4: 'numeric',
+    int8: 'numeric',
+    varchar: 'text',
+    bool: 'boolean',
+    geometry: 'geom',
+  }[fieldType] || 'text';
+
+  if (optimize && optimize.name !== optimize.pk) {
+    const val = filterType === 'text' ? `ilike '%${value}%'` : `= any('{${value}}')`;
+    return {
+      op: '~',
+      query: fieldType?.includes('[]')
+        ? `${optimize.pk} && (select array_agg(${optimize.pk}) from ${optimize.table} where ${name} ${val} )`
+        : `${optimize.pk} in (select ${optimize.pk} from ${optimize.table} where ${name} ${val} )`,
+      extra,
+    };
+  }
+
+  if (fieldType?.includes('[]')) {
+    return { op: 'in', query: `'{${value}}'::text[] && ${name}::text[]`, extra };
+  }
+
+  // multiple items of 1 param
+  if (value?.indexOf(',') !== -1) {
+    const values = value.split(',').filter((el) => el !== 'null');
+    if (extra && pk) {
+      const query = value?.indexOf('null') !== -1
+        ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and ( value_text is null or value_text in (${values?.map((el) => `'"${el}"'`).join(',')}) ) )`
+        : `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text in (${values?.map((el) => `'"${el}"'`).join(',')}) )`;
+      return { op: 'in', query, extra };
+    }
+    const query = value?.indexOf('null') !== -1
+      ? `( ${name} is null or ${name}::text in (${values?.map((el) => `'${el}'`).join(',')}) )`
+      : `${name}::text in (${value.split(',')?.map((el) => `'${el}'`).join(',')})`;
+    return { op: 'in', query, extra };
+  }
+
+  // v3 filter number range, example - "100_500"
+  if (numberTypeList.includes(fieldType) && value?.indexOf('_') !== -1) {
+    const [min, max] = value.split('_');
+    const query = (max === 'max' ? `${name} > ${min}` : null) || (min === 'min' ? `${name} <= ${max}` : null) || `${name} between ${min} and ${max}`;
+    return { op: 'between', query, extra };
+  }
+
+  // number range
+  if (numberTypeList.includes(fieldType) && value?.indexOf('-') !== -1) {
+    const [min, max] = value.split('-');
+    if (min === 'min' && max === 'max') return {};
+    const query = (max === 'max' ? `${name} > ${min}` : null) || (min === 'min' ? `${name} < ${max}` : null) || `${name} between ${min} and ${max}`;
+    return { op: 'between', query, extra };
+  }
+
+  if (['<', '>'].includes(operator)) {
+    const query = `${name} ${operator} '${value}'::${formatType}`;
+    return { op: operator, query, extra };
+  }
+
+  if (operator === '=' && filterType !== 'text' && !filter?.data) {
+    const query = {
+      null: `${name} is null`,
+      notnull: `${name} is not null`,
+    }[value] || `${name}::${formatType}='${value}'::${formatType}`;
+    return { op: '=', query, extra };
+  }
+
+  if (['~', '='].includes(operator)) {
+    const operator1 = (filterType === 'text' && (filter?.id || filter?.name) && operator === '=' ? '~' : operator);
+    const matchNull = { null: 'is null', notnull: 'is not null' }[value];
+    const match = matchNull || ((operator1 === '=' || filterType === 'autocomplete') ? `='${value}'` : `ilike '%${value}%'`);
+    if (extra && pk) {
+      const query = data && sql
+        ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text in ( ( with q(id,name)  as  (${sql}) select id from q where ${filterType === 'autocomplete' ? 'id' : 'name'} ${match})))`
+        : `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text ${match})`;
+      return { op: 'ilike', query, extra };
+    }
+
+    const query = filter?.data && filter?.sql
+      ? `${filter?.name || filter?.id} in ( ( with q(id,name)  as  (${filter?.sql}) select id from q where ${filterType === 'autocomplete' ? 'id' : 'name'}::text ${match}) )` // filter with cls
+      : `${name}::text ${match}`; // simple filter
+    // console.log(query);
+    return { op: 'ilike', query };
+  }
+
+  // json
+  if (name.includes('.')) {
+    const [col, prop] = name.split('.');
+    const query = ` ${col}->>'${prop}' in ('${value.join("','")}')`;
+    return { op: 'in', query, extra };
+  }
+
+  // geometry
+  if (['geometry'].includes(fieldType)) {
+    const bbox = value[0].split('_');
+
+    if (bbox?.length === 4) {
+      const query = ` ${name} && 'box(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d `;
+      return { op: '&&', query, extra };
+    }
+  }
+  return {};
+}
+
+export default formatValue;

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 } });
+}