@cdc/editor 4.23.6 → 4.23.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cdc/editor",
-  "version": "4.23.6",
+  "version": "4.23.8",
   "description": "React component for generating a new component entry",
   "moduleName": "CdcEditor",
   "main": "dist/cdceditor",
@@ -24,13 +24,13 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@cdc/chart": "^4.23.6",
-    "@cdc/core": "^4.23.6",
-    "@cdc/dashboard": "^4.23.6",
-    "@cdc/data-bite": "^4.23.6",
-    "@cdc/map": "^4.23.6",
-    "@cdc/markup-include": "^4.23.6",
-    "@cdc/waffle-chart": "^4.23.6",
+    "@cdc/chart": "^4.23.8",
+    "@cdc/core": "^4.23.8",
+    "@cdc/dashboard": "^4.23.8",
+    "@cdc/data-bite": "^4.23.8",
+    "@cdc/map": "^4.23.8",
+    "@cdc/markup-include": "^4.23.8",
+    "@cdc/waffle-chart": "^4.23.8",
     "axios": "^0.21.1",
     "d3": "^7.0.0",
     "html-react-parser": "^3.0.8",
@@ -43,5 +43,5 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
-  "gitHead": "aaed0388b487adfeb3e7e278b4ce74df09cbaade"
+  "gitHead": "ba0a072a40c430baf121ad5ece0165f52a414b86"
 }

package/src/components/ChooseTab.jsx

@@ -21,6 +21,8 @@ import BoxPlotIcon from '@cdc/core/assets/icon-chart-box-whisker.svg'
 import AreaChartIcon from '@cdc/core/assets/icon-area-chart.svg'
 import GaugeChartIcon from '@cdc/core/assets/icon-linear-gauge.svg'
 import InfoIcon from '@cdc/core/assets/icon-info.svg'
