@cdc/core 4.23.6 → 4.23.7

package/assets/icon-filter-dropdowns.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.31 82.55"><path d="M87.87,5.89H11.35c-1.56,0-2.84,1.28-2.84,2.84v14.78c0,1.56,1.28,2.84,2.84,2.84l76.52-.19c1.56,0,2.84-1.28,2.84-2.84V8.73c0-1.56-1.28-2.84-2.84-2.84ZM25.95,14.33l-5.19,5.19c-.29,.29-.77,.29-1.06,0l-5.19-5.19c-.29-.29-.29-.77,0-1.06h11.43c.29,.29,.29,.77,0,1.06Zm60.97,10.22H32.18V7.7h54.73V24.55Z"/><path transform="translate(0, 30)" d="M87.87,5.89H11.35c-1.56,0-2.84,1.28-2.84,2.84v14.78c0,1.56,1.28,2.84,2.84,2.84l76.52-.19c1.56,0,2.84-1.28,2.84-2.84V8.73c0-1.56-1.28-2.84-2.84-2.84ZM25.95,14.33l-5.19,5.19c-.29,.29-.77,.29-1.06,0l-5.19-5.19c-.29-.29-.29-.77,0-1.06h11.43c.29,.29,.29,.77,0,1.06Zm60.97,10.22H32.18V7.7h54.73V24.55Z"/></svg>

package/components/DataTable.jsx

@@ -13,14 +13,6 @@ import { formatNumber } from '@cdc/core/helpers/cove/number'
 
 import Loading from '@cdc/core/components/Loading'
 
