@opengis/fastify-table 1.1.148 → 1.1.150

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.148",
+  "version": "1.1.150",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/migrations/users.sql

@@ -21,6 +21,8 @@ ALTER TABLE admin.users add column if not exists last_activity_date timestamp wi
 ALTER TABLE admin.users add column if not exists user_type text DEFAULT 'regular'::text;
 ALTER TABLE admin.users add column if not exists user_rnokpp text;
 ALTER TABLE admin.users alter column user_rnokpp drop not null;
+ALTER TABLE admin.users add column if not exists social_auth_id text;
+ALTER TABLE admin.users add column if not exists social_auth_type text;
 ALTER TABLE admin.users add column if not exists salt text;
 ALTER TABLE admin.users add column if not exists cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
 ALTER TABLE admin.users add column if not exists editor_id text;

package/server/plugins/table/funcs/getFilterSQL/util/formatValue.js

@@ -1,5 +1,9 @@
-const dateTypeList = ['date', 'timestamp', 'timestamp without time zone'];
+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);
@@ -53,6 +57,10 @@ function formatValue({
     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`;

package/server/plugins/table/funcs/getSelect.js

@@ -1,3 +1,4 @@
+import config from '../../../../config.js';
 import pgClients from '../../pg/pgClients.js';
 import getTemplate from './getTemplate.js';
 
@@ -10,7 +11,7 @@ const sqls = {
 };
 
 export default async function getSelect(name, pg = pgClients.client) {
-  if (loadCls[name] && false) return loadCls[name];
+  if (loadCls[name] && !config.local) return loadCls[name];
 
   const clsDataGIT = await getTemplate(['cls', 'select'], name);
   const { type } = !clsDataGIT && pg.pk?.['admin.user_cls'] ? await pg.query('select type from admin.user_cls where parent is null and name=$1 union all select type from admin.cls where parent is null and name=$1 limit 1', [name]).then(el => el.rows?.[0] || {}) : {};