Merge pull request #474 from devinit/development

release/v3.4.3

Author: edwinmp

docs/assets/country-profile-overview-poorest-people.png

@@ -0,0 +1,33 @@
+# DDH Visualisations
+This file documents all DDH visualisations, explainining their purpose, where they get their data, and where you can find them in the code.
+
+## Global Picture
+|Option|Value|
+|------------|------------------------------------------------------------------------------------|
+|URL| http://data.devinit.org/[global-picture]|
+|Concept File| https://github.com/devinit/datahub-cms/blob/development/global-picture/concept.csv|
+
+## Ranking Tables
+
+![RankingTables](/docs/assets/global-picture-ranking-tables.png)
+
+|Option|Value|
+|------------|------------------------------------------------------------------------------------|
+|Code Path| src/components/molecules/Maps/Map/index.tsx|
+|GitHub Code Path|https://github.com/devinit/datahub/blob/master/src/components/molecules/Maps/Map/index.tsx#L158|
+
+## Country Profiles
+|Option|Value|
+|------------|------------------------------------------------------------------------------------|
+|URL template| http://data.devinit.org/country/[country-slug]|
+|Concept File| https://github.com/devinit/datahub-cms/blob/development/country-profile/concept.csv|
+
+### Overview Tab -> Poorest People
+
+![PoorestPeople](/docs/assets/country-profile-overview-poorest-people.png)
+
+|Option|Value|
+|------------------|----------------------------------------------------------------------------------|
+|DDW table/Concept ID|data_series.poorest_20_percent|
+|SQL query|https://github.com/devinit/datahub-api/blob/master/src/modules/dw/CountryProfile/sql.ts#L15|
+|Code Path|https://github.com/devinit/datahub/tree/development/src/components/molecules/CountryProfileTabs/Overview|

docs/assets/global-picture-ranking-tables.png

@@ -1,8 +1,8 @@
 {
   "name": "@devinit/dh-app",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "config": {
-    "API": "http://212.111.41.68:3000/graphql",
+    "API": "http://212.111.41.68:9090/graphql",
     "API_DEV": "http://212.111.41.68:9090/graphql",
     "PUPPETEER_SKIP_CHROMIUM_DOWNLOAD": true,
     "OLD_DATAHUB_URL": "http://212.111.41.68:8888"

docs/visualisations.md

@@ -67,7 +67,7 @@ export default {
     {
       name: 'Depth of extreme poverty (poverty gap)',
       description:
-        'Depth of extreme poverty (also known as the poverty gap) tells us how far people are from the extreme poverty line, on average per country. Data is for 2013',
+        'Depth of extreme poverty (also known as the poverty gap) tells us how far people are from the extreme poverty line, on average per country. Data is for 2015',
       methodology: '',
       uom: 'percent',
       csv:

package-lock.json

@@ -39,7 +39,11 @@ export interface State {
   profileLoading: boolean; // think loading new country on map click
   shouldForceRedraw: boolean;
 }
-export const indicatorsWith2dp = [ 'fact.oda_to_ldcs_percent_gni', 'fact.oda_percent_gni' ];
+export const indicatorsWith2dp = [
+  'fact.oda_to_ldcs_percent_gni',
+  'fact.oda_percent_gni',
+  'data_series.climate_vulnerability'
+];
 
 export const indicatorsWith0dp = [
   'spotlightonuganda.ugandaurbanpop',

package.json

@@ -155,10 +155,7 @@ class Map extends React.Component<Props, State> {
               </Intro>
             </Grid.Column>
           </Grid.Row>
-          {
-            !this.noRankTableList.includes(this.meta.id)
-              ? <RankingsTable { ...this.setCountryRankData() } router={ this.props.router } /> : ''
-          }
+          { this.renderRankingsTable() }
         </Grid>
       </Container>
     );
@@ -182,6 +179,14 @@ class Map extends React.Component<Props, State> {
     }
   }
 
+  renderRankingsTable() {
+    if (!this.noRankTableList.includes(this.meta.id)) {
+      return <RankingsTable { ...this.setCountryRankData() } router={ this.props.router } />;
+    }
+
+    return null;
+  }
+
   init(props: Props) {
     this.initYearSetup(props);
     this.initMetaSetup(props);
@@ -268,7 +273,7 @@ class Map extends React.Component<Props, State> {
 
         return { name, value, flagUrl, uid: obj.uid || '', position: (index + 1), route, uom };
       });
-    const top = sortedData.slice(0, 10).map(obj => {
+    const largest = sortedData.slice(0, 10).map(obj => {
       if (Number(obj.value) > 10000) {
         return { ...obj, value: Number(obj.value).toFixed(0) };
       }
@@ -278,11 +283,11 @@ class Map extends React.Component<Props, State> {
 
       return obj;
     });
-    const bottom = sortedData.slice(-10);
+    const smallest = sortedData.slice(-10);
 
     return {
       hasflags: this.country === 'global',
-      data: { top, bottom }
+      data: { largest, smallest }
     };
   }
 

src/components/MethodologyData/country-profile.ts

@@ -25,8 +25,8 @@ export interface Props {
   hasflags: boolean;
   router?: SingletonRouter;
   data: {
-    top: Data[];
-    bottom: Data[];
+    largest: Data[];
+    smallest: Data[];
   };
 }
 

src/components/atoms/BaseMap/index.tsx

@@ -320,14 +320,14 @@ export default {
       { id: 'multilateral', name: 'Multilateral' },
       { id: 'private-sector-institution', name: 'Private Sector Institution' },
       { id: 'ngo-unknown', name: 'NGO (unknown)' },
-      {
-        id: 'university-research-institute-etc',
-        name: 'University, research institute or think-tank, etc'
-      },
       {
         id: 'public-sector-recipient',
         name: 'Public sector (recipient government)'
       },
+      {
+        id: 'university-research-institute-etc',
+        name: 'University, research institute or think-tank, etc'
+      },
       { id: 'unspecified', name: 'Unspecified' },
       {
         id: 'ppps-and-networks',
@@ -336,26 +336,26 @@ export default {
       { id: 'other', name: 'Other' }
     ],
     sectors: [
+      { id: 'humanitarian', name: 'Humanitarian' },
       {
         id: 'agriculture-and-food-security',
         name: 'Agriculture and food security'
       },
-      { id: 'humanitarian', name: 'Humanitarian' },
       { id: 'water-and-sanitation', name: 'Water and sanitation' },
       { id: 'general-budget-support', name: 'General budget support' },
       { id: 'education', name: 'Education' },
       { id: 'health', name: 'Health' },
+      { id: 'other-social-services', name: 'Other social services' },
       {
         id: 'governance-security-and-civil-society',
         name: 'Governance, security and civil society'
       },
-      { id: 'other-social-services', name: 'Other social services' },
       { id: 'debt-relief', name: 'Debt relief' },
       { id: 'infrastructure', name: 'Infrastructure' },
       { id: 'environment', name: 'Environment' },
       { id: 'banking-and-business', name: 'Banking and business' },
-      { id: 'industry-and-trade', name: 'Industry and trade' },
-      { id: 'other', name: 'Other' }
+      { id: 'other', name: 'Other' },
+      { id: 'industry-and-trade', name: 'Industry and trade' }
     ],
     bundles: [
       { id: 'mixed-project-aid', name: 'Mixed project aid' },