Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 09:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix TJDB query with subpath setup

Browse source
This commit is contained in:
Akshay Sasidharan 2024-05-21 22:15:30 +05:30
parent 2e6f4510dd
commit 8a9cd790c1
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
server/src/services/tooljet_db_operations.service.ts
View file

@ -4,6 +4,7 @@ import { QueryService, QueryResult } from '@tooljet/plugins/dist/packages/common
import { TooljetDbService } from './tooljet_db.service'; import { TooljetDbService } from './tooljet_db.service';
import { isEmpty } from 'lodash'; import { isEmpty } from 'lodash';
import { PostgrestProxyService } from './postgrest_proxy.service'; import { PostgrestProxyService } from './postgrest_proxy.service';
import { maybeSetSubPath } from 'src/helpers/utils.helper';
@Injectable() @Injectable()
export class TooljetDbOperationsService implements QueryService { export class TooljetDbOperationsService implements QueryService {
@ -74,7 +75,7 @@ export class TooljetDbOperationsService implements QueryService {
!isEmpty(offset) && query.push(`offset=${offset}`); !isEmpty(offset) && query.push(`offset=${offset}`);
} }
const headers = { 'data-query-id': queryOptions.id, 'tj-workspace-id': queryOptions.organization_id }; const headers = { 'data-query-id': queryOptions.id, 'tj-workspace-id': queryOptions.organization_id };
const url = `/api/tooljet-db/proxy/${tableId}` + `?${query}`; const url = maybeSetSubPath(`/api/tooljet-db/proxy/${tableId}` + `?${query}`);
return await this.proxyPostgrest(url, 'GET', headers); return await this.proxyPostgrest(url, 'GET', headers);
} }
@ -87,7 +88,7 @@ export class TooljetDbOperationsService implements QueryService {
const headers = { 'data-query-id': queryOptions.id, 'tj-workspace-id': queryOptions.organization_id }; const headers = { 'data-query-id': queryOptions.id, 'tj-workspace-id': queryOptions.organization_id };
const url = `/api/tooljet-db/proxy/${queryOptions.table_id}`; const url = maybeSetSubPath(`/api/tooljet-db/proxy/${queryOptions.table_id}`);
return await this.proxyPostgrest(url, 'POST', headers, columns); return await this.proxyPostgrest(url, 'POST', headers, columns);
} }
@ -112,7 +113,7 @@ export class TooljetDbOperationsService implements QueryService {
!isEmpty(whereQuery) && query.push(whereQuery); !isEmpty(whereQuery) && query.push(whereQuery);
const headers = { 'data-query-id': queryOptions.id, 'tj-workspace-id': queryOptions.organization_id }; const headers = { 'data-query-id': queryOptions.id, 'tj-workspace-id': queryOptions.organization_id };
const url = `/api/tooljet-db/proxy/${tableId}?` + query.join('&') + '&order=id'; const url = maybeSetSubPath(`/api/tooljet-db/proxy/${tableId}?` + query.join('&') + '&order=id');
return await this.proxyPostgrest(url, 'PATCH', headers, body); return await this.proxyPostgrest(url, 'PATCH', headers, body);
} }
@ -149,7 +150,7 @@ export class TooljetDbOperationsService implements QueryService {
limit && limit !== '' && query.push(`limit=${limit}&order=id`); limit && limit !== '' && query.push(`limit=${limit}&order=id`);
const headers = { 'data-query-id': queryOptions.id, 'tj-workspace-id': queryOptions.organization_id }; const headers = { 'data-query-id': queryOptions.id, 'tj-workspace-id': queryOptions.organization_id };
const url = `/api/tooljet-db/proxy/${tableId}?` + query.join('&'); const url = maybeSetSubPath(`/api/tooljet-db/proxy/${tableId}?` + query.join('&'));
return await this.proxyPostgrest(url, 'DELETE', headers); return await this.proxyPostgrest(url, 'DELETE', headers);
} }