Merge pull request #4531 from ONRR/dev

Dev-->Master

.gitignore

@@ -13,3 +13,4 @@ _site
 /.vscode
 launch.json
 .vscode
+downloads/disbursements/~$disbursements.xlsx

gatsby-config.js

@@ -11,7 +11,7 @@ let config = {
   siteMetadata: {
     title: 'Natural Resources Revenue Data',
     description: 'This site provides open data about natural resource management on federal lands and waters in the United States, including oil, gas, coal, and other extractive industries.',
-    version: 'v5.4.0',
+    version: 'v5.4.1',
     googleAnalyticsId: GOOGLE_ANALYTICS_ID,
   },
   plugins: [

humans.txt

@@ -1,7 +1,9 @@
 # humanstxt.org/
 # The humans responsible & technology colophon
 
-# TEAM
+# CURRENT TEAM
+
+## TEAM MEMBERS
 
     Nathan Brannberg -- Data Wrangler -- Department of the Interior, Office of Natural Resources Revenue
     Maroya Faied -- Data Wrangler -- Department of the Interior, Office of Natural Resources Revenue
@@ -12,8 +14,16 @@
     Shannon McHarg -- UX Designer -- Department of the Interior, Office of Natural Resources Revenue
     Chris Mentasti -- Data Wrangler -- Department of the Interior, Office of Natural Resources Revenue
     Judy Wilson -- Product Owner -- Department of the Interior, Office of Natural Resources Revenue
+
+## CONTRIBUTORS
+    Christine Brydges -- UX Intern -- Virtual Student Federal Service
+    Alena Huang -- UX Intern -- Virtual Student Federal Service
+    Mojo Nichols -- Contract Developer
+    Annie Persson -- UX Intern -- Virtual Student Federal Service
+
+# PAST TEAM
 
-# PAST TEAM MEMBERS
+## TEAM MEMBERS
 
     Jamie Albrecht -- Content Designer --18F
     Shawn Allen -- Designer Developer -- 18F
@@ -31,10 +41,12 @@
     Nick Bristow -- Developer -- 18F
     Chris Cairns -- Product Manager -- 18F
 
-# CONTRIBUTORS
+## CONTRIBUTORS
 
     Qituwra Anderson -- UX Researcher -- 18F
     Adam Biagianti -- Developer -- 18F
+    Aaron Borden -- Developer -- 18F
+    Edward Chang -- Development Intern -- Department of the Interior, Office of Natural Resources Revenue
     Jeremiah Kimelman -- Developer -- 18F
     Shawnique Muller -- 18F
     Ben Peterson -- UX Researcher -- 18F

package.json

@@ -8,35 +8,46 @@
     "@devexpress/dx-react-grid": "^1.10.5",
     "@devexpress/dx-react-grid-material-ui": "^1.10.5",
     "@gatsby-contrib/gatsby-plugin-elasticlunr-search": "^2.3.0",
-    "@material-ui/core": "^3.9.3",
+    "@material-ui/core": "^4.3.1",
     "@material-ui/icons": "^3.0.2",
+    "@material-ui/lab": "^4.0.0-alpha.22",
+    "@typescript-eslint/eslint-plugin": "^1.11.0",
+    "@typescript-eslint/parser": "^1.11.0",
+    "acorn": "^6.1.1",
+    "ajv": "^6.10.0",
     "copy-dir": "^0.4.0",
     "currency-formatter": "^1.5.3",
     "d3": "^5.5.0",
-    "gatsby": "^2.13.25",
-    "gatsby-plugin-manifest": "^2.0.5",
+    "elasticlunr": "^0.9.5",
+    "eslint-config-react-app": "^4.0.1",
+    "eslint-plugin-react-hooks": "^1.6.1",
+    "gatsby": "^2.13.42",
+    "gatsby-plugin-manifest": "^2.2.4",
     "gatsby-plugin-meta-redirect": "^1.1.1",
-    "gatsby-plugin-offline": "^2.0.5",
-    "gatsby-plugin-react-helmet": "^3.0.0",
-    "gatsby-plugin-sass": "^2.0.11",
-    "gatsby-source-filesystem": "^2.0.27",
+    "gatsby-plugin-offline": "^2.2.4",
+    "gatsby-plugin-react-helmet": "^3.1.2",
+    "gatsby-plugin-sass": "^2.1.3",
+    "gatsby-source-filesystem": "^2.1.6",
     "gatsby-transformer-excel": "^2.2.2",
-    "gatsby-transformer-remark": "^2.3.7",
-    "gatsby-transformer-yaml": "^2.1.12",
+    "gatsby-transformer-remark": "^2.6.10",
+    "gatsby-transformer-yaml": "^2.2.4",
     "lazy.js": "^0.5.1",
     "node-sass": "^4.12.0",
-    "react": "^16.8.4",
-    "react-device-detect": "^1.6.2",
-    "react-dom": "^16.8.4",
+    "react": "^16.8.6",
+    "react-device-detect": "^1.7.5",
+    "react-dom": "^16.8.6",
     "react-helmet": "^5.2.0",
     "react-html-parser": "^2.0.2",
     "react-redux": "^7.1.0",
     "react-responsive": "^6.1.1",
     "react-stickynode": "^2.1.1",
     "react-virtualized": "^9.21.0",
     "redux": "^4.0.1",
+    "redux-mock-store": "^1.5.3",
     "rehype-react": "^3.1.0",
     "slugify": "^1.3.4",
+    "topojson-client": "^3.0.0",
+    "typescript": "^3.5.2",
     "url-search-params-polyfill": "^7.0.0"
   },
   "keywords": [
@@ -61,22 +72,24 @@
     "federalist": "npm run release-blog && npm run release-gatsby"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-export-default-from": "^7.2.0",
-    "@babel/plugin-proposal-object-rest-spread": "^7.3.4",
+    "@babel/plugin-proposal-export-default-from": "^7.5.2",
+    "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
     "babel-eslint": "^10.0.1",
     "babel-jest": "^24.5.0",
     "babel-preset-gatsby": "^0.1.9",
+    "enzyme": "^3.10.0",
+    "enzyme-adapter-react-15": "^1.4.0",
     "eslint": "^5.15.3",
     "eslint-config-standard": "^12.0.0",
-    "eslint-loader": "^2.1.2",
+    "eslint-loader": "^2.2.1",
     "eslint-plugin-css-modules": "^2.11.0",
-    "eslint-plugin-import": "^2.16.0",
+    "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-node": "^8.0.1",
     "eslint-plugin-promise": "^4.0.1",
-    "eslint-plugin-react": "^7.12.4",
+    "eslint-plugin-react": "^7.14.3",
     "eslint-plugin-standard": "^4.0.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^24.5.0",
+    "jest": "^24.8.0",
     "react-test-renderer": "^16.8.4",
     "svg-react-loader": "^0.4.6"
   },

plugins/custom-excel-transformer/data-transformers/federal-disbursements-transformer.js

@@ -42,12 +42,24 @@ module.exports = (node, type) => {
   return createDisbursementsNode(node, type)
 }
 const createDisbursementsNode = (disbursementsData, type) => {
+  let fund = disbursementsData[SOURCE_COLUMNS.Fund]
+  let source = disbursementsData[SOURCE_COLUMNS.OnshoreOffshore]
+  if (fund.toLowerCase().includes('gomesa')) {
+    let result = fund.split(/([^-]+)/)
+    fund = result[1].trim()
+    source = 'GOMESA'
+  }
+  else if (fund.includes('8(g)')) {
+    fund = 'State'
+    source = '8(g)'
+  }
+
   let disbursementNode = {
 	  Year: disbursementsData[SOURCE_COLUMNS.Year],
     DisplayYear: (disbursementsData[SOURCE_COLUMNS.Year])
       ? "'" + disbursementsData[SOURCE_COLUMNS.Year].toString().substr(2) : "'" + disbursementsData[SOURCE_COLUMNS.CalendarYear].toString().substr(2),
-	  Fund: disbursementsData[SOURCE_COLUMNS.Fund],
-	  Source: disbursementsData[SOURCE_COLUMNS.OnshoreOffshore],
+	  Fund: fund,
+	  Source: source,
 	  Disbursement: disbursementsData[SOURCE_COLUMNS.Total] || disbursementsData[SOURCE_COLUMNS.Disbursement],
 	  USState: disbursementsData[SOURCE_COLUMNS.USState],
 	  County: disbursementsData[SOURCE_COLUMNS.County],

plugins/custom-excel-transformer/data-transformers/revenues-transformer.js

@@ -165,5 +165,7 @@ function getFipsCode (offshorePlanningArea) {
     return 'CHU'
   }
 
+
   return undefined
 }
+