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

Fix disabled page is being displayed on switch page event dropdown (#7769)

Browse source 
* Fix kanban rendering leading to infinite look

* Fix disabled page is being displayed on switch page event dropdown
This commit is contained in:
Nakul Nagargade 2023-10-11 16:46:58 +05:30 committed by GitHub
parent 927c96009e
commit 6fe2ab3ee6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frontend/src/Editor/Components/Kanban/KanbanBoard.jsx
View file

@ -95,6 +95,7 @@ export function KanbanBoard({ widgetHeight, kanbanProps, parentRef }) {
if (lastSelectedCard?.id === cardId) {
setExposedVariables({
lastSelectedCard: cardDataAsObj[cardId],
lastUpdatedCard: cardDataAsObj[cardId],
lastCardUpdate: diffKeys.map((key) => {
return {

21
frontend/src/Editor/Inspector/EventManager.jsx
View file

@ -219,11 +219,20 @@ export const EventManager = ({
return appsOptionsList;
}
function getPageOptions() {
return pages.map((page) => ({
name: page.name,
value: page.id,
}));
function getPageOptions(event) {
// If disabled page is already selected then don't remove from page options
if (pages.find((page) => page.id === event.pageId)?.disabled) {
return pages.map((page) => ({
name: page.name,
value: page.id,
}));
}
return pages
.filter((page) => !page.disabled)
.map((page) => ({
name: page.name,
value: page.id,
}));
}
function handleQueryChange(index, updates) {
@ -751,7 +760,7 @@ export const EventManager = ({
event={event}
handlerChanged={handlerChanged}
eventIndex={index}
getPages={getPageOptions}
getPages={() => getPageOptions(event)}
darkMode={darkMode}
/>
)}