Merge pull request #482 from Vizzuality/develop

Prod release - minor ASCOR fixes
Vizzuality · Dec 7, 2023 · a7e49f2 · a7e49f2
2 parents 88dbbbd + 25b6e6c
commit a7e49f2
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/app/controllers/tpi/ascor_controller.rb b/app/controllers/tpi/ascor_controller.rb
@@ -8,7 +8,10 @@ class ASCORController < TPIController
 
     def index
       @assessment_dates = ASCOR::Assessment.pluck(:assessment_date).uniq
-      @publications_and_articles = TPISector.find_by(slug: 'ascor')&.publications_and_articles || []
+      @publications_and_articles = (
+        Publication.joins(:tags).includes(:tpi_sectors).where(tags: {name: 'ASCOR'}) +
+        NewsArticle.joins(:tags).where(tags: {name: 'ASCOR'})
+      ).uniq.sort_by(&:publication_date).reverse!.take(3)
       ascor_page = TPIPage.find_by(slug: 'ascor')
       @methodology_description = Content.find_by(page: ascor_page, code: 'methodology_description')
       @methodology_id = Content.find_by(page: ascor_page, code: 'methodology_publication_id')

diff --git a/app/javascript/components/tpi/charts/ascor-bubble/Chart.js b/app/javascript/components/tpi/charts/ascor-bubble/Chart.js
@@ -148,7 +148,6 @@ const getTooltipText = ({ tooltipContent }) => {
     return `
      <div>
         <p class="bubble-tip-header">${tooltipContent.header}</p>
-        <p class="bubble-tip-text">${tooltipContent.emission_size}</p>
      </div>
     `;
   }
@@ -241,7 +240,7 @@ BubbleChart.propTypes = {
   results: PropTypes.arrayOf(
     PropTypes.shape({
       area: PropTypes.string.isRequired,
-      market_cap_group: PropTypes.string.isRequired,
+      market_cap_group: PropTypes.number.isRequired,
       country_id: PropTypes.number.isRequired,
       country_path: PropTypes.string.isRequired,
       country_name: PropTypes.string.isRequired,

diff --git a/db/migrate/20231207082211_remove_ascor_sector.rb b/db/migrate/20231207082211_remove_ascor_sector.rb
@@ -0,0 +1,5 @@
+class RemoveASCORSector < ActiveRecord::Migration[6.1]
+  def change
+    TPISector.find_by(slug: 'ascor')&.destroy
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
@@ -4163,6 +4163,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20230927112905'),
 ('20231023101859'),
 ('20231023120255'),
-('20231108125346');
+('20231108125346'),
+('20231207082211');
 
 
diff --git a/db/test-dump.psql b/db/test-dump.psql
diff --git a/spec/system/public/tpi/ascor_spec.rb b/spec/system/public/tpi/ascor_spec.rb
@@ -2,6 +2,8 @@
 
 describe 'ASCOR', type: 'system', site: 'tpi' do
   describe 'all countries page' do
+    let!(:publication) { create(:publication, tpi_sectors: [], tags: [create(:keyword, name: 'ASCOR')]) }
+
     before do
       visit '/ascor'
     end
@@ -31,6 +33,10 @@
         expect(page).to have_text('CF 1. International Climate Finance')
       end
     end
+
+    it 'shows the publication' do
+      expect(page).to have_text(publication.title)
+    end
   end
 
   describe 'single country page' do