@opengis/fastify-table 1.2.99 → 1.3.1

package/package.json

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

package/server/plugins/table/funcs/getFilterSQL/index.js

@@ -125,7 +125,7 @@ export default async function getFilterSQL({
     const customQuery = body?.filterCustom?.length && custom ? body.filterCustom?.find((el) => el.name === custom)?.sql : null;
     const stateQuery = body?.filterState?.length && state ? body.filterState?.find((el) => el.name === state)?.sql : null;
 
-    const filterQuery = filters?.filter((el) => el.query)?.map((el) => `${el.query} `).join(' and ');
+    const filterQuery = filters?.filter((el) => el.query)?.map((el) => `${el.query}`).join(' and ');
     const q = [body?.query, query, searchQuery, filterQuery, stateQuery, customQuery].filter((el) => el).join(' and ');
 
     // table

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

@@ -1,3 +1,4 @@
+import applyHookSync from "../../../../hook/funcs/applyHookSync.js";
 import getRangeQuery from "./getRangeQuery.js";
 
 export default function formatValue({
@@ -9,6 +10,13 @@ export default function formatValue({
   const filterType = filter.type?.toLowerCase() || 'text';
   const fieldType = pg?.pgType?.[dataTypeID] || pg?.pgType?.[{ date: 1114 }[filterType] || 25];
 
+  const hookData = applyHookSync('onFormatValue', {
+    pg, pk, table, name, value, filterType, fieldType, filter, dataTypeID, uid, optimize,
+  });
+  if (hookData) {
+    return hookData?.query ? hookData : { op: '=', query: hookData };
+  }
+
   if (!name
     || !value
     || (!dataTypeID && !extra && !sql && !options)

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

@@ -300,7 +300,7 @@ export default async function dataAPI(req, reply, called) {
     rows,
     meta,
     columns,
-    filters,
+    filters: filters?.map?.(el => ({ ...el, sql: undefined })),
   };
 
   // console.log({ add: loadTable.table, form: loadTable.form });

package/server/routes/table/controllers/filter.js

@@ -129,7 +129,7 @@ export default async function filterAPI(req) {
 
   return {
     time: Date.now() - time,
-    list: filters,
+    list: filters?.map?.(el => ({ ...el, sql: undefined })),
     custom: loadTable?.filterCustom,
     inline: loadTable?.filterInline,
     state: loadTable?.filterState,

package/server/routes/table/index.js

@@ -1,29 +1,29 @@
-import suggest from './controllers/suggest.js';
-import data from './controllers/data.js';
-
-import card from './controllers/card.js';
-import search from './controllers/search.js';
-import filter from './controllers/filter.js';
-import form from './controllers/form.js';
-
-import loadTemplatePath from '../../plugins/table/funcs/loadTemplatePath.js';
-
-import {
-  tableSchema, searchSchema, suggestSchema, formSchema, filterSchema,
-} from './schema.js';
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  const policy = ['public'];
-  fastify.get(`${prefix}/suggest/:data`, { config: { policy }, schema: suggestSchema }, suggest);
-  fastify.get(`${prefix}/data/:table/:id?`, { config: { policy: ['public', 'no-sql'] }, schema: tableSchema }, data); // vs.crm.data.api с node
-
-  fastify.get(`${prefix}/card/:table/:id`, { config: { policy }, schema: tableSchema }, card);
-  fastify.get(`${prefix}/search`, { config: { policy }, schema: searchSchema }, search);
-
-  fastify.get(`${prefix}/templates`, () => loadTemplatePath);
-  fastify.get(`${prefix}/filter/:table`, { config: { policy }, schema: filterSchema }, filter);
-  fastify.get(`${prefix}/form/:form`, { config: { policy }, schema: formSchema }, form);
-}
-
-export default plugin;
+import suggest from './controllers/suggest.js';
+import data from './controllers/data.js';
+
+import card from './controllers/card.js';
+import search from './controllers/search.js';
+import filter from './controllers/filter.js';
+import form from './controllers/form.js';
+
+import loadTemplatePath from '../../plugins/table/funcs/loadTemplatePath.js';
+
+import {
+  tableSchema, searchSchema, suggestSchema, formSchema, filterSchema,
+} from './schema.js';
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  const policy = ['public'];
+  fastify.get(`${prefix}/suggest/:data`, { config: { policy }, schema: suggestSchema }, suggest);
+  fastify.get(`${prefix}/data/:table/:id?`, { config: { policy: ['public', 'no-sql'] }, schema: tableSchema }, data); // vs.crm.data.api с node
+
+  fastify.get(`${prefix}/card/:table/:id`, { config: { policy }, schema: tableSchema }, card);
+  fastify.get(`${prefix}/search`, { config: { policy }, schema: searchSchema }, search);
+
+  fastify.get(`${prefix}/templates`, () => loadTemplatePath);
+  fastify.get(`${prefix}/filter/:table`, { config: { policy }, schema: filterSchema }, filter);
+  fastify.get(`${prefix}/form/:form`, { config: { policy }, schema: formSchema }, form);
+}
+
+export default plugin;

package/server/routes/util/index.js

@@ -1,12 +1,12 @@
-import nextId from './controllers/next.id.js';
-import statusMonitor from './controllers/status.monitor.js';
-import userTokens from './controllers/user.tokens.js'
-
-async function plugin(app, config = {}) {
-  const prefix = config.prefix || '/api';
-  app.get(`${prefix}/next-id`, {}, nextId);
-  app.get(`${prefix}/status-monitor`, {}, statusMonitor);
-  app.get(`${prefix}/user-tokens/:token`, { config: { policy: ['user'] } }, userTokens);
-}
-
-export default plugin;
+import nextId from './controllers/next.id.js';
+import statusMonitor from './controllers/status.monitor.js';
+import userTokens from './controllers/user.tokens.js'
+
+async function plugin(app, config = {}) {
+  const prefix = config.prefix || '/api';
+  app.get(`${prefix}/next-id`, {}, nextId);
+  app.get(`${prefix}/status-monitor`, {}, statusMonitor);
+  app.get(`${prefix}/user-tokens/:token`, { config: { policy: ['user'] } }, userTokens);
+}
+
+export default plugin;