Renable new features

src/components/LocationSelect.js

@@ -98,6 +98,10 @@ class LocationSelect extends React.Component {
               States
             </option>
             {stateOpts}
+            <option value="" disabled>
+              Regions
+            </option>
+            {regionOpts}
             </select>
         </div>
       )

src/components/nibrs/NibrsIntro.js

@@ -14,20 +14,19 @@ const highlight = txt =>
 const NibrsIntro = ({
   crime,
   isAgency,
-  nibrsFirstYear,
+  selectedYear,
   participation,
   placeDisplay,
   totalCount,
-  until,
 }) => {
   const noun = 'incident'
+
   if (isAgency) {
     return (
       <div className="m0 sm-col-10">
         <p>
-          This agency reported {highlight(formatNum(totalCount))} individual{' '}
-          {crime} {pluralize(noun, totalCount)} to the FBI between{' '}
-          {highlight(nibrsFirstYear)} and {highlight(until)}.
+          In {highlight((selectedYear))}, this agency reported {highlight(formatNum(totalCount))} individual{' '}
+          {crime} {pluralize(noun, totalCount)} to the FBI.
         </p>
       </div>
     )
@@ -38,9 +37,8 @@ const NibrsIntro = ({
   return (
     <div className="m0 sm-col-10">
       <p>
-        There were {highlight(formatNum(totalCount))} individual {crime}{' '}
-        {pluralize(noun, totalCount)} reported to the FBI in {placeDisplay}{' '}
-        between {highlight(nibrsFirstYear)} and {highlight(until)} by{' '}
+        In {highlight((selectedYear))}, there were {highlight(formatNum(totalCount))} individual {crime}{' '}
+        {pluralize(noun, totalCount)} reported to the FBI in {placeDisplay}{' '} by{' '}
         {highlight(agencyCt)} law enforcement {pluralize('agency', agencyCt)}{' '}
         reporting {nibrsTerm} data.
       </p>
@@ -51,11 +49,10 @@ const NibrsIntro = ({
 NibrsIntro.propTypes = {
   crime: PropTypes.string.isRequired,
   isAgency: PropTypes.bool.isRequired,
-  nibrsFirstYear: PropTypes.number.isRequired,
+  selectedYear: PropTypes.number.isRequired,
   placeDisplay: PropTypes.string.isRequired,
   totalCount: PropTypes.number.isRequired,
   participation: PropTypes.array.isRequired,
-  until: PropTypes.number.isRequired,
 }
 
 export default NibrsIntro

src/containers/AgencyChartContainer.js

@@ -31,6 +31,25 @@ class AgencyChartContainer extends React.Component {
 
     const summaryData = summary.data.data
 
+
+    let nibrsData
+    let nibrsDataClean
+    let hasNoNibrsValues
+    let noNibrsDataText
+    if (submitsNibrs) {
+      nibrsData = nibrsCounts.data.offenseCount.data
+      nibrsDataClean = nibrsData
+         .filter(d => d.key === 'Incident Count' && d.data_year >= since && d.data_year <= until)
+         .sort((a, b) => a.data_year - b.data_year)
+
+      hasNoNibrsValues =
+         nibrsDataClean.length ===
+         nibrsDataClean.filter(d => d.actual === 0 && d.cleared === 0).length
+
+      noNibrsDataText = `There were no ${lowerCase(
+         pageType,
+       )} incidents reported during this time period.`
+    }
     // if (!data || data.length === 0) return <NoData />
 
     const fname = `${place}-${pageType}-${since}-${until}`
@@ -67,7 +86,27 @@ class AgencyChartContainer extends React.Component {
              </div>}
        </div>
      )
-   }
+   } else if (!isSummary && submitsNibrs) {
+     return (
+       <div>
+         {hasNoSummaryValues
+           ? <NoData text={noNibrsDataText} />
+           : <div>
+               <AgencyNibrsChart
+                 crime={pageType}
+                 data={nibrsDataClean}
+                 since={since}
+                 submitsNibrs
+                 until={until}
+               />
+               <DownloadDataBtn
+                 data={[{ data: nibrsDataClean, filename: `${fname}.csv` }]}
+                 filename={fname}
+               />
+             </div>}
+       </div>
+     )
+    }
     return <div />
   }
 
@@ -84,6 +123,19 @@ class AgencyChartContainer extends React.Component {
           <h2 className="mt0 mb2 fs-24 sm-fs-28 sans-serif">
             {startCase(pageType)} reported by {agency.display}, {since}–{until}
           </h2>
+          <div className="center">
+            {submitsNibrs &&
+              <AgencyChartToggle
+              isSummary={this.state.isSummary}
+              showSummary={() => {
+                this.setState({ isSummary: true })
+              }}
+              showNibrs={() => {
+                this.setState({ isSummary: false })
+              }}
+              />
+            }
+          </div>
           {this.generateTable(pageType, place, since, nibrsCounts, summary, until, submitsNibrs, this.state.isSummary)}
         </div>
         {!summary.loading &&