Merge pull request #437 from Vizzuality/develop

Prod deploy - rest of Bank CP assessments and MQ BETA scores
Vizzuality · Sep 4, 2023 · 6a1a42b · 6a1a42b
2 parents 17172f5 + 9bcadef
commit 6a1a42b
Show file tree

Hide file tree

Showing 79 changed files with 1,862 additions and 268 deletions.
diff --git a/.env.sample b/.env.sample
@@ -1,2 +1,3 @@
 GCS_CREDENTIALS_FILE=
 GCS_BUCKET=
+MQ_BETA_ENABLED=true
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,6 +1,7 @@
 env:
   POSTGRES_USER: postgres
   POSTGRES_PASSWORD: postgres
+  MQ_BETA_ENABLED: 'true'
 
 name: Tests
 on: push
@@ -58,6 +59,7 @@ jobs:
           PGHOST: localhost
           PGUSER: ${{ env.POSTGRES_USER }}
           PGPASSWORD: ${{ env.POSTGRES_PASSWORD }}
+          MQ_BETA_ENABLED: ${{ env.MQ_BETA_ENABLED }}
         run: yarn test:rails
       - name: Upload Code Coverage
         uses: actions/upload-artifact@v2

diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,7 @@ ruby '3.0.0'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 6.1.1'
 gem 'pg', '>= 0.18', '< 2.0'
-gem 'puma', '~> 4.3'
+gem 'puma', '~> 5.0'
 gem 'sass-rails', '>= 6'
 gem 'uglifier', '>= 1.3.0'
 gem 'webpacker'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,40 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actioncable (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activestorage (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actionmailbox (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activestorage (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      actionview (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actionmailer (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      actionview (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.4)
-      actionview (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actionpack (6.1.7.6)
+      actionview (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activestorage (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actiontext (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activestorage (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actionview (6.1.7.6)
+      activesupport (= 6.1.7.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -59,28 +59,28 @@ GEM
       sassc
       sassc-rails
       xdan-datetimepicker-rails (~> 2.5.1)
-    activejob (6.1.7.4)
-      activesupport (= 6.1.7.4)
+    activejob (6.1.7.6)
+      activesupport (= 6.1.7.6)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.4)
-      activesupport (= 6.1.7.4)
+    activemodel (6.1.7.6)
+      activesupport (= 6.1.7.6)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (6.1.7.4)
-      activemodel (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    activerecord (6.1.7.6)
+      activemodel (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
     activerecord-import (1.4.0)
       activerecord (>= 4.2)
-    activestorage (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    activestorage (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.4)
+    activesupport (6.1.7.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -294,12 +294,12 @@ GEM
     memoist (0.16.2)
     method_source (1.0.0)
     mini_magick (4.11.0)
-    mini_mime (1.1.2)
+    mini_mime (1.1.5)
     mini_portile2 (2.8.4)
-    minitest (5.18.1)
+    minitest (5.19.0)
     msgpack (1.5.3)
     multi_json (1.15.0)
-    net-imap (0.3.6)
+    net-imap (0.3.7)
       date
       net-protocol
     net-pop (0.1.2)
@@ -312,7 +312,7 @@ GEM
       net-protocol
     net-ssh (7.0.1)
     nio4r (2.5.9)
-    nokogiri (1.15.3)
+    nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     optimist (3.0.1)
@@ -336,45 +336,45 @@ GEM
       i18n (>= 0.5.0)
       railties (>= 5.0.0)
     public_suffix (4.0.7)
-    puma (4.3.12)
+    puma (5.6.7)
       nio4r (~> 2.0)
     racc (1.7.1)
-    rack (2.2.7)
+    rack (2.2.8)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack-proxy (0.7.2)
       rack
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.4)
-      actioncable (= 6.1.7.4)
-      actionmailbox (= 6.1.7.4)
-      actionmailer (= 6.1.7.4)
-      actionpack (= 6.1.7.4)
-      actiontext (= 6.1.7.4)
-      actionview (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activemodel (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activestorage (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    rails (6.1.7.6)
+      actioncable (= 6.1.7.6)
+      actionmailbox (= 6.1.7.6)
+      actionmailer (= 6.1.7.6)
+      actionpack (= 6.1.7.6)
+      actiontext (= 6.1.7.6)
+      actionview (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activemodel (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activestorage (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.4)
+      railties (= 6.1.7.6)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.1.1)
+    rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    railties (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -524,26 +524,26 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webdrivers (5.2.0)
+    webdrivers (5.3.1)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0)
+      selenium-webdriver (~> 4.0, < 4.11)
     webpacker (5.4.3)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
     webrick (1.7.0)
     websocket (1.2.9)
-    websocket-driver (0.7.5)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xdan-datetimepicker-rails (2.5.4)
       jquery-rails
       rails (>= 3.2.16)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.11)
 
 PLATFORMS
   ruby
@@ -589,7 +589,7 @@ DEPENDENCIES
   pg_search (= 2.3.2)
   pry
   public_activity
-  puma (~> 4.3)
+  puma (~> 5.0)
   rack-cors
   rails (~> 6.1.1)
   rails-controller-testing

diff --git a/app/admin/companies.rb b/app/admin/companies.rb
@@ -212,7 +212,8 @@ def scoped_collection
         :geography,
         :sector,
         :headquarters_geography,
-        :latest_mq_assessment,
+        :latest_mq_assessment_only_beta_methodologies,
+        :latest_mq_assessment_without_beta_methodologies,
         *csv_includes
       )
     end

diff --git a/app/assets/images/icons/star.svg b/app/assets/images/icons/star.svg
diff --git a/app/assets/images/icons/trending-down.svg b/app/assets/images/icons/trending-down.svg
diff --git a/app/assets/images/icons/trending-up.svg b/app/assets/images/icons/trending-up.svg
diff --git a/app/assets/stylesheets/tpi.scss b/app/assets/stylesheets/tpi.scss
@@ -38,6 +38,8 @@
 @import "tpi/nested-dropdown";
 @import "tpi/banking-question-legend";
 @import "tpi/latest-information";
+@import "tpi/mq_beta_scores";
+@import "tpi/mq-beta-modal";
 
 @import "tpi/pages/*";
 @import "tpi/shared/*";

diff --git a/app/assets/stylesheets/tpi/_bubble-chart.scss b/app/assets/stylesheets/tpi/_bubble-chart.scss
@@ -18,9 +18,10 @@ $legend-image-width: 60px;
   &--sectors {
     grid-template-rows: 150px auto;
 
-    & > *:nth-child(6n) {
+    .last {
       border-right: none;
     }
+
   }
 
   &--banks {

diff --git a/app/assets/stylesheets/tpi/_colors.scss b/app/assets/stylesheets/tpi/_colors.scss
@@ -14,9 +14,11 @@ $grey-blue: #CFD7ED;
 $dark: #191919;
 $black: #000;
 $green: #00C170;
+$purple:#9747FF;
 
 $tpi-level0: $blue-light;
 $tpi-level1: $blue;
 $tpi-level2: $blue-ribbon;
 $tpi-level3: $blue-dark;
 $tpi-level4: $blue-darker;
+$tpi-level5-background-color: $purple;
diff --git a/app/assets/stylesheets/tpi/_mixins.scss b/app/assets/stylesheets/tpi/_mixins.scss
@@ -95,4 +95,12 @@
   &.level4 {
     background-color: $tpi-level4;
   }
+
+  &.level5 {
+    background-color: $tpi-level5-background-color;
+
+    .mq-level-trend__container {
+      background-color: $tpi-level5-background-color;
+    }
+  }
 }