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

Merge branch 'main' into appdefinition-architecture-revamp

Browse source
This commit is contained in:
arpitnath 2023-10-27 18:21:11 +05:30
commit e2c453e97c
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/cypress-appbuilder.yml vendored
View file

@ -14,7 +14,7 @@ jobs:
Cypress-App-Builder: Cypress-App-Builder:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
if: ${{ github.event.action == 'labeled' && github.event.label.name == 'run-cypress-app-builder' }} if: ${{ github.event.action == 'labeled' && (github.event.label.name == 'run-cypress-app-builder' || github.event.label.name == 'run-cypress') }}
steps: steps:
- name: Setup Node.js - name: Setup Node.js

2
.github/workflows/cypress-marketplace.yml vendored
View file

@ -14,7 +14,7 @@ jobs:
Cypress-Marketplace: Cypress-Marketplace:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
if: ${{ github.event.action == 'labeled' && github.event.label.name == 'run-cypress-marketplace' }} if: ${{ github.event.action == 'labeled' && (github.event.label.name == 'run-cypress-marketplace' || github.event.label.name == 'run-cypress') }}
steps: steps:
- name: Checkout - name: Checkout

2
.github/workflows/cypress-platform.yml vendored
View file

@ -14,7 +14,7 @@ jobs:
Cypress-Platform: Cypress-Platform:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
if: ${{ github.event.action == 'labeled' && github.event.label.name == 'run-cypress-workspace' }} if: ${{ github.event.action == 'labeled' && (github.event.label.name == 'run-cypress-workspace' || github.event.label.name == 'run-cypress') }}
steps: steps:
- name: Setup Node.js - name: Setup Node.js

2
frontend/src/Editor/Components/Table/Table.jsx
View file

@ -655,7 +655,7 @@ export function Table({
} }
if (mounted) setExposedVariable('sortApplied', sortOptions); if (mounted) setExposedVariable('sortApplied', sortOptions);
fireEvent('onSort'); fireEvent('onSort');
}, [sortOptions]); }, [JSON.stringify(sortOptions)]);
useEffect(() => { useEffect(() => {
setExposedVariable('setPage', async function (targetPageIndex) { setExposedVariable('setPage', async function (targetPageIndex) {