1197 pass filter values context to querys process result

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtable/api",
-  "version": "10.34.8",
+  "version": "10.35.0",
   "description": "",
   "main": "index.js",
   "scripts": {

dashboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtable/dashboard",
-  "version": "10.34.8",
+  "version": "10.35.0",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

dashboard/src/api-caller/index.ts

@@ -2,6 +2,7 @@ import { DataSourceType, TPayloadForSQL } from '~/model';
 import { formatSQL, postProcessSQLQuery, preProcessSQLQuery } from '../utils/sql';
 import { APIClient } from './request';
 import { IDataSource, PaginationResponse } from './types';
+import { payloadToDashboardState } from '~/utils/dashboard-state';
 
 export type QueryFailureError = {
   code: 'BAD_REQUEST';
@@ -25,7 +26,7 @@ export async function queryBySQL({ query, name, payload }: IQueryBySQL, signal:
   const formattedSQL = formatSQL(sql, payload);
   const finalSQL = preProcessSQLQuery({ sql: formattedSQL, pre_process });
   let data = await APIClient.query(signal)({ type, key, query: finalSQL }, { params: { name } });
-  data = postProcessSQLQuery(post_process, data);
+  data = postProcessSQLQuery(post_process, data, payloadToDashboardState(payload));
   return data;
 }
 

dashboard/src/dashboard-editor/ui/settings/content/edit-query/query-editor-form/tabs/http/index.tsx

@@ -11,7 +11,9 @@ export const DEFAULT_HTTP_REQ_PROCESSING = {
     "    return { method: 'POST', url: '/', params: {}, headers: {}, data: {} }",
     '}',
   ].join('\n'),
-  post: ['function process_result(res, utils) {', '    // your code goes here', '    return data', '}'].join('\n'),
+  post: ['function process_result(res, utils, state) {', '    // your code goes here', '    return data', '}'].join(
+    '\n',
+  ),
 };
 
 export const TabPanel_HTTP = observer(({ queryModel }: { queryModel: QueryRenderModelInstance }) => {

dashboard/src/dashboard-editor/ui/settings/content/edit-query/query-editor-form/tabs/sql/index.tsx

@@ -15,7 +15,7 @@ export const DEFAULT_SQL_REQ_PROCESSING = {
     '}',
   ].join('\n'),
   post: [
-    'function process_result(data, utils) {',
+    'function process_result(data, utils, state) {',
     '    // process data and return the result',
     '    return data',
     '}',

dashboard/src/model/meta-model/dashboard/content/types.ts

@@ -6,5 +6,9 @@ export type TPayloadForSQL = {
   global_sql_snippets: AnyObject;
   filters: AnyObject;
 };
+export type TDashboardState = {
+  filters: AnyObject;
+  context: AnyObject;
+};
 export type TPayloadForSQLSnippet = Omit<TPayloadForSQL, 'sql_snippets' | 'global_sql_snippets'>;
 export type TPayloadForViz = Omit<TPayloadForSQL, 'sql_snippets' | 'global_sql_snippets'>;

dashboard/src/model/render-model/dashboard/content/queries/query.ts

@@ -12,6 +12,7 @@ import {
   postProcessWithQuery,
   preProcessWithDataSource,
 } from '~/utils/http-query';
+import { payloadToDashboardState } from '~/utils/dashboard-state';
 
 export const QueryRenderModel = types
   .compose(
@@ -30,9 +31,14 @@ export const QueryRenderModel = types
     get contentModel(): any {
       return this.rootModel.content; // dashboard content model
     },
+    get payload() {
+      return this.contentModel.payloadForSQL;
+    },
+    get dashboardState() {
+      return payloadToDashboardState(this.payload);
+    },
     get formattedSQL() {
-      const payload = this.contentModel.payloadForSQL;
-      return explainSQL(self.sql, payload);
+      return explainSQL(self.sql, this.payload);
     },
     get typedAsSQL() {
       return [DataSourceType.Postgresql, DataSourceType.MySQL].includes(self.type);
@@ -45,7 +51,7 @@ export const QueryRenderModel = types
       return this.rootModel.datasources.find({ type, key });
     },
     get httpConfigString() {
-      const { context, filters } = this.contentModel.payloadForSQL;
+      const { context, filters } = this.payload;
       const { name, pre_process } = self.json;
 
       const config = explainHTTPRequest(pre_process, context, filters);
@@ -102,7 +108,7 @@ export const QueryRenderModel = types
         self.controller = new AbortController();
         self.state = 'loading';
         try {
-          const payload = self.contentModel.payloadForSQL;
+          const payload = self.payload;
           self.data = yield* toGenerator(
             queryBySQL(
               {
@@ -152,7 +158,7 @@ export const QueryRenderModel = types
             ),
           );
           let data = postProcessWithDataSource(self.datasource, res);
-          data = postProcessWithQuery(post_process, data);
+          data = postProcessWithQuery(post_process, data, self.dashboardState);
 
           self.data = data;
           self.state = 'idle';

dashboard/src/utils/dashboard-state.ts

@@ -0,0 +1,17 @@
+import { TDashboardState, TPayloadForSQL } from '~/model';
+
+function getEmptyState(): TDashboardState {
+  return {
+    filters: {},
+    context: {},
+  };
+}
+
+export function payloadToDashboardState(payload: TPayloadForSQL) {
+  const empty = getEmptyState();
+  if (!payload) {
+    return getEmptyState();
+  }
+  const { filters = empty.filters, context = empty.context } = payload;
+  return { filters, context };
+}

dashboard/src/utils/http-query.ts

@@ -1,6 +1,6 @@
 import { AxiosRequestConfig } from 'axios';
 import { IDataSource } from '~/api-caller/types';
-import { ContextRecordType, FilterValuesType } from '~/model';
+import { ContextRecordType, FilterValuesType, TDashboardState } from '~/model';
 import { functionUtils } from './function-utils';
 
 export function buildHTTPRequest(
@@ -25,9 +25,9 @@ export function preProcessWithDataSource(datasource: IDataSource, config: AxiosR
 export function postProcessWithDataSource(datasource: IDataSource, res: any) {
   return new Function(`return ${datasource.config.processing.post}`)()(res, functionUtils);
 }
-export function postProcessWithQuery(post_process: TFunctionString, res: any) {
+export function postProcessWithQuery(post_process: TFunctionString, res: any, state: TDashboardState) {
   if (!post_process) {
     return res;
   }
-  return new Function(`return ${post_process}`)()(res, functionUtils);
+  return new Function(`return ${post_process}`)()(res, functionUtils, state);
 }

dashboard/src/utils/sql.ts

@@ -1,4 +1,4 @@
-import { TPayloadForSQL, TPayloadForSQLSnippet } from '~/model';
+import { TDashboardState, TPayloadForSQL, TPayloadForSQLSnippet } from '~/model';
 import { functionUtils } from './function-utils';
 
 export function formatSQL(sql: string, payload: TPayloadForSQL | TPayloadForSQLSnippet) {
@@ -35,12 +35,12 @@ export function preProcessSQLQuery({ sql, pre_process }: { sql: string; pre_proc
   }
 }
 
-export function postProcessSQLQuery(post_process: TFunctionString, data: any) {
+export function postProcessSQLQuery(post_process: TFunctionString, data: any, state: TDashboardState) {
   if (!post_process.trim()) {
     return data;
   }
   try {
-    return new Function(`return ${post_process}`)()(data, functionUtils);
+    return new Function(`return ${post_process}`)()(data, functionUtils, state);
   } catch (error) {
     console.error(error);
     return data;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtable/root",
-  "version": "10.34.8",
+  "version": "10.35.0",
   "private": true,
   "workspaces": [
     "api",

settings-form/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtable/settings-form",
-  "version": "10.34.8",
+  "version": "10.35.0",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

website/package.json

@@ -2,7 +2,7 @@
   "name": "@devtable/website",
   "private": true,
   "license": "Apache-2.0",
-  "version": "10.34.8",
+  "version": "10.35.0",
   "scripts": {
     "dev": "vite",
     "preview": "vite preview"