Merge pull request #3474 from Vizzuality/fix/redirect-for-non-valid-isos

Fix/redirect for non valid iso's

Author: edbrett

app/controllers/dashboards_controller.rb

@@ -25,5 +25,8 @@ def embed
 
   def set_title
     @location = params[:iso] ? Dashboards.find_country_by_iso(params[:iso]) : "#{params[:type] && params[:type].capitalize || 'Global'} Dashboard"
+    if !@location
+      redirect_to action: "index", type: 'global'
+    end
   end
 end

app/javascript/pages/dashboards/router.js

@@ -1,4 +1,4 @@
-import { connectRoutes } from 'redux-first-router';
+import { connectRoutes, NOT_FOUND, redirect } from 'redux-first-router';
 import createHistory from 'history/createBrowserHistory';
 import queryString from 'query-string';
 import { setWidgetSettingsStore } from 'components/widgets/actions';
@@ -26,6 +26,11 @@ export const routes = {
   },
   [EMBED]: {
     path: '/embed/dashboards/:type/:country?/:region?/:subRegion?'
+  },
+  [NOT_FOUND]: {
+    path: '/404',
+    thunk: dispatch =>
+      dispatch(redirect({ type: COUNTRY, location: { type: 'global' } }))
   }
 };
 

app/javascript/providers/country-data-provider/country-data-provider-actions.js

@@ -37,17 +37,9 @@ export const getCountries = createThunkAction(
       .all([getCountriesProvider(), getFAOCountriesProvider()])
       .then(
         axios.spread((gadm28Countries, faoCountries) => {
-          const allCountries = uniqBy(
-            [...gadm28Countries.data.rows, ...faoCountries.data.rows],
-            'iso'
-          );
-          const countries = uniqBy(
-            allCountries.filter(c => c.iso !== 'XCA'),
-            'iso'
-          );
           dispatch(setGadmCountries(gadm28Countries.data.rows));
           dispatch(setFAOCountries(faoCountries.data.rows));
-          dispatch(setCountries(countries));
+          dispatch(setCountries(gadm28Countries.data.rows));
           dispatch(setCountriesLoading(false));
         })
       )

app/javascript/services/country.js

@@ -4,7 +4,7 @@ const REQUEST_URL = `${process.env.CARTO_API_URL}/sql?q=`;
 
 const SQL_QUERIES = {
   getCountries:
-    'SELECT iso, country as name FROM umd_nat_staging GROUP BY iso, name ORDER BY name',
+    "SELECT iso, country as name FROM umd_nat_staging WHERE iso != 'TWN' AND iso != 'XCA' GROUP BY iso, name ORDER BY name",
   getFAOCountries:
     'SELECT DISTINCT country AS iso, name FROM table_1_forest_area_and_characteristics',
   getRegions:

app/models/dashboards.rb

@@ -1,7 +1,7 @@
 class Dashboards
   class << self
     def find_all_countries
-      url = "#{ENV['CARTO_API_URL']}/sql?q=SELECT%20DISTINCT%20iso,%20name_0%20as%20name%20FROM%20gadm28_adm2"
+      url = "#{ENV['CARTO_API_URL']}/sql?q=SELECT%20DISTINCT%20iso,%20name_engli%20as%20name%20FROM%20gadm28_countries%20WHERE%20iso%20!=%20'XCA'%20AND%20iso%20!=%20'TWN'"
       # CACHE: &bust=true if you want to flush the cache
       response = Typhoeus.get(url, headers: {"Accept" => "application/json"})
       if response.success? and (response.body.length > 0)
@@ -13,7 +13,7 @@ def find_all_countries
 
     def find_country_by_iso(iso)
       return nil unless iso
-      url = "#{ENV['CARTO_API_URL']}/sql?q=SELECT%20iso,%20name_0%20as%20name%20FROM%20gadm28_adm2%20WHERE%20iso%20=%20'#{iso}'%20LIMIT%201"
+      url = "#{ENV['CARTO_API_URL']}/sql?q=SELECT%20iso,%20name_engli%20as%20name%20FROM%20gadm28_countries%20WHERE%20iso%20=%20'#{iso}'%20AND%20iso%20!=%20'XCA'%20AND%20iso%20!=%20'TWN'%20LIMIT%201"
       # CACHE: &bust=true if you want to flush the cache
       response = Typhoeus.get(url, headers: {"Accept" => "application/json"})
       if response.success? and (response.body.length > 0)