+import ForestPlotIcon from '@cdc/core/assets/icon-chart-forest-plot.svg'
+import ForecastIcon from '@cdc/core/assets/icon-chart-forecast.svg'
 
 export default function ChooseTab() {
   const { config, setConfig, setGlobalActive, tempConfig, setTempConfig } = useContext(ConfigContext)
@@ -137,19 +139,19 @@ export default function ChooseTab() {
         <li>
           <Tooltip>
             <Tooltip.Target>
-              <IconButton label='Waffle Chart' type='chart' subType='Waffle' icon={<WaffleChartIcon />} />
+              <IconButton label='Waffle Chart' type='waffle-chart' subType='Waffle' icon={<WaffleChartIcon />} />
             </Tooltip.Target>
             <Tooltip.Content>Highlight a piece of data in relationship to a data set.</Tooltip.Content>
           </Tooltip>
         </li>
-        {/* <li>
+        <li>
           <Tooltip>
             <Tooltip.Target>
-              <IconButton label='Gauge Chart' type='chart' subType='Gauge' icon={<GaugeChartIcon />} />
+              <IconButton label='Gauge Chart' type='waffle-chart' subType='Gauge' icon={<GaugeChartIcon />} />
             </Tooltip.Target>
             <Tooltip.Content>Specify the calculation of a single data point (such as a percentage value) and present it on a horizontal scale.</Tooltip.Content>
           </Tooltip>
-        </li> */}
+        </li>
       </ul>
 
       <div className='heading-2'>Charts</div>
@@ -222,13 +224,22 @@ export default function ChooseTab() {
             <Tooltip.Content>Display an area chart</Tooltip.Content>
           </Tooltip>
         </li>
-        {/* <li>
+        <li>
           <Tooltip>
             <Tooltip.Target>
-              <IconButton label='Forecast Chart' type='chart' subType='Forecasting' orientation='vertical' icon={<InfoIcon />} />
+              <IconButton label='Forecast Chart' type='chart' subType='Forecasting' orientation='vertical' icon={<ForecastIcon />} />
             </Tooltip.Target>
             <Tooltip.Content>Display a forecasting chart</Tooltip.Content>
           </Tooltip>
+        </li>
+
+        {/* <li>
+          <Tooltip>
+            <Tooltip.Target>
+              <IconButton label='Forest Plot' type='chart' subType='Forest Plot' orientation='vertical' icon={<ForestPlotIcon />} />
+            </Tooltip.Target>
+            <Tooltip.Content>Display a forest plot</Tooltip.Content>
+          </Tooltip>
         </li> */}
       </ul>
 

package/src/components/ConfigureTab.jsx

@@ -24,20 +24,21 @@ export default function ConfigureTab({ containerEl }) {
           <CdcMap isEditor={true} isDebug={isDebug} config={config} hostname={hostname} setConfig={setTempConfig} containerEl={containerEl} />
         </ErrorBoundary>
       )
-    case 'chart':
+    case 'waffle-chart':
       if (config.visualizationType === 'Waffle' || config.visualizationType === 'Gauge') {
         return (
           <ErrorBoundary component='CdcWaffleChart'>
             <CdcWaffleChart isEditor={true} isDebug={isDebug} config={config} setConfig={setTempConfig} />
           </ErrorBoundary>
         )
-      } else {
-        return (
-          <ErrorBoundary component='CdcChart'>
-            <CdcChart isEditor={true} isDebug={isDebug} config={config} setConfig={setTempConfig} />
-          </ErrorBoundary>
-        )
       }
+      break
+    case 'chart':
+      return (
+        <ErrorBoundary component='CdcChart'>
+          <CdcChart isEditor={true} isDebug={isDebug} config={config} setConfig={setTempConfig} />
+        </ErrorBoundary>
+      )
     case 'dashboard':
       return (
         <ErrorBoundary component='CdcDashboard'>

package/src/components/DataImport.jsx

@@ -752,7 +752,7 @@ export default function DataImport() {
               </>
             )}
 
-            {showDataDesigner && <DataDesigner visuzliationKey={null} dataKey={configureData.dataFileName} configureData={configureData} updateDescriptionProp={updateDescriptionProp} />}
+            {showDataDesigner && <DataDesigner visuzliationKey={null} dataKey={configureData.dataFileName} configureData={configureData} updateDescriptionProp={updateDescriptionProp} config={config} setConfig={setConfig} />}
           </>
         )}
 

package/src/components/SampleData.jsx

@@ -11,6 +11,7 @@ import validBoxPlotData from './../samples/valid-boxplot.csv?raw'
 import validAreaChart from './../samples/valid-area-chart.json?raw'
 import validWorldGeocodeData from './../samples/valid-world-geocode.json?raw'
 import validForecastData from './../samples/valid-forecast-data.csv?raw'
+import validForestPlotData from './../samples/valid-forest-plot-data.csv?raw'
 
 // Add additional data to samples
 const sampleData = {
@@ -34,12 +35,17 @@ const sampleData = {
       text: 'Area Chart Sample Data',
       fileName: 'valid-area-chart.json',
       data: validAreaChart
+    },
+    {
+      text: 'Forecast Chart Data',
+      fileName: 'valid-forecast-data.csv',
+      data: validForecastData
+    },
+    {
+      text: 'Forest Plot Data',
+      fileName: 'valid-forest-plot-data.csv',
+      data: validForestPlotData
     }
-    // {
-    //   text: 'Forecast Chart Data',
-    //   fileName: 'valid-forecast-data.csv',
-    //   data: validForecastData
-    // }
   ],
   maps: [
     {

package/src/samples/valid-area-chart.json

@@ -1,56 +1,110 @@
 [
-    {
-      "Date": "1/15/2016",
-      "Data 1": "900",
-      "Data 2": "135",
-      "Data 3": "300",
-      "Data 4": "95",
-      "Data 5": "120",
-      "Data 6": "310"
-    },
-    {
-      "Date": "2/15/2016",
-      "Data 1": "4000",
-      "Data 2": "90",
-      "Data 3": "240",
-      "Data 4": "60",
-      "Data 5": "160",
-      "Data 6": "2000"
-    },
-    {
-      "Date": "3/15/2016",
-      "Data 1": "500",
-      "Data 2": "300",
-      "Data 3": "290",
-      "Data 4": "100",
-      "Data 5": "200",
-      "Data 6": "250"
-    },
-    {
-      "Date": "4/15/2016",
-      "Data 1": "1200",
-      "Data 2": "160",
-      "Data 3": "230",
-      "Data 4": "180",
-      "Data 5": "160",
-      "Data 6": "220"
-    },
-    {
-      "Date": "5/15/2016",
-      "Data 1": "8000",
-      "Data 2": "350",
-      "Data 3": "300",
-      "Data 4": "150",
-      "Data 5": "130",
-      "Data 6": "100"
-    },
-    {
-      "Date": "6/15/2016",
-      "Data 1": "9000",
-      "Data 2": "220",
-      "Data 3": "320",
-      "Data 4": "100",
-      "Data 5": "220",
-      "Data 6": "300"
-    }
-  ]
+  {
+    "Date": "1/15/2016",
+    "Data 1": "900",
+    "Data 2": "135",
+    "Data 3": "300",
+    "Data 4": "95",
+    "Data 5": "120",
+    "Data 6": "310"
+  },
+  {
+    "Date": "2/15/2016",
+    "Data 1": "4000",
+    "Data 2": "90",
+    "Data 3": "240",
+    "Data 4": "60",
+    "Data 5": "160",
+    "Data 6": "2000"
+  },
+  {
+    "Date": "3/15/2016",
+    "Data 1": "500",
+    "Data 2": "300",
+    "Data 3": "290",
+    "Data 4": "100",
+    "Data 5": "200",
+    "Data 6": "250"
+  },
+  {
+    "Date": "4/15/2016",
+    "Data 1": "1200",
+    "Data 2": "160",
+    "Data 3": "230",
+    "Data 4": "180",
+    "Data 5": "160",
+    "Data 6": "220"
+  },
+  {
+    "Date": "5/15/2016",
+    "Data 1": "8000",
+    "Data 2": "350",
+    "Data 3": "300",
+    "Data 4": "150",
+    "Data 5": "130",
+    "Data 6": "100"
+  },
+  {
+    "Date": "6/15/2016",
+    "Data 1": "9000",
+    "Data 2": "220",
+    "Data 3": "320",
+    "Data 4": "100",
+    "Data 5": "220",
+    "Data 6": "300"
+  },
+  {
+    "Date": "7/15/2016",
+    "Data 1": "900",
+    "Data 2": "235",
+    "Data 3": "300",
+    "Data 4": "195",
+    "Data 5": "120",
+    "Data 6": "610"
+  },
+  {
+    "Date": "8/15/2016",
+    "Data 1": "3000",
+    "Data 2": "900",
+    "Data 3": "540",
+    "Data 4": "600",
+    "Data 5": "120",
+    "Data 6": "200"
+  },
+  {
+    "Date": "9/15/2016",
+    "Data 1": "700",
+    "Data 2": "200",
+    "Data 3": "590",
+    "Data 4": "900",
+    "Data 5": "400",
+    "Data 6": "650"
+  },
+  {
+    "Date": "10/15/2016",
+    "Data 1": "2200",
+    "Data 2": "360",
+    "Data 3": "930",
+    "Data 4": "880",
+    "Data 5": "760",
+    "Data 6": "420"
+  },
+  {
+    "Date": "11/15/2016",
+    "Data 1": "5000",
+    "Data 2": "1350",
+    "Data 3": "300",
+    "Data 4": "1150",
+    "Data 5": "230",
+    "Data 6": "600"
+  },
+  {
+    "Date": "12/15/2016",
+    "Data 1": "6000",
+    "Data 2": "3220",
+    "Data 3": "540",
+    "Data 4": "300",
+    "Data 5": "720",
+    "Data 6": "3000"
+  }
+]

package/src/samples/valid-forest-plot-data.csv

@@ -0,0 +1,24 @@
+Author(s) and Year,Confidence,Timing,N,Estimate,Lower,Upper,Result
+"Spears, 1983",H,T3,170,0.2,-35.7,36.2,"0.2 [-35.7, 36.2]"
+"Moran, 1998",H,B,2183,33.4,-109.5,176.3,"33.4 [-109.5, 176.3]"
+"Lee, 2003",H,T1-T2,186,-40.1,-74,-6.3,"-40.1 [-74, -6.3]"
+"Cooper, 1977",H,T3,1137,-46,-88.5,-3.5,"-46 [-88.5, -3.5]"
+"Mccarthy, 1998",H,T2,1337,22.2,-18.2,62.6,"22.2 [-18.2, 62.6]"
+"Williams, 1976",H,T1,889,-14.8,-55,25.4,"-14.8 [-55, 25.4]"
+"Sawyer, 1973",H,T1,107,-57.6,-104.1,-11.1,"-57.6 [-104.1, -11.1]"
+"Miller, 2003",H,T3,2402,-7.3,-145.9,131.3,"-7.3 [-145.9, 131.3]"
+"Dixon, 1981",M,T1-T2,2242,-60.6,-156.5,35.3,"-60.6 [-156.5, 35.3]"
+"Thompson, 1988",M,T2-T3,2166,-31.1,-129,66.9,"-31.1 [-129, 66.9]"
+"Valenzuela, 1980",M,T1,126,6.1,-16.6,28.7,"6.1 [-16.6, 28.7]"
+"Vaughn, 1975",M,T1,402,-77,-135.3,-18.7,"-77 [-135.3, -18.7]"
+"Wilson, 1976",M,T2-T3,878,-108,-188.2,-27.8,"-108 [-188.2, -27.8]"
+"Livingston, 2013",M,T2,1082,28.6,-42.5,99.8,"28.6 [-42.5, 99.8]"
+"Sullivan, 1983",M,T2-T3,2411,-52.4,-101.9,-2.9,"-52.4 [-101.9, -2.9]"
+"Parker, 1988",M,T3,856,-39.3,-110.7,32.1,"-39.3 [-110.7, 32.1]"
+"Morgan, 1976",M,T3,1679,-47.3,-155.6,61,"-47.3 [-155.6, 61]"
+"Perez, 2007",L,T2-T3,2095,-43.5,-89.5,2.6,"-43.5 [-89.5, 2.6]"
+"Mathis, 1982",L,T3,593,-41.8,-71.8,-11.8,"-41.8 [-71.8, -11.8]"
+"Parker, 2018",L,B,1320,-45.6,-106.9,15.7,"-45.6 [-106.9, 15.7]"
+"Knox, 2020",L,T1,2080,22.9,-89.5,135.2,"22.9 [-89.5, 135.2]"
+"Manning, 2017",L,T2-T3,2463,-133.4,-349.9,83.1,"-133.4 [-349.9, 83.1]"
+"Jackson, 2018",L,B,1880,14,-168.5,196.5,"14 [-168.5, 196.5]"