-// FILE REVIEW
-// TODO: Remove eslint-disable jsx/a11y/non-interactive-tabindex and handle appropriately
-// TODO: Move ExternalIcon to core Icon component
-// TODO: use destructuring
-// TODO: @tturnerswdev33 - It looks like there's an unused variable setFilteredCountryCode that was added
-// TODO: @tturnerswdev33 - change function declarations to arrow functions
-// TODO: @tturnerswdev33 - move caption so that useMemo is not rendered conditionally
-
 /* eslint-disable jsx-a11y/no-noninteractive-tabindex, jsx-a11y/no-static-element-interactions */
 const DataTable = props => {
   const { config, tableTitle, indexTitle, vizTitle, rawData, runtimeData, headerColor, expandDataTable, columns, displayDataAsText, applyLegendToRow, displayGeoName, navigationHandler, viewport, formatLegendLocation, tabbingId, isDebug } = props
@@ -213,16 +205,19 @@ const DataTable = props => {
 
   const rows = Object.keys(runtimeData).sort((a, b) => {
     let sortVal
-    if (config.columns.length > 0) {
+    if (config.type === 'map' && config.columns) {
       sortVal = customSort(runtimeData[a][config.columns[sortBy.column].name], runtimeData[b][config.columns[sortBy.column].name])
     }
+    if (config.type === 'chart') {
+      sortVal = customSort(runtimeData[a][sortBy.column], runtimeData[b][sortBy.column])
+    }
     if (!sortBy.asc) return sortVal
     if (sortVal === 0) return 0
     if (sortVal < 0) return 1
     return -1
   })
 
-  function genMapRows(rows) {
+  const genMapRows = rows => {
     const allrows = rows.map(row => {
       return (
         <tr role='row'>
@@ -316,6 +311,7 @@ const DataTable = props => {
   }
 
   const genChartHeader = (columns, data) => {
+    if (!data) return
     return (
       <tr>
         {dataSeriesColumns().map(column => {
@@ -355,6 +351,24 @@ const DataTable = props => {
     )
   }
 
+  // if its additional column, return formatting params
+  const isAdditionalColumn = column => {
+    let inthere = false
+    let formattingParams = {}
+    Object.keys(config.columns).forEach(keycol => {
+      if (config.columns[keycol].name === column) {
+        inthere = true
+        formattingParams = {
+          addColPrefix: config.columns[keycol].prefix,
+          addColSuffix: config.columns[keycol].suffix,
+          addColRoundTo: config.columns[keycol].roundToPlace ? config.columns[keycol].roundToPlace : '',
+          addColCommas: config.columns[keycol].commas
+        }
+      }
+    })
+    return formattingParams
+  }
+
   const genChartRows = rows => {
     const allRows = rows.map(row => {
       return (
@@ -367,10 +381,9 @@ const DataTable = props => {
               // not the prettiest, but helper functions work nicely here.
               cellValue = <>{config.xAxis.type === 'date' ? formatDate(config.xAxis.dateDisplayFormat, parseDate(config.xAxis.dateParseFormat, labelValue)) : labelValue}</>
             } else {
-              let resolvedAxis = ''
+              let resolvedAxis = 'left'
               let leftAxisItems = config.series.filter(item => item?.axis === 'Left')
               let rightAxisItems = config.series.filter(item => item?.axis === 'Right')
-              console.log('column', column)
 
               leftAxisItems.map(leftSeriesItem => {
                 if (leftSeriesItem.dataKey === column) resolvedAxis = 'left'
@@ -380,7 +393,12 @@ const DataTable = props => {
                 if (rightSeriesItem.dataKey === column) resolvedAxis = 'right'
               })
 
-              cellValue = formatNumber(runtimeData[row][column], resolvedAxis, true, config)
+              let addColParams = isAdditionalColumn(column)
+              if (addColParams) {
+                cellValue = formatNumber(runtimeData[row][column], resolvedAxis, true, config, addColParams)
+              } else {
+                cellValue = formatNumber(runtimeData[row][column], resolvedAxis, true, config)
+              }
             }
 
             return (
@@ -418,7 +436,7 @@ const DataTable = props => {
     [config.runtime.seriesKeys]) // eslint-disable-line
 
   if (config.visualizationType !== 'Box Plot') {
-    function genMapHeader(columns) {
+    const genMapHeader = columns => {
       return (
         <tr>
           {Object.keys(columns)
@@ -433,9 +451,11 @@ const DataTable = props => {
               if (config.type === 'map' && (text === undefined || text === '')) {
                 text = 'Location'
               }
+
               return (
                 <th
                   key={`col-header-${column}`}
+                  id={column}
                   tabIndex='0'
                   title={text}
                   role='columnheader'
@@ -530,7 +550,7 @@ const DataTable = props => {
     )
   } else {
     // Render Data Table for Box Plots
-    function genBoxplotHeader(categories) {
+    const genBoxplotHeader = categories => {
       let columns = ['Measures', ...categories]
       return (
         <tr>
@@ -584,7 +604,7 @@ const DataTable = props => {
       if (Number(rowid) === 10) return plot.values.length > 0 ? plot.values.toString() : '-'
       return <p>-</p>
     }
-    function genBoxplotRows(rows) {
+    const genBoxplotRows = rows => {
       // get list of data keys for each row
       let dataKeys = rows.map(row => {
         return row[0]

package/components/ui/Icon.jsx

@@ -27,7 +27,8 @@ import iconWarningCircle from '../../assets/icon-warning-circle.svg'
 import iconWarningTriangle from '../../assets/icon-warning-triangle.svg'
 import iconGear from '../../assets/icon-gear.svg'
 import iconTools from '../../assets/icon-tools.svg'
-import iconText from '../../assets/filtered-text.svg'
+import iconText from '../../assets/icon-filtered-text.svg'
+import iconDropdowns from '../../assets/icon-filter-dropdowns.svg'
 import iconPlus from '../../assets/icon-plus.svg'
 import iconMinus from '../../assets/icon-minus.svg'
 
@@ -62,7 +63,8 @@ const iconHash = {
   tools: iconTools,
   plus: iconPlus,
   minus: iconMinus,
-  'filtered-text': iconText
+  'filtered-text': iconText,
+  'filter-dropdowns': iconDropdowns
 }
 
 const Icon = ({ display = null, base, alt = '', size, color, style, ...attributes }) => {

package/components/ui/Tooltip.jsx

@@ -9,42 +9,30 @@ import '../../styles/v2/components/ui/tooltip.scss'
 const TooltipTarget = () => null
 const TooltipContent = () => null
 
-const Tooltip = ({
-                   place = 'top',
-                   trigger = 'hover',
-                   float = false,
-                   shadow = true,
-                   border = false,
-                   children,
-                   style,
-                   ...attributes
-                 }) => {
-
+const Tooltip = ({ place = 'top', trigger = 'hover', float = false, shadow = true, border = false, children, style, ...attributes }) => {
   const tooltipTargetChildren = children.find(el => el.type === TooltipTarget)
   const tooltipContentChildren = children.find(el => el.type === TooltipContent)
 
   const uid = 'tooltip-' + useId()
 
-  const generateTriggerEvent = (trigger) => {
+  const generateTriggerEvent = trigger => {
     const eventList = {
-      'hover': null,
-      'focus': 'focus',
-      'click': 'click focus'
+      hover: null,
+      focus: 'focus',
+      click: 'click focus'
     }
     return eventList[trigger]
   }
 
   return (
-    <span className="cove-tooltip" style={style} {...attributes}>
-      <a id={uid} className="cove-tooltip--target"
-         data-tooltip-float={float}
-         data-tooltip-place={place}
-         data-tooltip-events={generateTriggerEvent()}
-      >
+    <span className='cove-tooltip' style={style} {...attributes}>
+      <a id={uid} className='cove-tooltip--target' data-tooltip-float={float} data-tooltip-place={place} data-tooltip-events={generateTriggerEvent()}>
         {tooltipTargetChildren ? tooltipTargetChildren.props.children : null}
       </a>
+      {/* prettier-ignore */}
       <ReactTooltip
-        id={uid} anchorId={uid}
+        id={uid}
+        anchorId={uid}
         className={'cove-tooltip__content' + (' place-' + place) + (!float ? ' cove-tooltip__content--animated' : '') + (trigger === 'click' ? ' interactive' : '') + (border ? (' cove-tooltip--border') : '') + (shadow ? ' has-shadow' : '')}
         globalEventOff="click"
       >

package/helpers/cove/number.js

@@ -19,7 +19,7 @@ const abbreviateNumber = num => {
 }
 
 // Format numeric data based on settings in config
-const formatNumber = (num, axis, shouldAbbreviate = false, config = null) => {
+const formatNumber = (num, axis, shouldAbbreviate = false, config = null, addColParams = null) => {
   if (!config) console.error('no config found in formatNumber')
   // if num is NaN return num
   if (isNaN(num) || !num) return num
@@ -36,17 +36,36 @@ const formatNumber = (num, axis, shouldAbbreviate = false, config = null) => {
     dataFormat: { commas, abbreviated, roundTo, prefix, suffix, rightRoundTo, bottomRoundTo, rightPrefix, rightSuffix, bottomPrefix, bottomSuffix, bottomAbbreviated }
   } = config
 
+  // destructure Additional Col dataformat values
+  const { addColCommas, addColRoundTo, addColPrefix, addColSuffix } = addColParams
+
   // check if value contains comma and remove it. later will add comma below.
   if (String(num).indexOf(',') !== -1) num = num.replaceAll(',', '')
 
   let original = num
   let stringFormattingOptions
   if (axis === 'left') {
-    stringFormattingOptions = {
-      useGrouping: config.dataFormat.commas ? true : false,
-      minimumFractionDigits: roundTo ? Number(roundTo) : 0,
-      maximumFractionDigits: roundTo ? Number(roundTo) : 0
-    }
+      let roundToPlace
+      if (addColRoundTo !== undefined) {
+        // if its an Additional Column
+        roundToPlace = addColRoundTo ? Number(addColRoundTo) : 0
+      } else {
+        roundToPlace = roundTo ? Number(roundTo) : 0
+      }
+      // Need to prevent negative values in rounding
+      if (roundToPlace < 0) roundToPlace = 0
+      let useCommas
+      if (addColCommas !== undefined) {
+        // if its an Additional Column
+        useCommas = addColCommas ? true : false
+      } else {
+        useCommas = config.dataFormat.commas ? true : false
+      }
+      stringFormattingOptions = {
+        useGrouping: useCommas,
+        minimumFractionDigits: roundToPlace,
+        maximumFractionDigits: roundToPlace
+      }
   }
 
   if (axis === 'right') {
@@ -104,8 +123,12 @@ const formatNumber = (num, axis, shouldAbbreviate = false, config = null) => {
     num = abbreviateNumber(parseFloat(num))
   }
 
-  if (prefix && axis === 'left') {
-    result += prefix
+  if (addColPrefix !== undefined && axis === 'left') {
+      result = addColPrefix + result
+  } else {
+    if (prefix && axis === 'left') {
+      result = prefix + result
+    }
   }
 
   if (rightPrefix && axis === 'right') {
@@ -118,8 +141,12 @@ const formatNumber = (num, axis, shouldAbbreviate = false, config = null) => {
 
   result += num
 
-  if (suffix && axis === 'left') {
-    result += suffix
+  if (addColSuffix !== undefined && axis === 'left') {
+    result += addColSuffix
+  } else {
+    if (suffix && axis === 'left') {
+      result += suffix
+    }
   }
 
   if (rightSuffix && axis === 'right') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cdc/core",
-  "version": "4.23.6",
+  "version": "4.23.7",
   "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": "aaed0388b487adfeb3e7e278b4ce74df09cbaade"
+  "gitHead": "6c7ac5215dcf3bc1cc7d199089c8c2e75f53a93e"
 }

package/styles/v2/components/ui/tooltip.scss

@@ -1,17 +1,34 @@
-$cove-tooltip-bg: #fff;
-$cove-tooltip-color: #333;
-$cove-tooltip-animation: 500ms cubic-bezier(0.16, 1, 0.3, 1) 50ms 1 forwards;
-
-.cove-tooltip {
-  display: inline-block;
-  position: relative;
-  line-height: 1em;
+// Reusable variables, nice for JS manipulations
+:root {
+  --cove-tooltip-bg: #fff;
+  --cove-tooltip-color: black;
+  --cove-tooltip-font-size: 14px;
+  --cove-tooltip-border-color: #bdbdbd;
+  --cove-tooltip-heading-fontWeight: bold;
+  --cove-tooltip-animation: 500ms cubic-bezier(0.16, 1, 0.3, 1) 50ms 1 forwards;
+  --cove-tooltip-maxWidth: 280px;
+}
 
-  &.cove-tooltip--border {
-    border: 1px solid #bdbdbd;
+// Namespace to cove project, inconveniently using two different classes.
+.cove,
+.cdc-open-viz-module {
+  // todo: move to a utils folder.
+  .capitalize {
+    text-transform: capitalize;
+  }
+
+  // react-tooltip library
+  .react-tooltip {
+    .styles-module_arrow,
+    .react-tooltip-arrow {
+      border-bottom: var(--cove-tooltip-border-color) 1px solid;
+      border-right: var(--cove-tooltip-border-color) 1px solid;
+      backface-visibility: hidden;
+    }
   }
 
-  @at-root {
+  // editor-panel
+  .editor-panel {
     .cove-label + .cove-tooltip {
       top: 1px;
       margin-left: 0.5rem;
@@ -30,6 +47,61 @@ $cove-tooltip-animation: 500ms cubic-bezier(0.16, 1, 0.3, 1) 50ms 1 forwards;
       line-height: inherit;
     }
   }
+
+  // begin actual tooltip styles
+  .react-tooltip,
+  .tooltip {
+    color: var(--cove-tooltip-color);
+    border: 1px solid var(--cove-tooltip-border-color);
+    padding: 0.3rem 0.5rem;
+    z-index: 1000;
+    opacity: 1;
+
+    .interactive {
+      a {
+        pointer-events: all;
+      }
+    }
+
+    ul {
+      list-style: none;
+
+      li {
+        font-size: var(--cove-tooltip-font-size) !important;
+      }
+
+      // under the heading
+      > li.tooltip-body {
+        border-top: 1px solid black;
+        padding-top: 5px;
+      }
+
+      li.tooltip-body:first-of-type {
+        padding-top: 5px;
+        border-top: 1px solid black;
+      }
+
+      // undo previous except first class
+      > li.tooltip-body ~ li.tooltip-body {
+        border-top: initial;
+        padding-top: initial;
+      }
+    }
+
+    .tooltip-heading {
+      display: block;
+      font-weight: var(--cove-tooltip-heading-fontWeight) !important;
+      padding-bottom: 3px;
+      padding-top: 3px;
+      font-size: var(--cove-tooltip-font-size) !important;
+    }
+  }
+}
+
+.cove-tooltip {
+  display: inline-block;
+  position: relative;
+  line-height: 1em;
 }
 
 .cove-tooltip--target {
@@ -45,16 +117,15 @@ $cove-tooltip-animation: 500ms cubic-bezier(0.16, 1, 0.3, 1) 50ms 1 forwards;
 }
 
 .cove-tooltip__content {
-  max-width: 280px;
+  max-width: var(--cove-tooltip-maxWidth);
   padding: 10px 8px;
   font-size: 0.875rem;
   line-height: 1.125rem;
   text-align: left;
-  color: $cove-tooltip-color;
-  background-color: $cove-tooltip-bg;
+  color: var(--cove-tooltip-color);
+  background-color: var(--cove-tooltip-bg);
   border-radius: 5px;
   user-select: none;
-  opacity: 0;
   cursor: default;
   z-index: 1;
 
@@ -64,7 +135,7 @@ $cove-tooltip-animation: 500ms cubic-bezier(0.16, 1, 0.3, 1) 50ms 1 forwards;
     }
 
     &.cove-tooltip__content--animated[class*='styles-module_show__'] {
-      animation: tooltip-btt $cove-tooltip-animation;
+      animation: tooltip-btt var(--cove-tooltip-animation);
     }
   }
 
@@ -74,7 +145,7 @@ $cove-tooltip-animation: 500ms cubic-bezier(0.16, 1, 0.3, 1) 50ms 1 forwards;
     }
 
     &.cove-tooltip__content--animated[class*='styles-module_show__'] {
-      animation: tooltip-ltr $cove-tooltip-animation;
+      animation: tooltip-ltr var(--cove-tooltip-animation);
     }
   }
 
@@ -84,7 +155,7 @@ $cove-tooltip-animation: 500ms cubic-bezier(0.16, 1, 0.3, 1) 50ms 1 forwards;
     }
 
     &.cove-tooltip__content--animated[class*='styles-module_show__'] {
-      animation: tooltip-ttb $cove-tooltip-animation;
+      animation: tooltip-ttb var(--cove-tooltip-animation);
     }
   }
 
@@ -94,61 +165,7 @@ $cove-tooltip-animation: 500ms cubic-bezier(0.16, 1, 0.3, 1) 50ms 1 forwards;
     }
 
     &.cove-tooltip__content--animated[class*='styles-module_show__'] {
-      animation: tooltip-rtl $cove-tooltip-animation;
+      animation: tooltip-rtl var(--cove-tooltip-animation);
     }
   }
 }
-
-.interactive {
-  a {
-    pointer-events: all;
-  }
-}
-
-@keyframes tooltip-ltr {
-  0% {
-    opacity: 0;
-    transform: translateX(-8px);
-  }
-
-  100% {
-    opacity: 1;
-    transform: translateX(0);
-  }
-}
-
-@keyframes tooltip-rtl {
-  0% {
-    opacity: 0;
-    transform: translateX(8px);
-  }
-
-  100% {
-    opacity: 1;
-    transform: translateX(0);
-  }
-}
-
-@keyframes tooltip-ttb {
-  0% {
-    opacity: 0;
-    transform: translateY(-8px);
-  }
-
-  100% {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}
-
-@keyframes tooltip-btt {
-  0% {
-    opacity: 0;
-    transform: translateY(8px);
-  }
-
-  100% {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}

package/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.