@cdc/core 4.23.10 → 4.24.1

package/helpers/DataTransform.ts

@@ -1,4 +1,4 @@
-type DataArray = Record<string,any>[]
+type DataArray = Record<string, any>[]
 
 export class DataTransform {
   constants: any
@@ -17,12 +17,12 @@ export class DataTransform {
     const errorsFound: any[] = []
 
     // Empty data
-    if (0 === data.length) {
+    if (!data || 0 === data.length) {
       errorsFound.push(this.constants.errorMessageEmptyData)
     }
 
     // Does it have the correct data structure?
-    if (!data.filter || data.filter(row => typeof row !== 'object').length > 0) {
+    if (!data?.filter || data.filter(row => typeof row !== 'object').length > 0) {
       errorsFound.push(this.constants.errorMessageFormat)
     }
 
@@ -49,6 +49,10 @@ export class DataTransform {
 
   //Performs standardizations based on developer provided description of the data
   developerStandardize(data, description) {
+    if (!data) {
+      return []
+    }
+
     //Validate the description object
     if (!description) {
       return undefined
@@ -98,7 +102,7 @@ export class DataTransform {
 
         return standardized
       } else {
-        let standardized: {key: string, value: any}[] = []
+        let standardized: { key: string; value: any }[] = []
 
         data.forEach(row => {
           let nonNumericKeys: string[] = []
@@ -124,8 +128,36 @@ export class DataTransform {
         return standardized
       }
     } else if (description.series === true && description.singleRow === false) {
-      if (description.seriesKey !== undefined && description.xKey !== undefined && (description.valueKey !== undefined || (description.valueKeys !== undefined && description.valueKeys.length > 0))) {
-        if (description.valueKeys !== undefined) {
+      if (description.seriesKey !== undefined && description.xKey !== undefined && (description.valueKey !== undefined || (description.valueKeys !== undefined && description.valueKeys.length > 0) || (description.valueKeysTallSupport !== undefined && description.valueKeysTallSupport.length > 0))) {
+        if (description.valueKeysTallSupport !== undefined) {
+          let standardizedMapped = {}
+          let standardized: string[] = []
+
+          data.forEach(row => {
+            let uniqueKey = row[description.xKey];
+            Object.keys(row).forEach(key => {
+              if(key !== description.xKey && key !== description.seriesKey && description.valueKeysTallSupport.indexOf(key) === -1 && (!description.ignoredKeys || description.ignoredKeys.indexOf(key) === -1)){
+                uniqueKey += "|" + row[key];
+              }
+            })
+
+            if(!standardizedMapped[uniqueKey]){
+              standardizedMapped[uniqueKey] = {[description.xKey]: row[description.xKey]}
+            }
+            Object.keys(row).forEach(key => {
+              if(key !== description.xKey && key !== description.seriesKey && description.valueKeysTallSupport.indexOf(key) === -1 && (!description.ignoredKeys || description.ignoredKeys.indexOf(key) === -1)){
+                standardizedMapped[uniqueKey][key] = row[key];
+              }
+            })
+            description.valueKeysTallSupport.forEach(valueKey => {
+              standardizedMapped[uniqueKey][row[description.seriesKey] + '-' + valueKey] = row[valueKey];
+            })
+          })
+
+          standardized = Object.keys(standardizedMapped).map(key => standardizedMapped[key]);
+
+          return standardized
+        } else if (description.valueKeys !== undefined) {
           let standardizedMapped = {}
           let standardized: string[] = []
           let valueKeys = description.valueKeys
@@ -218,7 +250,7 @@ export class DataTransform {
     */
   cleanData(data: DataArray, excludeKey, testing = false): DataArray {
     let cleanedupData: DataArray = []
-    if(!Array.isArray(data)) debugger;
+    if (!Array.isArray(data)) debugger
     if (testing) console.log('## Data to clean=', data)
     if (excludeKey === undefined) {
       console.log('COVE: cleanData excludeKey undefined')
@@ -228,7 +260,7 @@ export class DataTransform {
       if (testing) console.log('clean', i, ' d', d)
       let cleaned = {}
       Object.keys(d).forEach(function (key) {
-        const value = d[key];
+        const value = d[key]
         if (key === excludeKey) {
           // pass thru
           cleaned[key] = value
@@ -259,21 +291,44 @@ export class DataTransform {
     return cleanedupData
   }
 
-  // clean out %, $, commas from numbers when needing to do sorting!
-  cleanDataPoint(data, testing = false) {
-      if (testing) console.log('clean', data)
-      let cleaned = ''
+  applySuppression = (data, suppressedData) => {
+    if (!suppressedData || suppressedData.length === 0) return data
 
-      // remove comma and dollar signs
-      let tmp = ''
-      if (typeof data === 'string') {
-        tmp = data!== null && data !== '' ? data.replace(/[,\$\%]/g, '') : ''
-      } else {
-        tmp = data !== null && data !== '' ? data : ''
+    // Create a new array to store the result without modifying the original data
+    const result = data.map(item => {
+      // Create a new object to store the updated item without modifying the original item
+      const newItem = { ...item }
+
+      // For each suppressedData item
+      for (let i = 0; i < suppressedData.length; i++) {
+        // If the object contains the column and its value matches the suppressed one
+        if (newItem[suppressedData[i].column] && newItem[suppressedData[i].column] === suppressedData[i].value) {
+          // Replace the value with the label in the new object
+          newItem[suppressedData[i].column] = suppressedData[i].label
+        }
       }
 
-      if (testing) console.log('## cleanedData =', tmp)
-      return tmp
+      return newItem
+    })
+
+    return result
+  }
+
+  // clean out %, $, commas from numbers when needing to do sorting!
+  cleanDataPoint(data, testing = false) {
+    if (testing) console.log('clean', data)
+    let cleaned = ''
+
+    // remove comma and dollar signs
+    let tmp = ''
+    if (typeof data === 'string') {
+      tmp = data !== null && data !== '' ? data.replace(/[,\$\%]/g, '') : ''
+    } else {
+      tmp = data !== null && data !== '' ? data : ''
+    }
+
+    if (testing) console.log('## cleanedData =', tmp)
+    return tmp
   }
 }
 

package/helpers/cove/string.ts

@@ -0,0 +1,11 @@
+/**
+ * regex
+ * - /\w\S* replaces zero or more whitespace characters
+ * - g makes it find all matches in the string
+ * - the callback function capitalizes the word
+ * */
+export const capitalizeSplitAndJoin = function (splittingCharacter: string = ' ', joiningCharacter: string = '') {
+  return this.split(splittingCharacter)
+    .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+    .join(joiningCharacter)
+}

package/helpers/fetchRemoteData.js

@@ -2,7 +2,7 @@ import Papa from 'papaparse'
 
 export default async function (url, visualizationType = '') {
   try {
-    url = new URL(url)
+    url = new URL(url, window.location.origin)
 
     const path = url.pathname
     const regex = /(?:\.([^.]+))?$/

package/helpers/getFileExtension.ts

@@ -1,5 +1,28 @@
-export const getFileExtension = (path: string): string => {
-    const regex = /(?:\.([^.]+))?$/
-    const outCome: RegExpExecArray | null = regex.exec(path)
-    return outCome ? outCome[1] : ''
-}
+// export const getFileExtensionx = (path: string): string => {
+//   const regex = /(?:\.([^.]+))?$/
+//   const outCome: RegExpExecArray | null = regex.exec(path)
+//   return outCome ? outCome[1] : ''
+// }
+
+export const getFileExtension = (url: string): string => {
+  const regexForExtension = /(?:\.([^.]+))$/
+  const regexForQueryParam = /[?&]wt=(csv|json)(?:&|$)/ // Regular expression for 'wt' query parameter
+
+  const urlObject = new URL(url, window.location.origin)
+  const pathname = urlObject.pathname
+  const searchParams = urlObject.search
+
+  // First, try to get the extension from the pathname
+  const pathnameMatch = regexForExtension.exec(pathname)
+  if (pathnameMatch && pathnameMatch[1]) {
+    return pathnameMatch[1]
+  }
+
+  // Then, try to get it from the query parameter 'wt'
+  const queryParamsMatch = regexForQueryParam.exec(searchParams)
+  if (queryParamsMatch && queryParamsMatch[1]) {
+    return queryParamsMatch[1]
+  }
+
+  return ''
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cdc/core",
-  "version": "4.23.10",
+  "version": "4.24.1",
   "description": "Core components, styles, hooks, and helpers, for the CDC Open Visualization project",
   "moduleName": "CdcCore",
   "main": "dist/cdccore",
@@ -30,5 +30,5 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
-  "gitHead": "b3f3263e444bbf99d525b05040be22f06553760e"
+  "gitHead": "a352a3f74f4b681191e3244061dbb3621f36eec3"
 }

package/styles/_data-table.scss

@@ -51,6 +51,7 @@ table.data-table {
   overflow: auto;
   appearance: none;
   table-layout: fixed;
+  display: grid;
   * {
     box-sizing: border-box;
   }
@@ -64,6 +65,7 @@ table.data-table {
       background: none;
       font-size: initial;
       color: #fff;
+      border: 0;
     }
 
     tr {
@@ -136,6 +138,7 @@ table.data-table {
   }
 
   tbody {
+    display: table-cell;
     tr {
       width: 100%;
       &:hover {

package/styles/heading-colors.scss

@@ -1,6 +1,3 @@
-div.dashboard-title,
-div.chart-title,
-div.map-title,
 .color-palette li,
 .btn {
   &.theme-purple {

package/styles/v2/layout/_component.scss

@@ -3,17 +3,6 @@
   // box-shadow: rgba(0, 0, 0, 0.2) 3px 6px 10px; // no box shadows
 }
 
-.cove-component__header {
-  width: 100%;
-  padding: 0.6rem 0.8rem;
-  border-bottom-width: 3px;
-  border-bottom-style: solid;
-  border-radius: 3px 3px 0 0;
-  font-size: 1.1rem;
-  transition: background-color 200ms ease, border-color 200ms ease;
-  color: #fff;
-}
-
 .cove-component__content {
   padding-top: 1rem;
   border: solid 1px #ccc;

package/types/Axis.ts

@@ -0,0 +1,41 @@
+export type Anchor = {
+  value: string
+  color: string
+  lineStyle: string
+}
+
+export type Axis = {
+  anchors?: Anchor[]
+  dataKey: string
+  dateDisplayFormat: string
+  dateParseFormat: string
+  displayNumbersOnBar?: boolean
+  enablePadding?: boolean
+  gridLines?: boolean
+  hideAxis?: boolean
+  hideLabel?: boolean
+  hideTicks?: boolean
+  label?: string
+  labelOffset?: number
+  labelPlacement?: string
+  max?: string
+  maxTickRotation?: number
+  min?: string
+  numTicks?: number
+  rightAxisSize?: number
+  rightHideAxis?: boolean
+  rightHideLabel?: boolean
+  rightHideTicks?: boolean
+  rightLabel?: string
+  rightLabelOffsetSize?: number
+  rightMax?: string
+  rightNumTicks?: number
+  sortDates?: boolean
+  showTargetLabel?: boolean
+  size?: number
+  target?: number
+  targetLabel?: string
+  tickRotation?: number
+  tickWidthMax?: number
+  type: string
+}

package/types/Color.ts

@@ -0,0 +1,5 @@
+type RGB = `rgb(${number}, ${number}, ${number})`
+type RGBA = `rgba(${number}, ${number}, ${number}, ${number})`
+type HEX = `#${string}`
+
+type Color = RGB | RGBA | HEX

package/types/Column.ts

@@ -0,0 +1,15 @@
+export type Column = {
+  name?: string
+  label: string
+  prefix: string
+  suffix: string
+  roundToPlace: number
+  commas: boolean
+  dataTable: boolean
+  startingPoint: string
+  series?: string
+  tooltips: boolean
+  forestPlot: boolean
+  forestPlotAlignRight: boolean
+  forestPlotStartingPoint: number
+}

package/types/ComponentStyles.ts

@@ -0,0 +1,7 @@
+export type ComponentStyles = {
+  border: boolean
+  accent: boolean
+  background: boolean
+  hideBackgroundColor: boolean
+  borderColorTheme: boolean
+}

package/types/ComponentThemes.ts

@@ -0,0 +1,13 @@
+// prettier-ignore
+export type ComponentThemes =
+  | 'theme-amber'
+  | 'theme-blue'
+  | 'theme-brown'
+  | 'theme-cyan'
+  | 'theme-green'
+  | 'theme-indigo'
+  | 'theme-orange'
+  | 'theme-pink'
+  | 'theme-purple'
+  | 'theme-slate'
+  | 'theme-teal'

package/types/EditorColumnProperties.ts

@@ -0,0 +1,8 @@
+export type EditorColumnProperties = {
+  dataTable: boolean
+  label: string
+  name: string
+  prefix: string
+  suffix: string
+  tooltip: boolean
+}

package/types/FilterBehavior.ts

@@ -0,0 +1 @@
+export type FilterBehavior = 'Apply Button' | 'Filter Change'

package/types/Runtime.ts

@@ -0,0 +1,29 @@
+import { Axis } from './Axis'
+
+export type ForecastingSeriesKey = {
+  stages: {
+    key: string
+    color: string
+  }[]
+}
+
+export type BarSeriesKey = {
+  key: string
+  color: string
+}
+
+export type Runtime = {
+  barSeriesKeys?: BarSeriesKey[]
+  forecastingSeriesKeys?: ForecastingSeriesKey[]
+  originalXAxis: {
+    dataKey: string
+    name: string
+    axis: string
+  }
+  xAxis: Axis
+  yAxis: Axis
+  seriesKeys: any[]
+  seriesLabels: string[]
+  seriesLabelsAll: string[]
+  editorErrorMessage: string
+}

package/types/Series.ts

@@ -0,0 +1 @@
+export type Series = { dataKey: string; name: string; axis: string; type: string }[]

package/types/Table.ts

@@ -0,0 +1,18 @@
+export type Table = {
+  cellMinWidth?: number
+  label?: string
+  show?: boolean
+  showVertical?: boolean
+  indexLabel?: string
+  caption?: string
+  limitHeight?: boolean
+  height?: number
+  expanded?: boolean
+  showDataTableLink?: boolean
+  showDownloadUrl?: boolean
+  download?: boolean
+  showDownloadImgButton?: boolean
+  showDownloadPdfButton?: boolean
+  customTableConfig?: boolean
+  excludeColumns?: string[]
+}

package/types/UpdateFieldFunc.ts

@@ -0,0 +1 @@
+export type UpdateFieldFunc<T> = (section: string | null, subsection: string | null, fieldName: string, value: T) => void

package/types/Visualization.ts

@@ -0,0 +1,21 @@
+export type Visualization = {
+  autoLoad: boolean
+  data: any
+  dataDescription: Object
+  dataKey: string
+  editing: boolean
+  formattedData: any
+  general: any
+  hide: any[]
+  newViz: boolean
+  openModal: boolean
+  originalFormattedData: any
+  table: {
+    showDataTableLink: boolean
+  }
+  title: string
+  type: 'chart' | 'map' | 'data-bite' | 'waffle-chart' | 'markup-include' | 'filtered-text' | 'filter-dropdowns'
+  uid: string
+  usesSharedFilter: any
+  visualizationType: string
+}