refactor: Use only one provider

visualize-admin · May 16, 2024 · 90367c1 · 90367c1
1 parent de49861
commit 90367c1
Showing 1 changed file with 60 additions and 56 deletions.
diff --git a/app/components/chart-published.tsx b/app/components/chart-published.tsx
@@ -82,66 +82,70 @@ export const ChartPublished = (props: ChartPublishedProps) => {
     [configKey, dataSource, state]
   );
 
-  return state.layout.type === "dashboard" ? (
+  return (
     <InteractiveFiltersProvider chartConfigs={state.chartConfigs}>
-      <Box
-        sx={{
-          mb:
-            state.layout.meta.title[locale] ||
-            state.layout.meta.description[locale]
-              ? 4
-              : 0,
-        }}
-      >
-        {state.layout.meta.title[locale] && (
-          <Title text={state.layout.meta.title[locale]} />
-        )}
-        {state.layout.meta.description[locale] && (
-          <Description text={state.layout.meta.description[locale]} />
-        )}
-      </Box>
-      {state.layout.layout === "tall" ? (
-        <ChartPanelLayoutTall
-          chartConfigs={state.chartConfigs}
-          renderChart={renderChart}
-        />
+      {state.layout.type === "dashboard" ? (
+        <>
+          <Box
+            sx={{
+              mb:
+                state.layout.meta.title[locale] ||
+                state.layout.meta.description[locale]
+                  ? 4
+                  : 0,
+            }}
+          >
+            {state.layout.meta.title[locale] && (
+              <Title text={state.layout.meta.title[locale]} />
+            )}
+            {state.layout.meta.description[locale] && (
+              <Description text={state.layout.meta.description[locale]} />
+            )}
+          </Box>
+          {state.layout.layout === "tall" ? (
+            <ChartPanelLayoutTall
+              chartConfigs={state.chartConfigs}
+              renderChart={renderChart}
+            />
+          ) : (
+            <ChartPanelLayoutVertical
+              chartConfigs={state.chartConfigs}
+              renderChart={renderChart}
+            />
+          )}
+        </>
       ) : (
-        <ChartPanelLayoutVertical
-          chartConfigs={state.chartConfigs}
-          renderChart={renderChart}
-        />
+        <>
+          <Flex
+            sx={{
+              flexDirection: "column",
+              mb:
+                state.layout.meta.title[locale] ||
+                state.layout.meta.description[locale]
+                  ? 4
+                  : 0,
+            }}
+          >
+            {state.layout.meta.title[locale] && (
+              <Title text={state.layout.meta.title[locale]} />
+            )}
+            {state.layout.meta.description[locale] && (
+              <Description text={state.layout.meta.description[locale]} />
+            )}
+          </Flex>
+          <ChartTablePreviewProvider>
+            <ChartWrapper layoutType={state.layout.type}>
+              <ChartPublishedInner
+                dataSource={dataSource}
+                state={state}
+                chartConfig={getChartConfig(state)}
+                configKey={configKey}
+              />
+            </ChartWrapper>
+          </ChartTablePreviewProvider>
+        </>
       )}
     </InteractiveFiltersProvider>
-  ) : (
-    <InteractiveFiltersProvider chartConfigs={state.chartConfigs}>
-      <Flex
-        sx={{
-          flexDirection: "column",
-          mb:
-            state.layout.meta.title[locale] ||
-            state.layout.meta.description[locale]
-              ? 4
-              : 0,
-        }}
-      >
-        {state.layout.meta.title[locale] && (
-          <Title text={state.layout.meta.title[locale]} />
-        )}
-        {state.layout.meta.description[locale] && (
-          <Description text={state.layout.meta.description[locale]} />
-        )}
-      </Flex>
-      <ChartTablePreviewProvider>
-        <ChartWrapper layoutType={state.layout.type}>
-          <ChartPublishedInner
-            dataSource={dataSource}
-            state={state}
-            chartConfig={getChartConfig(state)}
-            configKey={configKey}
-          />
-        </ChartWrapper>
-      </ChartTablePreviewProvider>
-    </InteractiveFiltersProvider>
   );
 };