@cdc/editor 4.22.11 → 4.23.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cdc/editor",
-  "version": "4.22.11",
+  "version": "4.23.1",
   "main": "dist/cdceditor",
   "bugs": {
     "url": "https://github.com/CDCgov/cdc-open-viz/issues"
@@ -19,12 +19,12 @@
   "dependencies": {
     "@babel/runtime": "^7.12.5",
     "@cdc/chart": "^9.22.9",
-    "@cdc/core": "^4.22.11",
-    "@cdc/dashboard": "^4.22.11",
-    "@cdc/data-bite": "^4.22.11",
-    "@cdc/map": "^4.22.11",
-    "@cdc/markup-include": "^4.22.11",
-    "@cdc/waffle-chart": "^4.22.11",
+    "@cdc/core": "^4.23.1",
+    "@cdc/dashboard": "^4.23.1",
+    "@cdc/data-bite": "^4.23.1",
+    "@cdc/map": "^4.23.1",
+    "@cdc/markup-include": "^4.23.1",
+    "@cdc/waffle-chart": "^4.23.1",
     "axios": "^0.21.1",
     "d3": "^7.0.0",
     "html-react-parser": "1.4.9",
@@ -40,5 +40,5 @@
   "resolutions": {
     "@types/react": "17.x"
   },
-  "gitHead": "9768d1ea0e2383044977d988e33531bcdfe33ea6"
+  "gitHead": "58163844cc9ce2c379235413b19f49679eab4bef"
 }

package/src/components/ChooseTab.js

@@ -16,6 +16,7 @@ import WaffleChartIcon from '@cdc/core/assets/icon-grid.svg'
 import AlabamaGraphic from '@cdc/core/assets/icon-map-alabama.svg'
 import PairedBarIcon from '@cdc/core/assets/icon-chart-bar-paired.svg'
 import HorizontalStackIcon from '@cdc/core/assets/icon-chart-bar-stacked.svg'
+import GenericIcon from '@cdc/core/assets/icon-info.svg'
 
 export default function ChooseTab() {
   const { config, setConfig, setGlobalActive, tempConfig, setTempConfig } = useContext(GlobalState)
@@ -183,6 +184,14 @@ export default function ChooseTab() {
             <Tooltip.Content>Use bars to show comparisons between data categories.</Tooltip.Content>
           </Tooltip>
         </li>
+        {/* <li>
+          <Tooltip>
+            <Tooltip.Target>
+              <IconButton label='Box Plot' type='chart' subType='Box Plot' orientation='vertical' icon={<GenericIcon />} />
+            </Tooltip.Target>
+            <Tooltip.Content>Display a box plot</Tooltip.Content>
+          </Tooltip>
+        </li> */}
       </ul>
 
       <div className='heading-2'>Maps</div>

package/src/components/DataImport.js

@@ -4,7 +4,6 @@ import { csvParse } from 'd3'
 import { get } from 'axios'
 
 import { DataTransform } from '@cdc/core/helpers/DataTransform'
-import { useGlobalContext } from '@cdc/core/components/GlobalContext'
 
 import GlobalState from '../context'
 
@@ -30,8 +29,6 @@ import '@cdc/core/styles/v2/components/data-designer.scss'
 export default function DataImport() {
   const { config, setConfig, errors, setErrors, errorMessages, maxFileSize, setGlobalActive, tempConfig, setTempConfig, sharepath } = useContext(GlobalState)
 
-  const { overlay } = useGlobalContext()
-
   const transform = new DataTransform()
 
   const [externalURL, setExternalURL] = useState(config.dataFileSourceType === 'url' ? config.dataFileName : config.dataUrl || '')
@@ -47,11 +44,6 @@ export default function DataImport() {
     '.json': 'application/json'
   }
 
-  const displayFileName = name => {
-    const nameParts = name.split('/')
-    return nameParts[nameParts.length - 1]
-  }
-
   const displaySize = size => {
     if (size === undefined) return ''
 
@@ -71,6 +63,9 @@ export default function DataImport() {
    */
   const dataExists = (newData, oldSeries, oldAxisX) => {
     // Loop through old series to make sure each exists in the new data
+
+    // TODO: move to forEach?
+    // eslint-disable-next-line array-callback-return
     oldSeries.map(function (currentValue, index, newData) {
       if (!newData.find(element => element.dataKey === currentValue.dataKey)) return false
     })
@@ -94,6 +89,7 @@ export default function DataImport() {
     const fileExtension = Object.keys(supportedDataTypes).find(extension => dataURL.pathname.endsWith(extension))
 
     try {
+      // eslint-disable-next-line no-unused-vars
       const response = await get(dataURL, {
         responseType: 'blob'
       }).then(response => {
@@ -133,14 +129,6 @@ export default function DataImport() {
 
     // Get the raw data as text from the file
     if (null === fileData) {
-      // const round = 1000 * 60 * 15;
-      // const date = new Date();
-      // const rounded = new Date(date.getTime() - (date.getTime() % round));
-      // const trimmedDate = rounded.toString().replace(/\s+/g, "");
-
-      const newUrl = new URL(fileName)
-      // newUrl.searchParams.append("v", trimmedDate);
-
       fileSourceType = 'url'
       try {
         fileData = await loadExternal()
@@ -160,14 +148,32 @@ export default function DataImport() {
     }
 
     let path = fileBlob?.name || externalURL || fileName
-    let fileExtension = path.match(/(?:\.([^.]+))?$/g)
 
-    if (fileExtension.length === 0) {
-      fileExtension = '.csv'
-    } else {
-      fileExtension = fileExtension[0]
+    // checking the file source type allows us to handle real urls better
+    // For example, query parameters in API's and cache busting strings
+    // file matching can handle .csv and .json, but doesn't handle
+    // .csv?version=1 or .json?version=1
+    const handleFileExtension = fileSourceType => {
+      let fileExtension
+      if (fileSourceType === 'file') {
+        fileExtension = path.match(/(?:\.([^.]+))?$/g)
+
+        if (fileExtension.length === 0) {
+          fileExtension = '.csv'
+        } else {
+          fileExtension = fileExtension[0]
+        }
+      }
+
+      if (fileSourceType === 'url') {
+        let urlData = new URL(path)
+        fileExtension = Object.keys(supportedDataTypes).find(extension => urlData.pathname.endsWith(extension))
+      }
+
+      return fileExtension
     }
 
+    let fileExtension = handleFileExtension(fileSourceType)
     let mimeType = supportedDataTypes[fileExtension]
 
     // Convert from blob into raw text
@@ -175,7 +181,7 @@ export default function DataImport() {
     let filereader = new FileReader()
 
     // Set encoding for CSV files - needed to render special characters properly
-    let encoding = mimeType === 'text/csv' ? 'ISO-8859-1' : ''
+    let encoding = mimeType === 'text/csv' ? 'utf-8' : ''
 
     filereader.onload = function () {
       let text = this.result
@@ -604,10 +610,30 @@ export default function DataImport() {
             {/* TODO: Add more sample data in, but this will do for now. */}
             <span className='heading-3'>Load Sample Data:</span>
             <ul className='sample-data-list'>
-              <li onClick={() => loadData(new Blob([validMapData], { type: 'text/csv' }), 'valid-data-map.csv', editingDataset)}>United States Sample Data #1</li>
-              <li onClick={() => loadData(new Blob([validChartData], { type: 'text/csv' }), 'valid-data-chart.csv', editingDataset)}>Chart Sample Data</li>
-              <li onClick={() => loadData(new Blob([validCountyMapData], { type: 'text/csv' }), 'valid-county-data.csv', editingDataset)}>United States Counties Sample Data</li>
-              <li onClick={() => loadData(new Blob([sampleGeoPoints], { type: 'text/csv' }), 'supported-cities.csv', editingDataset)}>Sample Geo Points</li>
+              <button className='link link-upload' onClick={() => loadData(new Blob([validMapData], { type: 'text/csv' }), 'valid-data-map.csv', editingDataset)} onKeyDown={e => e.keyCode === 13 && loadData(new Blob([validMapData], { type: 'text/csv' }), 'valid-data-map.csv', editingDataset)}>
+                United States Sample Data #1
+              </button>
+              <button
+                className='link link-upload'
+                onClick={() => loadData(new Blob([validChartData], { type: 'text/csv' }), 'valid-data-chart.csv', editingDataset)}
+                onKeyDown={e => e.keyCode === 13 && loadData(new Blob([validChartData], { type: 'text/csv' }), 'valid-data-chart.csv', editingDataset)}
+              >
+                Chart Sample Data
+              </button>
+              <button
+                className='link link-upload'
+                onClick={() => loadData(new Blob([validCountyMapData], { type: 'text/csv' }), 'valid-county-data.csv', editingDataset)}
+                onKeyDown={e => e.keyCode === 13 && loadData(new Blob([validCountyMapData], { type: 'text/csv' }), 'valid-county-data.csv', editingDataset)}
+              >
+                United States Counties Sample Data
+              </button>
+              <button
+                className='link link-upload'
+                onClick={() => loadData(new Blob([sampleGeoPoints], { type: 'text/csv' }), 'supported-cities.csv', editingDataset)}
+                onKeyDown={e => e.keyCode === 13 && loadData(new Blob([sampleGeoPoints], { type: 'text/csv' }), 'supported-cities.csv', editingDataset)}
+              >
+                Sample Geo Points
+              </button>
             </ul>
           </div>
         )}

package/src/scss/main.scss

@@ -91,6 +91,18 @@
     border: #b8daff 1px solid;
     border-radius: 0.4em;
   }
+
+  .link.link-upload {
+    display: block;
+    color: #005eaa;
+    background: unset;
+    padding-left: unset;
+    margin-top: 0.3rem;
+    color: #005eaa;
+    text-decoration: underline;
+    cursor: pointer;
+    font-size: 12px;
+  }
 }
 
 // Modal

package/example/private/city-state.json

@@ -1,434 +0,0 @@
-[
-  {
-    "STATE": "AL",
-    "Rate": 10,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "AK",
-    "Rate": 12,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "AS",
-    "Rate": 14,
-    "Location": "Work",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "AZ",
-    "Rate": 9,
-    "Location": "School",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "AR",
-    "Rate": 17,
-    "Location": "School",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "CA",
-    "Rate": "*",
-    "Location": "Work",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "CO",
-    "Rate": 22,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "CT",
-    "Rate": 10,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "DE",
-    "Rate": 12,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "DC",
-    "Rate": 14,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "FL",
-    "Rate": 9,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "GA",
-    "Rate": 17,
-    "Location": "Work",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "GU",
-    "Rate": 20,
-    "Location": "School",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "HI",
-    "Rate": 22,
-    "Location": "School",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "GAINESVILLE",
-    "Rate": 22,
-    "Location": "School",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "ID",
-    "Rate": "*",
-    "Location": "Work",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "IL",
-    "Rate": 12,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "IN",
-    "Rate": 14,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "IA",
-    "Rate": 9,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "KS",
-    "Rate": "NA",
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "KY",
-    "Rate": 20,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "LA",
-    "Rate": 22,
-    "Location": "Work",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "ME",
-    "Rate": 10,
-    "Location": "School",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "MH",
-    "Rate": 12,
-    "Location": "School",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "MD",
-    "Rate": "*",
-    "Location": "Work",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "MA",
-    "Rate": 9,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "MI",
-    "Rate": 17,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "FM",
-    "Rate": 20,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "MN",
-    "Rate": 22,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "MS",
-    "Rate": 10,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "MO",
-    "Rate": 11,
-    "Location": "Work",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "MT",
-    "Rate": 14,
-    "Location": "School",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "NE",
-    "Rate": 9,
-    "Location": "School",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "NV",
-    "Rate": 17,
-    "Location": "Work",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "NH",
-    "Rate": 20,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "NJ",
-    "Rate": 28,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "NM",
-    "Rate": 10,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "NY",
-    "Rate": 12,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "NC",
-    "Rate": 14,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "ND",
-    "Rate": 9,
-    "Location": "Work",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "MP",
-    "Rate": 17,
-    "Location": "School",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "OH",
-    "Rate": "NA",
-    "Location": "School",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "OK",
-    "Rate": 22,
-    "Location": "Work",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "OR",
-    "Rate": 10,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "PW",
-    "Rate": 12,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "PA",
-    "Rate": 14,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "PR",
-    "Rate": 6,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "RI",
-    "Rate": 17,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "SC",
-    "Rate": 20,
-    "Location": "Work",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "SD",
-    "Rate": 22,
-    "Location": "School",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "TN",
-    "Rate": 10,
-    "Location": "School",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "TX",
-    "Rate": 12,
-    "Location": "Work",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "VT",
-    "Rate": 9,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "VI",
-    "Rate": 17,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "VA",
-    "Rate": 20,
-    "Location": "Work",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "WA",
-    "Rate": 22,
-    "Location": "School",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "WV",
-    "Rate": 10,
-    "Location": "School",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "WI",
-    "Rate": 12,
-    "Location": "Work",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "WY",
-    "Rate": 14,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "Los Angeles",
-    "Rate": 14,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "Atlanta",
-    "Rate": 12,
-    "Location": "Work",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "Boston",
-    "Rate": 20,
-    "Location": "School",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "New York City",
-    "Rate": 22,
-    "Location": "School",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "Dallas",
-    "Rate": 18,
-    "Location": "Work",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "Seattle",
-    "Rate": 17,
-    "Location": "Home",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "New Orleans",
-    "Rate": 14,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "Birmingham",
-    "Rate": 14,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "St Paul",
-    "Rate": 14,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "Hershey",
-    "Rate": 14,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "Salt Lake City",
-    "Rate": 14,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "Syracuse",
-    "Rate": 14,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  },
-  {
-    "STATE": "Philadelphia",
-    "Rate": 14,
-    "Location": "Vehicle",
-    "URL": "https://www.cdc.gov/"
-  }
-]