Merge pull request #623 from DFID/fix-404-related-routing

Fix 404 related routing

Author: aunindadf

Gemfile.lock

@@ -1,13 +1,13 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (6.1.7)
-      activesupport (= 6.1.7)
+    actionview (6.1.7.7)
+      activesupport (= 6.1.7.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.1.7)
+    activesupport (6.1.7.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -16,7 +16,7 @@ GEM
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     builder (3.2.4)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     cookiejar (0.3.3)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
@@ -43,21 +43,21 @@ GEM
       eventmachine (>= 1.0.0.beta.4)
     em-synchrony (1.0.6)
       eventmachine (>= 1.0.0.beta.1)
-    erubi (1.11.0)
+    erubi (1.12.0)
     eventmachine (1.2.7)
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     http_parser.rb (0.8.0)
-    i18n (1.12.0)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
     kgio (2.11.4)
     kramdown (2.4.0)
       rexml
-    loofah (2.19.1)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     mail (2.8.0)
       mini_mime (>= 0.1.1)
       net-imap
@@ -67,7 +67,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
-    minitest (5.18.0)
+    minitest (5.22.3)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
     multi_json (1.15.0)
@@ -89,16 +89,17 @@ GEM
     pony (1.13.1)
       mail (>= 2.0)
     public_suffix (5.0.1)
-    racc (1.6.1)
+    racc (1.7.3)
     rack (2.2.6.4)
     rack-protection (3.0.5)
       rack
     rack-test (2.0.2)
       rack (>= 1.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
+    rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
     raindrops (0.20.0)
     rake (13.0.6)
@@ -147,7 +148,7 @@ GEM
     unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   x86_64-linux
@@ -176,4 +177,4 @@ DEPENDENCIES
   rubygems-update
   sinatra
   sinatra-contrib
-  unicorn
+  unicorn

data/countries.json

@@ -2395,7 +2395,7 @@
   },
   {
     "code": "LY",
-    "name": "Libya",
+    "name": "State of Libya",
     "description": "The UK is working in partnership with Libya to achieve prosperity, security and human rights for all.  Areas of focus include:   \n\u2022 Promoting political processes, participation, and human rights   \n\u2022 Progress towards an inclusive political process, leading to a political settlement which reflects the rights and needs of all, including elections, a constitution, reconciliation and transitional justice.  Development of a strong, independent media. Human rights embedded throughout Libyan institutions.   \n\u2022 Strengthening security, justice and defence   \n\u2022 Improved security for Libyans, with access to justice, and border control. Development of capable Ministries of Interior, Justice and Defence. Development of a community-based policing service, a functional criminal justice system and professional armed forces under democratic control. Management of arms and ammunition, and disarmament of militias.  \n\u2022 Strengthening governance and strategic communications   \n\u2022 Progress towards the establishment of credible public sector institutions with effective leadership, capacity and capability to deliver public services, effective strategic communications and good governance. Effective public financial management.  \n\u2022 Diversifying the economy and promoting prosperity   \n\u2022 Progress towards an open economy, with increased employment opportunities and reduced reliance on the public sector. Increased incentives for outside investment.",
     "Region": "Middle East & North Africa",
     "iso3c": "LBY",
@@ -2737,7 +2737,7 @@
   },
   {
     "code": "FM",
-    "name": "Micronesia",
+    "name": "Federated States of Micronesia",
     "description": "",
     "Region": "East Asia & Pacific",
     "iso3c": "FSM",
@@ -4314,7 +4314,7 @@
   },
   {
     "code": "TN",
-    "name": "Tunisia",
+    "name": "Republic of Tunisia",
     "description": "",
     "Region": "Middle East & North Africa",
     "iso3c": "TUN",

devtracker.rb

@@ -404,8 +404,32 @@ def getCacheData(fileName)
 #  PROJECTS PAGES
 #####################################################################
 
+get '/projects/*' do
+	wildCardData = params['splat'][0]
+	if request.url.end_with? ('/summary')
+		getProgID = wildCardData.gsub('/summary', '')
+		redirect '/programme/'+getProgID+'/summary'
+	elsif request.url.end_with? ('/documents')
+		getProgID = wildCardData.gsub('/documents', '')
+		redirect '/programme/'+getProgID+'/documents'
+	elsif request.url.end_with? ('/transactions')
+		getProgID = wildCardData.gsub('/transactions', '')
+		redirect '/programme/'+getProgID+'/transactions'
+	elsif request.url.end_with? ('/components')
+		getProgID = wildCardData.gsub('/components', '')
+		redirect '/programme/'+getProgID+'/projects'
+	elsif request.url.end_with? ('/partners')
+		getProgID = wildCardData.gsub('/partners', '')
+		redirect '/programme/'+getProgID+'/partners'
+	else
+		getProgID = wildCardData.gsub('/components', '')
+		redirect '/programme/'+getProgID+'/summary'
+	end
+	#redirect '/search_p'
+end
+
 # Project summary page
-get '/projects/*/summary' do
+get '/programme/*/summary' do
 	n = ERB::Util.url_encode (params['splat'][0]).to_s
 	#n = sanitize_input(n,"p")
 	check_if_project_exists(n)
@@ -459,7 +483,7 @@ def getCacheData(fileName)
 end
 
 # Project documents page
-get '/projects/*/documents/?' do
+get '/programme/*/documents/?' do
 	n = ERB::Util.url_encode (params['splat'][0]).to_s
 	check_if_project_exists(n)
 	# get the project data from the API
@@ -476,7 +500,7 @@ def getCacheData(fileName)
 end
 
 #Project transactions page
-get '/projects/*/transactions/?' do
+get '/programme/*/transactions/?' do
 	n = ERB::Util.url_encode (params['splat'][0]).to_s
 	check_if_project_exists(n)
 	# get the project data from the API
@@ -492,7 +516,7 @@ def getCacheData(fileName)
 end
 
 #Project transactions page
-get '/projects/*/components/?' do
+get '/programme/*/projects/?' do
 	n = ERB::Util.url_encode (params['splat'][0]).to_s
 	check_if_project_exists(n)
 	# get the project data from the API
@@ -650,7 +674,7 @@ def getCacheData(fileName)
 ######################################################################
 ######################################################################
 #Project partners page
-get '/projects/*/partners/?' do
+get '/programme/*/partners/?' do
 	n = ERB::Util.url_encode (params['splat'][0]).to_s
 	check_if_project_exists(n)
 	# get the project data from the API

views/partials/_projects-header.html.erb

@@ -66,11 +66,11 @@
 
         <nav class="moj-sub-navigation" aria-label="Sub navigation">
             <ul class="moj-sub-navigation__list">
-                <li class="moj-sub-navigation__item"><a href="/projects/<%=ERB::Util.url_encode(project['iati_identifier']).to_s%>/summary" id='summary' class="moj-sub-navigation__link" <%= active=="summary" ? "aria-current='page'" : ""%>>Summary</a></li>
-                <li class="moj-sub-navigation__item"><a href="/projects/<%=ERB::Util.url_encode(project['iati_identifier']).to_s%>/documents" id='documents' class="moj-sub-navigation__link" <%= active=="documents" ? "aria-current='page'" : ""%>>Documents (<%= project.has_key?('document_link_url') ? project['document_link_url'].count : 0 %>)</a></li>
-                <li class="moj-sub-navigation__item"><a href="/projects/<%=ERB::Util.url_encode(project['iati_identifier']).to_s%>/components" id="components" class="moj-sub-navigation__link" <%= active=="components" ? "aria-current='page'" : ""%>>Projects</a></li>
-                <li style="display: none" class="moj-sub-navigation__item transactions-tab"><a href="/projects/<%=ERB::Util.url_encode(project['iati_identifier']).to_s%>/transactions" id="transactions" class="moj-sub-navigation__link" <%= active=="transactions" ? "aria-current='page'" : ""%>>Transactions</a></li>
-                <li style="display: none" class="moj-sub-navigation__item partner-tab"><a href="/projects/<%=ERB::Util.url_encode(project['iati_identifier']).to_s%>/partners" id="partners" class="moj-sub-navigation__link" <%= active=="partners" ? "aria-current='page'" : ""%>>Partners</a></li>
+                <li class="moj-sub-navigation__item"><a href="/programme/<%=ERB::Util.url_encode(project['iati_identifier']).to_s%>/summary" id='summary' class="moj-sub-navigation__link" <%= active=="summary" ? "aria-current='page'" : ""%>>Summary</a></li>
+                <li class="moj-sub-navigation__item"><a href="/programme/<%=ERB::Util.url_encode(project['iati_identifier']).to_s%>/documents" id='documents' class="moj-sub-navigation__link" <%= active=="documents" ? "aria-current='page'" : ""%>>Documents (<%= project.has_key?('document_link_url') ? project['document_link_url'].count : 0 %>)</a></li>
+                <li class="moj-sub-navigation__item"><a href="/programme/<%=ERB::Util.url_encode(project['iati_identifier']).to_s%>/projects" id="components" class="moj-sub-navigation__link" <%= active=="components" ? "aria-current='page'" : ""%>>Projects</a></li>
+                <li style="display: none" class="moj-sub-navigation__item transactions-tab"><a href="/programme/<%=ERB::Util.url_encode(project['iati_identifier']).to_s%>/transactions" id="transactions" class="moj-sub-navigation__link" <%= active=="transactions" ? "aria-current='page'" : ""%>>Transactions</a></li>
+                <li style="display: none" class="moj-sub-navigation__item partner-tab"><a href="/programme/<%=ERB::Util.url_encode(project['iati_identifier']).to_s%>/partners" id="partners" class="moj-sub-navigation__link" <%= active=="partners" ? "aria-current='page'" : ""%>>Partners</a></li>
             </ul>
         </nav>
     </div>