Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 17:08:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

global data source improvement (#5958)

Browse source
This commit is contained in:
Midhun G S 2023-04-06 21:10:14 +05:30 committed by GitHub
parent e8675f0a4c
commit 6bbec4f081
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
frontend/src/Editor/DataSourceManager/DataSourceManager.jsx
View file

@ -1,5 +1,5 @@
import React from 'react';
import { datasourceService, authenticationService, pluginsService, globalDatasourceService } from '@/_services';
import { datasourceService, pluginsService, globalDatasourceService } from '@/_services';
import cx from 'classnames';
import { Modal, Button, Tab, Row, Col, ListGroup } from 'react-bootstrap';
import { toast } from 'react-hot-toast';
@ -175,7 +175,13 @@ class DataSourceManagerComponent extends React.Component {
if (selectedDataSource.id) {
this.setState({ isSaving: true });
service
.save(selectedDataSource.id, name, parsedOptions, appId, currentEnvironment)
.save({
id: selectedDataSource.id,
name,
options: parsedOptions,
app_id: appId,
environment_id: currentEnvironment,
})
.then(() => {
this.setState({ isSaving: false });
this.hideModal();
@ -194,7 +200,15 @@ class DataSourceManagerComponent extends React.Component {
} else {
this.setState({ isSaving: true });
service
.create(pluginId, name, kind, parsedOptions, appId, appVersionId, scope)
.create({
plugin_id: pluginId,
name,
kind,
options: parsedOptions,
app_id: appId,
app_version_id: appVersionId,
scope,
})
.then((data) => {
this.setState({ isSaving: false });
this.hideModal();

4
frontend/src/_services/datasource.service.js
View file

@ -17,7 +17,7 @@ function getAll(appVersionId) {
return fetch(`${config.apiUrl}/data_sources?` + searchParams, requestOptions).then(handleResponse);
}
function create(plugin_id, name, kind, options, app_id, app_version_id) {
function create({ plugin_id, name, kind, options, app_id, app_version_id }) {
const body = {
plugin_id,
name,
@ -31,7 +31,7 @@ function create(plugin_id, name, kind, options, app_id, app_version_id) {
return fetch(`${config.apiUrl}/data_sources`, requestOptions).then(handleResponse);
}
function save(id, name, options, app_id) {
function save({ id, name, options, app_id }) {
const body = {
name,
options,

4
frontend/src/_services/globalDatasource.service.js
View file

@ -14,7 +14,7 @@ function getAll() {
return fetch(`${config.apiUrl}/v2/data_sources`, requestOptions).then(handleResponse);
}
function create(plugin_id, name, kind, options, app_id, app_version_id, scope) {
function create({ plugin_id, name, kind, options, scope }) {
const body = {
plugin_id,
name,
@ -27,7 +27,7 @@ function create(plugin_id, name, kind, options, app_id, app_version_id, scope) {
return fetch(`${config.apiUrl}/v2/data_sources`, requestOptions).then(handleResponse);
}
function save(id, name, options, appId, environment_id) {
function save({ id, name, options, environment_id }) {
const body = {
name,
options,