Merge pull request #466 from devinit/development

release/v3.4.2

Author: edwinmp

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@devinit/dh-app",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "config": {
     "API": "http://212.111.41.68:3000/graphql",
     "API_DEV": "http://212.111.41.68:9090/graphql",
@@ -52,27 +52,27 @@
     "apollo-client-preset": "1.0.8",
     "apollo-fetch": "0.7.0",
     "compression": "^1.7.3",
-    "express": "4.16.3",
+    "express": "^4.16.4",
     "glamor": "2.20.40",
     "glamorous": "^4.13.1",
     "graphql": "0.13.2",
-    "graphql-tag": "^2.9.2",
+    "graphql-tag": "^2.10.0",
     "intersection-observer": "0.5.0",
     "intro.js": "^2.9.3",
     "isomorphic-fetch": "2.2.1",
-    "localforage": "1.5.7",
+    "localforage": "^1.7.3",
     "lru-cache": "^4.1.3",
     "mapbox-gl": "0.44.1",
     "next": "^5.1.0",
-    "ramda": "0.25.0",
-    "react": "^16.4.2",
+    "ramda": "^0.26.1",
+    "react": "^16.6.3",
     "react-apollo": "2.0.4",
     "react-beautiful-dnd": "6.0.2",
-    "react-dom": "^16.4.2",
+    "react-dom": "^16.6.3",
     "react-intersection-observer": "3.0.3",
     "react-redux": "5.0.7",
     "redux": "3.7.2",
