refactoring: ASCOR benchmark chart Y axis always starts at 0

Vizzuality · Dec 6, 2023 · c805bcf · c805bcf
1 parent 55cdf50
commit c805bcf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/app/javascript/components/tpi/AscorRecentEmissions.js b/app/javascript/components/tpi/AscorRecentEmissions.js
@@ -112,7 +112,7 @@ AscorRecentEmissions.propTypes = {
   default_trend_filter: PropTypes.string.isRequired,
   data: PropTypes.arrayOf(
     PropTypes.shape({
-      value: PropTypes.number,
+      value: PropTypes.string,
       source: PropTypes.string,
       year: PropTypes.number,
       unit: PropTypes.string.isRequired,

diff --git a/app/javascript/components/tpi/charts/ascor-benchmarks/Chart.js b/app/javascript/components/tpi/charts/ascor-benchmarks/Chart.js
@@ -54,6 +54,7 @@ const Chart = ({ data: { data, metadata } }) => {
           ...options,
           yAxis: {
             ...options.yAxis,
+            min: 0,
             title: { ...options.yAxis.title, text: metadata.unit }
           },
           series: chartData

diff --git a/app/services/api/ascor/benchmarks_chart.rb b/app/services/api/ascor/benchmarks_chart.rb
@@ -38,7 +38,7 @@ def pathway
       end
 
       def benchmarks
-        @benchmarks ||= ::ASCOR::Benchmark.where(country_id: country_id)
+        @benchmarks ||= ::ASCOR::Benchmark.where(country_id: country_id).sort_by(&:benchmark_type).reverse
       end
     end
   end
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,7 @@ def pathway @@
           end
           def benchmarks
-            @benchmarks ||= ::ASCOR::Benchmark.where(country_id: country_id)
+            @benchmarks ||= ::ASCOR::Benchmark.where(country_id: country_id).sort_by(&:benchmark_type).reverse
           end
         end
       end
@@ Expand Down @@