@opengis/admin 0.2.129 → 0.2.130

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

package/server/routes/templates/controllers/getTemplate.js

@@ -1,50 +1,50 @@
-import { config, applyHook, getTemplate, getToken, setToken } from "@opengis/fastify-table/utils.js";
-
-function formatSchema(schema, user) {
-    function parseDataTables(obj) {
-        if (obj?.add) {
-            const [token] = setToken({
-                ids: [JSON.stringify({ ... obj.add, table: obj.add?.table || obj.add?.model })],
-                uid: user.uid,
-                array: 1,
-            });
-            Object.assign(obj.add, { token, api: `${config.prefix || '/api'}/table/${token}` });
-        } else if (obj?.type === 'DataTable' && obj.colModel?.length) {
-            obj.colModel.forEach(parseDataTables);
-        }
-    }
-    Object.keys(schema).map(key => ({ key, ...schema[key] })).forEach(parseDataTables);
-}
-
-export default async function getTemplateApi(req) {
-    const { user } = req?.session?.passport || {};
-    const { params = {}, session = {} } = req;
-    const { type, name } = params;
-
-    const tokenData = await getToken({ token: name, uid: user?.uid, json: 1 }) || {};
-
-    const hookData = await applyHook('preTemplate', { name: tokenData.name || name, type, user });
-    if (hookData?.message && hookData?.status) {
-        return hookData;
-    }
-
-    const data = await getTemplate(type, hookData?.name || tokenData.form || name);
-    if (!['interface', 'table'].includes(type)
-        && (!data?.public || !data?.ispublic)
-        && !config?.auth?.disable
-        && !session.passport?.user?.uid
-        && false
-    ) {
-        return `access restricted ${name}`;
-    }
-    if (type === 'form' && user?.uid) {
-        const schema = data.schema || data;
-        formatSchema(schema, user);
-    }
-    await applyHook('afterTemplate', { name, type, data, user });
-    if (tokenData.obj) {
-        const obj = tokenData.obj.split('#').reduce((p, el) => ({ ...p, [el.split('=')[0]]: el.split('=')[1] }), {})
-        Object.assign(data, { obj });
-    }
-    return data?.html || data || `template not found "${name}"`;
+import { config, applyHook, getTemplate, getToken, setToken } from "@opengis/fastify-table/utils.js";
+
+function formatSchema(schema, user) {
+    function parseDataTables(obj) {
+        if (obj?.add) {
+            const [token] = setToken({
+                ids: [JSON.stringify({ ... obj.add, table: obj.add?.table || obj.add?.model })],
+                uid: user.uid,
+                array: 1,
+            });
+            Object.assign(obj.add, { token, api: `${config.prefix || '/api'}/table/${token}` });
+        } else if (obj?.type === 'DataTable' && obj.colModel?.length) {
+            obj.colModel.forEach(parseDataTables);
+        }
+    }
+    Object.keys(schema).map(key => ({ key, ...schema[key] })).forEach(parseDataTables);
+}
+
+export default async function getTemplateApi(req) {
+    const { user } = req?.session?.passport || {};
+    const { params = {}, session = {} } = req;
+    const { type, name } = params;
+
+    const tokenData = await getToken({ token: name, uid: user?.uid, json: 1 }) || {};
+
+    const hookData = await applyHook('preTemplate', { name: tokenData.name || name, type, user });
+    if (hookData?.message && hookData?.status) {
+        return hookData;
+    }
+
+    const data = await getTemplate(type, hookData?.name || tokenData.form || name);
+    if (!['interface', 'table'].includes(type)
+        && (!data?.public || !data?.ispublic)
+        && !config?.auth?.disable
+        && !session.passport?.user?.uid
+        && false
+    ) {
+        return `access restricted ${name}`;
+    }
+    if (type === 'form' && user?.uid) {
+        const schema = data.schema || data;
+        formatSchema(schema, user);
+    }
+    await applyHook('afterTemplate', { name, type, data, user });
+    if (tokenData.obj) {
+        const obj = tokenData.obj.split('#').reduce((p, el) => ({ ...p, [el.split('=')[0]]: el.split('=')[1] }), {})
+        Object.assign(data, { obj });
+    }
+    return data?.html || data || `template not found "${name}"`;
 }

package/server/routes/templates/index.mjs

@@ -1,16 +1,16 @@
-import getTemplateApi from './controllers/getTemplate.js';
-
-import getTemplateSchema from './schema.js'
-
-export default async function route(fastify) {
-    //fastify.decorate('addTempateFolder', addTempateFolder); // call from funcs
-    fastify.get(`/template/:type/:name`, { config: { policy: ['public'] }, scheme: getTemplateSchema },  getTemplateApi);
-
-    /*fastify.addHook('onListen', async () => {
-        await addTempateFolder(path.join(process.cwd(), '/module/itree'));
-        await addTempateFolder(path.join(process.cwd(), '/module/test'));        
-      });*/
-
-
-
-}
+import getTemplateApi from './controllers/getTemplate.js';
+
+import getTemplateSchema from './schema.js'
+
+export default async function route(fastify) {
+    //fastify.decorate('addTempateFolder', addTempateFolder); // call from funcs
+    fastify.get(`/template/:type/:name`, { config: { policy: ['public'] }, scheme: getTemplateSchema },  getTemplateApi);
+
+    /*fastify.addHook('onListen', async () => {
+        await addTempateFolder(path.join(process.cwd(), '/module/itree'));
+        await addTempateFolder(path.join(process.cwd(), '/module/test'));        
+      });*/
+
+
+
+}

package/server/routes/templates/schema.js

@@ -1,9 +1,9 @@
-const getTemplateSchema = {
-    params: {
-        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        // type: { type: 'string' },
-    }
-};
-
-export default null;
+const getTemplateSchema = {
+    params: {
+        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        // type: { type: 'string' },
+    }
+};
+
+export default null;
 export { getTemplateSchema }

package/server/routes/user/controllers/user.cls.id.js

@@ -1,14 +1,14 @@
-import userCls from './user.cls.js';
-
-export default async function userClsId(req) {
-  const { id } = req.params || {};
-  const res = await userCls(req);
-  if (req.query?.sql || res?.error) {
-    return res;
-  }
-  const { rows = [] } = res?.message || {};
-  if (!rows?.length) {
-    return { message: `cls not found: ${id}`, status: 404 };
-  }
-  return { message: rows?.[0], status: 200 };
-}
+import userCls from './user.cls.js';
+
+export default async function userClsId(req) {
+  const { id } = req.params || {};
+  const res = await userCls(req);
+  if (req.query?.sql || res?.error) {
+    return res;
+  }
+  const { rows = [] } = res?.message || {};
+  if (!rows?.length) {
+    return { message: `cls not found: ${id}`, status: 404 };
+  }
+  return { message: rows?.[0], status: 200 };
+}