@cdc/chart 4.26.1 → 4.26.3

package/package.json

@@ -1,84 +1,82 @@
 {
   "name": "@cdc/chart",
-  "version": "4.26.1",
+  "version": "4.26.3",
   "description": "React component for visualizing tabular data in various types of charts",
-  "moduleName": "CdcChart",
-  "main": "dist/cdcchart",
-  "type": "module",
-  "scripts": {
-    "start": "vite --open",
-    "build": "vite build",
-    "preview": "vite preview",
-    "graph": "nx graph",
-    "prepublishOnly": "lerna run --scope @cdc/chart build",
-    "test": "vitest run --reporter verbose",
-    "test-watch": "vitest watch --reporter verbose",
-    "test-watch:ui": "vitest --ui"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/CDCgov/cdc-open-viz",
-    "directory": "packages/chart"
-  },
-  "author": "Matthew Pallansch <mpallansch@adittech.com>",
-  "bugs": {
-    "url": "https://github.com/CDCgov/cdc-open-viz/issues"
-  },
   "license": "Apache-2.0",
+  "author": "Matthew Pallansch <mpallansch@adittech.com>",
+  "bugs": "https://github.com/CDCgov/cdc-open-viz/issues",
   "dependencies": {
-    "@cdc/core": "^4.26.1",
+    "@cdc/core": "^4.26.3",
     "@hello-pangea/dnd": "^16.2.0",
     "@react-spring/web": "^9.7.5",
     "@rollup/plugin-dsv": "^3.0.2",
-    "@visx/annotation": "^3.3.0",
-    "@visx/axis": "3.12.0",
+    "@visx/annotation": "^3.12.0",
+    "@visx/axis": "^3.12.0",
     "@visx/brush": "^3.12.0",
-    "@visx/curve": "3.12.0",
+    "@visx/curve": "^3.12.0",
     "@visx/drag": "^3.12.0",
-    "@visx/event": "3.12.0",
-    "@visx/glyph": "3.12.0",
-    "@visx/gradient": "3.12.0",
-    "@visx/legend": "3.12.0",
-    "@visx/marker": "3.12.0",
-    "@visx/mock-data": "3.12.0",
-    "@visx/pattern": "^3.0.0",
-    "@visx/responsive": "^2.10.0",
-    "@visx/scale": "3.12.0",
-    "@visx/shape": "3.12.0",
-    "@visx/stats": "3.12.0",
-    "@visx/text": "3.12.0",
-    "@visx/tooltip": "3.12.0",
-    "@vitejs/plugin-react": "^4.3.4",
-    "chroma-js": "3.1.2",
-    "d3-array": "3.2.4",
-    "d3-format": "^3.1.0",
+    "@visx/event": "^3.12.0",
+    "@visx/glyph": "^3.12.0",
+    "@visx/gradient": "^3.12.0",
+    "@visx/legend": "^3.12.0",
+    "@visx/marker": "^3.12.0",
+    "@visx/mock-data": "^3.12.0",
+    "@visx/pattern": "^3.12.0",
+    "@visx/responsive": "^3.12.0",
+    "@visx/scale": "^3.12.0",
+    "@visx/shape": "^3.12.0",
+    "@visx/stats": "^3.12.0",
+    "@visx/text": "^3.12.0",
+    "@visx/tooltip": "^3.12.0",
+    "@vitejs/plugin-react": "^5.1.2",
+    "chroma-js": "^3.1.2",
+    "d3-array": "^3.2.4",
+    "d3-format": "^3.1.2",
     "d3-sankey": "^0.12.3",
-    "d3-time-format": "4.1.0",
-    "dompurify": "^3.1.5",
-    "html-react-parser": "5.2.3",
+    "d3-time-format": "^4.1.0",
+    "dompurify": "^3.3.1",
+    "html-react-parser": "^5.2.3",
     "js-base64": "^2.5.2",
-    "lodash": "^4.17.21",
-    "papaparse": "5.5.2",
+    "lodash": "^4.17.23",
+    "papaparse": "^5.5.2",
     "react-accessible-accordion": "^5.0.1",
-    "react-icons": "5.5.0",
+    "react-icons": "^5.5.0",
     "react-tooltip": "5.8.2-beta.3",
     "resize-observer-polyfill": "^1.5.1",
     "sass": "^1.89.2",
-    "use-debounce": "^6.0.1",
-    "vite": "^5.4.21",
+    "use-debounce": "^10.1.0",
+    "vite": "^7.3.1",
     "vite-plugin-css-injected-by-js": "^2.4.0",
     "vite-plugin-svgr": "^4.2.0",
-    "whatwg-fetch": "3.6.20"
-  },
-  "peerDependencies": {
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "whatwg-fetch": "^3.6.20"
   },
-  "gitHead": "7e3b27098c4eb7a24bc9c3654ad53f88d6419f16",
   "devDependencies": {
     "@types/d3-array": "^3.2.1",
     "@types/d3-format": "^3.0.4",
     "@types/d3-sankey": "^0.12.4",
     "@types/d3-time-format": "^4.0.3"
-  }
+  },
+  "gitHead": "d50e45a074fbefa56cac904917e707d57f237737",
+  "main": "dist/cdcchart",
+  "moduleName": "CdcChart",
+  "peerDependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/CDCgov/cdc-open-viz",
+    "directory": "packages/chart"
+  },
+  "scripts": {
+    "build": "vite build",
+    "graph": "nx graph",
+    "prepublishOnly": "lerna run --scope @cdc/chart build",
+    "preview": "vite preview",
+    "start": "vite --open",
+    "test": "vitest run --reporter verbose",
+    "test-watch": "vitest watch --reporter verbose",
+    "test-watch:ui": "vitest --ui"
+  },
+  "type": "module"
 }