-    "semantic-ui-react": "^0.82.0"
+    "semantic-ui-react": "^0.84.0"
   },
   "devDependencies": {
     "@storybook/addon-actions": "3.3.15",
@@ -84,32 +84,32 @@
     "@types/jest": "22.2.3",
     "@types/next": "2.4.9",
     "@types/node": "9.6.6",
-    "@types/ramda": "0.25.24",
+    "@types/ramda": "^0.25.42",
     "@types/react": "^16.4.11",
     "@types/react-beautiful-dnd": "6.0.1",
-    "@types/react-redux": "^6.0.6",
+    "@types/react-redux": "^6.0.11",
     "@types/storybook__react": "^3.0.9",
     "@zeit/next-typescript": "0.1.1",
-    "apollo-codegen": "0.19.0",
+    "apollo-codegen": "^0.20.2",
     "concurrently": "^3.6.1",
     "csso": "^3.5.1",
     "cypress": "2.1.0",
     "cypress-eslint": "1.1.0",
-    "enzyme": "3.3.0",
-    "enzyme-adapter-react-16": "1.1.1",
+    "enzyme": "^3.7.0",
+    "enzyme-adapter-react-16": "^1.7.0",
     "eslint": "4.19.1",
     "eslint-config-airbnb-base": "12.1.0",
     "eslint-plugin-chai-friendly": "0.4.1",
-    "eslint-plugin-cypress": "2.0.1",
-    "eslint-plugin-import": "^2.13.0",
-    "fork-ts-checker-webpack-plugin": "0.4.1",
+    "eslint-plugin-cypress": "^2.1.2",
+    "eslint-plugin-import": "^2.14.0",
+    "fork-ts-checker-webpack-plugin": "^0.5.0",
     "fs-extra": "5.0.0",
     "git-pre-hooks": "1.2.0",
     "happypack": "4.0.1",
     "jest": "22.4.3",
     "jest-cli": "22.4.3",
     "jsdom": "11.6.2",
-    "nodemon": "^1.18.3",
+    "nodemon": "^1.18.7",
     "pre-commit": "^1.2.2",
     "pretty-format": "22.4.3",
     "progress-bar-webpack-plugin": "1.11.0",
@@ -119,7 +119,7 @@
     "ts-loader": "3.5.0",
     "ts-node": "5.0.1",
     "tslint": "^5.11.0",
-    "tslint-eslint-rules": "^5.3.1",
+    "tslint-eslint-rules": "^5.4.0",
     "tslint-microsoft-contrib": "^5.1.0",
     "tslint-react": "^3.6.0",
     "typescript": "2.8.3",

package.json

@@ -4,7 +4,7 @@ import withData from '../src/components/WithData';
 import { StateToShare } from '../src/components/molecules/ChartShare';
 import App from '../src/components/templates/RegionalProfile';
 
-interface Props  {
+interface Props {
   url: {
     pathname: string;
     query: { id: string, state: StateToShare};
@@ -18,11 +18,12 @@ if (typeof window !== 'undefined') {
 }
 
 export default withData((props: Props) =>
-  (<App
+  <App
     id={ props.url.query.id }
     state={ props.url.query.state }
     currencyCode="KES"
     currencyUSD="constant 2015 USD"
     country="kenya"
     supportLocalCurrencyOnly={ false }
-  />));
+  />
+);

pages/kenya.tsx

@@ -27,7 +27,7 @@ const cache = () => new InMemoryCache({
 const persist = async () => {
   const persistor = new CachePersistor({
     cache: cache(),
-    storage: localforage
+    storage: localforage as any
   });
   // Read the current schema version from AsyncStorage.
   const currentVersion = await localforage.getItem(SCHEMA_VERSION_KEY);

src/apollo/index.tsx

@@ -6,7 +6,7 @@ export default {
     {
       name: '% of people in the P20',
       description:
-        'The percentage of population of each country who are in the global poorest 20%. 2013 represents the most recent year data is available',
+        'The percentage of population of each country who are in the global poorest 20%. 2015 represents the most recent year data is available. Data only available for years where P20 is currently defined.',
       methodology: '',
       uom: 'percent',
       csv:
@@ -22,7 +22,7 @@ export default {
     {
       name: '% of population living in extreme poverty',
       description:
-        "Extreme poverty is defined as living on less than $1.90 a day. It is calculated using the national poverty lines of some of the world's poorest countries at 2011 PPP$. 2013 represents the most recent year data is available.",
+        "Extreme poverty is defined as living on less than $1.90 a day. It is calculated using the national poverty lines of some of the world's poorest countries at 2011 PPP$. Interpolations are used to estimate poverty values for years which do not have data available. 2015 represents the most recent year data is available.",
       methodology: '',
       uom: 'percent',
       csv:
@@ -37,7 +37,7 @@ export default {
     {
       name: '% of population living on less than $3.10 a day',
       description:
-        'Data for those living under $3.10 a day illustrates that while many people are not in extreme poverty (less than $1.90 a day) they are still very poor. 2013 represents the most recent year data is available.',
+        'Data for those living under $3.10 a day illustrates that while many people are not in extreme poverty (less than $1.90 a day) they are still very poor. Interpolations are used to estimate poverty values for years which do not have data available. 2015 represents the most recent year data is available.',
       methodology: '',
       uom: 'percent',
       csv:
@@ -136,7 +136,7 @@ export default {
       source: {
         name:
           'Notre Dame Global Adaptation Index (ND-GAIN) vulnerability score.',
-        link: 'http://index.gain.org/'
+        link: 'https://gain.nd.edu/our-work/country-index/'
       }
     },
     {
@@ -757,7 +757,7 @@ export default {
     {
       name: 'Funding proceeds to Gavi, the  Vaccine Alliance, US$',
       description:
-        'The vast majority of official development assistance (ODA) to pneumonia disbursed over the last decade is reported to be from Gavi, the Vaccines Alliance. This data shows donor proceeds to Gavi and includes funding in the form of direct contributions, long-term pledges to the International Finance Facility for Immunisation, Advance Market Commitment and Gavi Matching Fund. A proportion of this funding received by Gavi will, in turn, be spent on pneumonia-relevant vaccines.',
+        'The vast majority of official development assistance (ODA) to pneumonia disbursed over the last decade is reported to be from Gavi, the Vaccines Alliance. This data shows donor proceeds to Gavi and includes funding in the form of direct contributions, long-term pledges to the International Finance Facility for Immunisation, Advance Market Commitment and Gavi Matching Fund. A proportion of this funding received by Gavi will, in turn, be directed towards pneumonia-relevant vaccines.',
       methodology: '',
       uom: 'constant 2015 US$',
       csv: