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

Merge branch 'main' into develop

Browse source
This commit is contained in:
Sherfin Shamsudeen 2021-08-24 17:27:20 +05:30
commit 8622ab5f8c
4 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frontend/src/Editor/Inspector/Components/Table.jsx
View file

@ -231,6 +231,7 @@ class Table extends React.Component {
eventOptionUpdated={this.actionButtonEventOptionUpdated}
currentState={this.state.currentState}
extraData={{ actionButton: action, index: index }} // This data is returned in the callbacks
apps={this.props.apps}
/>
<button className="btn btn-sm btn-outline-danger col" onClick={() => this.removeAction(index)}>
Remove

2
frontend/src/Editor/Inspector/EventSelector.jsx
View file

@ -51,7 +51,7 @@ export const EventSelector = ({
function getAllApps() {
let appsOptionsList = [];
apps.map((item) => {
apps.filter(item => item.slug != undefined).map((item) => {
appsOptionsList.push({
name: item.name,
value: item.slug

1
frontend/src/Editor/Inspector/Inspector.jsx
View file

@ -202,6 +202,7 @@ export const Inspector = ({
currentState={currentState}
darkMode={darkMode}
eventsChanged={eventsChanged}
apps={apps}
/>
}

5
frontend/src/_services/app.service.js
View file

@ -16,7 +16,10 @@ export const appService = {
function getAll(page, folder) {
const requestOptions = { method: 'GET', headers: authHeader() };
return fetch(`${config.apiUrl}/apps?page=${page}&folder=${folder || ''}`, requestOptions).then(handleResponse);
if (page === 0)
return fetch(`${config.apiUrl}/apps`, requestOptions).then(handleResponse);
else
return fetch(`${config.apiUrl}/apps?page=${page}&folder=${folder || ''}`, requestOptions).then(handleResponse);
}
function createApp() {