diff --git a/frontend/src/Editor/Components/Statistics.jsx b/frontend/src/Editor/Components/Statistics.jsx index 1ceeb9f5a3..0de530333c 100644 --- a/frontend/src/Editor/Components/Statistics.jsx +++ b/frontend/src/Editor/Components/Statistics.jsx @@ -91,7 +91,7 @@ export const Statistics = function Statistics({ width, height, properties, style > {primaryValueLabel}

-

{primaryValue}

+

{String(primaryValue)}

{hideSecondary ? ( '' ) : ( diff --git a/frontend/src/Editor/Components/Tags.jsx b/frontend/src/Editor/Components/Tags.jsx index efdda48942..a4d282ca14 100644 --- a/frontend/src/Editor/Components/Tags.jsx +++ b/frontend/src/Editor/Components/Tags.jsx @@ -29,6 +29,7 @@ export const Tags = function Tags({ width, height, properties, styles, dataCy }) return (
{data && + Array.isArray(data) && data.map((item, index) => { return renderTag(item, index); })} diff --git a/frontend/src/Editor/Container.jsx b/frontend/src/Editor/Container.jsx index 8da33af2d4..6cc2efa620 100644 --- a/frontend/src/Editor/Container.jsx +++ b/frontend/src/Editor/Container.jsx @@ -655,7 +655,7 @@ export const Container = ({ } if (Object.keys(value)?.length > 0) { setBoxes((boxes) => { - // Ensure boxes[id] exists + // Ensure boxes[id] exists. This can happen is page is already switched and the component attributes change gets triggered after that if (!boxes[id]) { console.error(`Box with id ${id} does not exist`); return boxes; @@ -677,7 +677,6 @@ export const Container = ({ }, }); }); - if (!_.isEmpty(opts)) { paramUpdatesOptsRef.current = opts; } diff --git a/frontend/src/Editor/DataSourceManager/SourceComponents/Runjs.schema.json b/frontend/src/Editor/DataSourceManager/SourceComponents/Runjs.schema.json index ede40544c6..db2fbe9856 100644 --- a/frontend/src/Editor/DataSourceManager/SourceComponents/Runjs.schema.json +++ b/frontend/src/Editor/DataSourceManager/SourceComponents/Runjs.schema.json @@ -9,8 +9,8 @@ "kind": "runjs", "exposedVariables": { "isLoading": false, - "data": {}, - "rawData": {} + "data": [], + "rawData": [] }, "customTesting": true, "disableTransformations": true diff --git a/frontend/src/Editor/Editor.jsx b/frontend/src/Editor/Editor.jsx index 20c906a7eb..7b41e556d1 100644 --- a/frontend/src/Editor/Editor.jsx +++ b/frontend/src/Editor/Editor.jsx @@ -1692,6 +1692,7 @@ const EditorComponent = (props) => { const pageHandle = useCurrentStateStore.getState().page?.handle; if (currentPageId === pageId && pageHandle === appDefinition?.pages[pageId]?.handle) { + useEditorStore.getState().actions.setPageProgress(false); return; } const { name, handle } = appDefinition.pages[pageId]; diff --git a/server/src/services/app_import_export.service.ts b/server/src/services/app_import_export.service.ts index f3ee4fe9d5..fa49ba7387 100644 --- a/server/src/services/app_import_export.service.ts +++ b/server/src/services/app_import_export.service.ts @@ -1995,5 +1995,5 @@ const isChildOfKanbanModal = ( return parentComponent.component.component === 'Kanban'; } - return parentComponent.type === 'Kanban'; + return parentComponent?.type === 'Kanban'; };