From c1b55cece9214fd3815322c8e7084c1bb54d3b4a Mon Sep 17 00:00:00 2001
From: YANG QIA <2013xile@gmail.com>
Date: Tue, 11 Feb 2025 22:17:04 +0800
Subject: [PATCH] fix(data-vi): chart blocks do not display when added to the
 popups of action panel (#6198)

* fix(data-vi): charts do not display when added to the popups of action panel

* chore: add optional chain
---
 .../src/client/block/ChartBlockProvider.tsx               | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockProvider.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockProvider.tsx
index 621662f711..af6ee1b8d6 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockProvider.tsx
@@ -16,11 +16,11 @@ import _ from 'lodash';
 export const ChartBlockProvider: React.FC = (props) => {
   const currentPopupContext = useCurrentPopupContext();
   const localVariables = useLocalVariables();
-  const popUpCtxReady =
-    _.isEmpty(currentPopupContext) ||
-    localVariables?.some((variable) => variable.name === '$nPopupRecord' && variable.ctx);
+  const popupRecordVariable = localVariables?.find((variable) => variable.name === '$nPopupRecord');
+  const popupCtxReady =
+    _.isEmpty(currentPopupContext) || !popupRecordVariable?.collectionName || popupRecordVariable?.ctx;
 
-  if (!popUpCtxReady) {
+  if (!popupCtxReady) {
     return null;
   }