Merge branch 'googleanalytics-main' into dims_metrics_explorer

googleanalytics · Sep 26, 2024 · 369e288 · 369e288
2 parents 8a6b0e5 + a41443a
commit 369e288
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -44,8 +44,8 @@
     "react-helmet": "^6.1.0",
     "react-icons": "^4.8.0",
     "react-json-view": "^1.21.3",
-    "react-loader-spinner": "^5.3.4",
     "react-markdown": "^9.0.1",
+    "react-loader-spinner": "^6.1.6",
     "react-redux": "^8.0.5",
     "react-syntax-highlighter": "^15.5.0",
     "redux": "^4.2.1",

diff --git a/src/components/ga4/DimensionsMetricsExplorer/Compatible.tsx b/src/components/ga4/DimensionsMetricsExplorer/Compatible.tsx
@@ -59,12 +59,16 @@ const StyledPaper = styled(Paper)((
   }
 }));
 
-const WithProperty: React.FC<
-    CompatibleHook & { property: PropertySummary | undefined }
-> = ({
+type CompatibleProps =
+    CompatibleHook
+    & {
+  property: PropertySummary | undefined,
+  allMetrics: Metric[],
+  allDimensions: Dimension[]
+}
+const WithProperty: React.FC<CompatibleProps> = ({
        dimensions,
        metrics,
-       addDimension,
        removeMetric,
        removeDimension, setDimensions, setMetrics,
        property,

diff --git a/src/components/ga4/DimensionsMetricsExplorer/index.tsx b/src/components/ga4/DimensionsMetricsExplorer/index.tsx
@@ -104,7 +104,7 @@ const RenderSuccessful: React.FC<Successful & { aps: AccountProperty }> = ({
 
   const resetAllCategoryAccordions = (expanded: boolean) =>
   {
-    const initialCategoryAccordionState = {}
+    const initialCategoryAccordionState = {} as any
     categories.forEach( (x) => initialCategoryAccordionState[x.category]=expanded )
     return initialCategoryAccordionState
   }