package/src/CdcChart.tsx

@@ -5,6 +5,7 @@ import { getFileExtension } from '@cdc/core/helpers/getFileExtension'
 import { isSolrCsv, isSolrJson } from '@cdc/core/helpers/isSolr'
 import { parseCsvWithQuotes } from '@cdc/core/helpers/parseCsvWithQuotes'
 import cacheBustingString from '@cdc/core/helpers/cacheBustingString'
+import { extractDataAndMetadata } from '@cdc/core/helpers/extractDataAndMetadata'
 import Loading from '@cdc/core/components/Loading'
 import _ from 'lodash'
 import EditorContext from '@cdc/core/contexts/EditorContext'
@@ -60,11 +61,12 @@ const CdcChartWrapper: React.FC<CdcChartProps> = ({
 
       const finalUrl = `${dataUrl.origin}${dataUrl.pathname}${new URLSearchParams(qsParams)}`
       const ext = getFileExtension(finalUrl)
-      const data = await fetchAndParseData(finalUrl, ext)
+      const { data, dataMetadata } = await fetchAndParseData(finalUrl, ext)
 
       setConfig(prev => ({
         ...prev,
         data: { ...data, urlFiltered: true },
+        dataMetadata,
         runtimeDataUrl: finalUrl,
         formattedData: { ...data, urlFiltered: true }
       }))
@@ -113,12 +115,14 @@ const fetchAndParseData = async (url: string, ext: string) => {
     const response = await fetch(url)
     if (ext === 'csv' || isSolrCsv(url)) {
       const responseText = await response.text()
-      return parseCsv(responseText)
+      return { data: parseCsv(responseText), dataMetadata: {} }
     } else if (ext === 'json' || isSolrJson(url)) {
-      return await response.json()
+      const json = await response.json()
+      return extractDataAndMetadata(json)
     }
   } catch (error) {
     console.error(`Error parsing URL: ${url}`, error)
-    return []
+    return { data: [], dataMetadata: {} }
   }
+  return { data: [], dataMetadata: {} }
 }