Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prod deploy - rest of Bank CP assessments and MQ BETA scores #437

Merged
merged 44 commits into from
Sep 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
00ea63c
refactoring: Adding No disclosure CP::Alignment
martintomas Aug 7, 2023
637fce3
chore: Updating webdrivers
martintomas Aug 7, 2023
190c00e
feat: Adding Beta scores to methodology version of 5
martintomas Aug 9, 2023
b923b28
feat: Enable to switch between MQ Beta scores and not
martintomas Aug 10, 2023
ee6a7b1
Update legend
Bluesmile82 Aug 11, 2023
d779e04
test: Fix of all broken tests
martintomas Aug 11, 2023
640216c
Make tooltips wider
Bluesmile82 Aug 11, 2023
588340d
Dont show general tooltip items or target years
Bluesmile82 Aug 11, 2023
8a12010
Don't render benchmarklabels on multiple chart
Bluesmile82 Aug 11, 2023
1eea76c
Events go inside chart
Bluesmile82 Aug 11, 2023
69247c4
test: New tests for MQ Beta score feature
martintomas Aug 11, 2023
c6ed380
Add text on tooltip for no targets
Bluesmile82 Aug 11, 2023
a55b6f1
Merge pull request #430 from Vizzuality/feature/mq-beta-scores
martintomas Aug 11, 2023
dad24df
Revert "Merge pull request #430 from Vizzuality/feature/mq-beta-scores"
martintomas Aug 11, 2023
07c5ef0
refactoring: Sector mean description is different for Bank category
martintomas Aug 15, 2023
bb7f3ef
Rename matrix table legend label
Bluesmile82 Aug 16, 2023
b877d51
Feature/mq scores - DONT MERGE (#431)
Bluesmile82 Aug 16, 2023
820b591
Fix max level on the chart depending on data
Bluesmile82 Aug 16, 2023
54aba29
Change separator styles and paddings
Bluesmile82 Aug 18, 2023
358b6d1
Update download button labels
Bluesmile82 Aug 18, 2023
323658c
Change weight to normal in unselected button
Bluesmile82 Aug 18, 2023
e0fc0a7
Add focus on the Proceed button on render
Bluesmile82 Aug 18, 2023
ea19057
Merge pull request #432 from Vizzuality:fix/beta-level-style-feedback
Bluesmile82 Aug 18, 2023
4f434fc
chore: update of Puma
martintomas Aug 18, 2023
0e1cd29
Updates to the modal text
Bluesmile82 Aug 22, 2023
1a18d46
Fix borders
Bluesmile82 Aug 22, 2023
165bdbe
Update labels
Bluesmile82 Aug 22, 2023
69c9da1
Reduce size of bubbles to 50%
Bluesmile82 Aug 22, 2023
045be08
Adjust bar chart levels
Bluesmile82 Aug 22, 2023
7491c6c
Merge pull request #433 from Vizzuality/fix/beta-feedback
Bluesmile82 Aug 22, 2023
a63b494
fix: Max level of MQ Assessments chart depends on selected assessments
martintomas Aug 23, 2023
3d1494e
feat: Highlight also individual questions on different levels of MQ a…
martintomas Aug 23, 2023
0b68fb8
chore: minor update of Rails
martintomas Aug 23, 2023
f3beee6
Improve beta question style
Bluesmile82 Aug 23, 2023
d9ea6e6
FIx responsive
Bluesmile82 Aug 23, 2023
b0bf06a
Merge pull request #434 from Vizzuality/fix/mq-beta-scores
martintomas Aug 23, 2023
f51c115
Change BETA color and add border to circle in button
Bluesmile82 Aug 24, 2023
f84fa62
Fix bars line-height. Add black background
Bluesmile82 Aug 24, 2023
c64d8ed
Merge pull request #435 from Vizzuality/fix/beta-feedback-2
Bluesmile82 Aug 24, 2023
4a8234b
Update line padding
Bluesmile82 Aug 24, 2023
3cc812a
feat: Support 5STAR level
martintomas Aug 31, 2023
2007407
Add feature tag to show the entry to beta data
Bluesmile82 Sep 1, 2023
796e9fd
Add env variable to tests github action
Bluesmile82 Sep 1, 2023
9bcadef
Merge pull request #436 from Vizzuality/feature/feature-tag-mq-beta
Bluesmile82 Sep 1, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
GCS_CREDENTIALS_FILE=
GCS_BUCKET=
MQ_BETA_ENABLED=true
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
MQ_BETA_ENABLED: 'true'

name: Tests
on: push
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
130 changes: 65 additions & 65 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion app/admin/companies.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/assets/images/icons/star.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/assets/images/icons/trending-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/assets/images/icons/trending-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions app/assets/stylesheets/tpi.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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/*";
Expand Down
3 changes: 2 additions & 1 deletion app/assets/stylesheets/tpi/_bubble-chart.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ $legend-image-width: 60px;
&--sectors {
grid-template-rows: 150px auto;

& > *:nth-child(6n) {
.last {
border-right: none;
}

}

&--banks {
Expand Down
2 changes: 2 additions & 0 deletions app/assets/stylesheets/tpi/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
8 changes: 8 additions & 0 deletions app/assets/stylesheets/tpi/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
Loading
Loading