diff --git a/app/admin/bank_assessment_indicators.rb b/app/admin/bank_assessment_indicators.rb
index 7845d6614..ab2e48b99 100644
--- a/app/admin/bank_assessment_indicators.rb
+++ b/app/admin/bank_assessment_indicators.rb
@@ -12,7 +12,7 @@
data_export_sidebar 'BankAssessmentIndicators', display_name: 'Indicators'
- permit_params :number, :indicator_type, :text, :comment
+ permit_params :number, :indicator_type, :text, :comment, :disable_bubbles_at_chart
show do
attributes_table do
@@ -21,6 +21,7 @@
row :indicator_type
row :text
row :comment
+ row :disable_bubbles_at_chart
row :created_at
row :updated_at
end
@@ -36,6 +37,7 @@
f.input :number
f.input :text
f.input :comment
+ f.input :disable_bubbles_at_chart
end
f.actions
diff --git a/app/javascript/components/tpi/charts/bank-bubble/Chart.js b/app/javascript/components/tpi/charts/bank-bubble/Chart.js
index 63c347a1d..dc8877782 100644
--- a/app/javascript/components/tpi/charts/bank-bubble/Chart.js
+++ b/app/javascript/components/tpi/charts/bank-bubble/Chart.js
@@ -21,7 +21,7 @@ const SINGLE_CELL_SVG_HEIGHT = 100 * SCALE;
const tooltipDisclaimer = 'Market cap size';
let tooltip = null;
-const BubbleChart = ({ results }) => {
+const BubbleChart = ({ results, disabled_bubbles_areas }) => {
const tooltipEl = '
';
useEffect(() => {
document.body.insertAdjacentHTML('beforeend', tooltipEl);
@@ -91,7 +91,7 @@ const BubbleChart = ({ results }) => {
))}
- {Object.keys(parsedData).map((area, index) => createRow(parsedData[area], area, index + 1))}
+ {Object.keys(parsedData).map((area, index) => createRow(parsedData[area], area, index + 1, disabled_bubbles_areas))}
);
};
@@ -139,13 +139,13 @@ const hideTooltip = () => {
tooltip.setAttribute('hidden', true);
};
-const createRow = (dataRow, area, index) => (
+const createRow = (dataRow, area, index, disabled_bubbles_areas) => (
{index}. {area}
{dataRow.map((el, i) => {
- const companiesBubbles = el.map(result => ({
+ const companiesBubbles = disabled_bubbles_areas.includes(area) ? [] : el.map(result => ({
value: COMPANIES_MARKET_CAP_GROUPS[result.market_cap_group],
tooltipContent: {
header: result.bank_name,
@@ -168,6 +168,10 @@ const createRow = (dataRow, area, index) => (
);
+BubbleChart.defaultProps = {
+ disabled_bubbles_areas: []
+};
+
BubbleChart.propTypes = {
results: PropTypes.arrayOf(PropTypes.shape({
area: PropTypes.string.isRequired,
@@ -176,6 +180,7 @@ BubbleChart.propTypes = {
bank_id: PropTypes.number.isRequired,
bank_name: PropTypes.string.isRequired,
bank_path: PropTypes.string.isRequired
- })).isRequired
+ })).isRequired,
+ disabled_bubbles_areas: PropTypes.arrayOf(PropTypes.string)
};
export default BubbleChart;
diff --git a/app/javascript/components/tpi/charts/bank-bubble/CompaniesAccordion.js b/app/javascript/components/tpi/charts/bank-bubble/CompaniesAccordion.js
index f40712927..ead12348c 100644
--- a/app/javascript/components/tpi/charts/bank-bubble/CompaniesAccordion.js
+++ b/app/javascript/components/tpi/charts/bank-bubble/CompaniesAccordion.js
@@ -58,7 +58,7 @@ DropdownIndicator.propTypes = {
selectProps: PropTypes.object.isRequired
};
-const CompaniesAccordion = ({ results }) => {
+const CompaniesAccordion = ({ results, disabled_bubbles_areas }) => {
const areas = uniq(results.map(r => r.area));
const selectOptions = areas.map((level) => ({label: level, value: level}));
const [openItems, setOpenItems] = useState([]);
@@ -82,7 +82,9 @@ const CompaniesAccordion = ({ results }) => {
}
});
- const activeArea = parsedData[activeOption.value];
+ const activeArea = disabled_bubbles_areas.includes(activeOption.value)
+ ? Array.from({ length: ranges.length }, () => [])
+ : parsedData[activeOption.value];
function setOpenItemByIndex(index) {
setOpenItems(openItems.includes(index) ? openItems.filter(i => i !== index) : [...openItems, index]);
@@ -113,21 +115,21 @@ const CompaniesAccordion = ({ results }) => {
setOpenItemByIndex(i)}>
Score Range
-
{activeArea[i].length} {activeArea[i].length === 1 ? 'company' : 'companies'}
+
{activeArea[i].length} {activeArea[i].length === 1 ? 'bank' : 'banks'}
{range.min}-{range.max}%
- {activeArea[i].length === 0 &&
No companies
}
+ {activeArea[i].length === 0 &&
No banks
}
{activeArea[i].length > 0 && (
- {sortBy(activeArea[i], 'bank_name').map((company, index) => (
+ {sortBy(activeArea[i], 'bank_name').map((bank, index) => (
- { window.location.href = company.bank_path; }}
+ onClick={() => { window.location.href = bank.bank_path; }}
>
- {company.bank_name}
+ {bank.bank_name}
))}
@@ -141,6 +143,7 @@ const CompaniesAccordion = ({ results }) => {
};
CompaniesAccordion.defaultProps = {
+ disabled_bubbles_areas: []
};
CompaniesAccordion.propTypes = {
@@ -151,6 +154,7 @@ CompaniesAccordion.propTypes = {
bank_id: PropTypes.number.isRequired,
bank_name: PropTypes.string.isRequired,
bank_path: PropTypes.string.isRequired
- })).isRequired
+ })).isRequired,
+ disabled_bubbles_areas: PropTypes.arrayOf(PropTypes.string)
};
export default CompaniesAccordion;
diff --git a/app/views/tpi/banks/_index_charts.html.erb b/app/views/tpi/banks/_index_charts.html.erb
index 191b626b4..01e159c6a 100644
--- a/app/views/tpi/banks/_index_charts.html.erb
+++ b/app/views/tpi/banks/_index_charts.html.erb
@@ -1,3 +1,9 @@
<%= react_component('charts/average-bank-score', { dataUrl: average_bank_score_chart_data_tpi_banks_path }) %>
-<%= react_component('charts/bank-bubble/Chart', { results: @results }) %>
-<%= react_component('charts/bank-bubble/CompaniesAccordion', { results: @results }) %>
+<%= react_component('charts/bank-bubble/Chart', {
+ results: @results,
+ disabled_bubbles_areas: BankAssessmentIndicator.area.where(disable_bubbles_at_chart: true).pluck(:text)
+}) %>
+<%= react_component('charts/bank-bubble/CompaniesAccordion', {
+ results: @results,
+ disabled_bubbles_areas: BankAssessmentIndicator.area.where(disable_bubbles_at_chart: true).pluck(:text)
+}) %>
diff --git a/app/views/tpi/banks/index.html.erb b/app/views/tpi/banks/index.html.erb
index a85ca87f0..c240c3b5e 100644
--- a/app/views/tpi/banks/index.html.erb
+++ b/app/views/tpi/banks/index.html.erb
@@ -51,7 +51,7 @@
- Assessed banks alignment across the six areas (% of sub-indicators aligned with)
+ Assessed banks alignment across the ten areas (% of sub-indicators aligned with)
diff --git a/db/migrate/20230926075145_add_disable_bubbles_at_graph_to_bank_assessment_indicator.rb b/db/migrate/20230926075145_add_disable_bubbles_at_graph_to_bank_assessment_indicator.rb
new file mode 100644
index 000000000..9b08936dc
--- /dev/null
+++ b/db/migrate/20230926075145_add_disable_bubbles_at_graph_to_bank_assessment_indicator.rb
@@ -0,0 +1,6 @@
+class AddDisableBubblesAtGraphToBankAssessmentIndicator < ActiveRecord::Migration[6.1]
+ def change
+ add_column :bank_assessment_indicators, :disable_bubbles_at_chart, :boolean, default: false
+ BankAssessmentIndicator.area.where(number: ["4"]).update_all disable_bubbles_at_chart: true
+ end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 8daa6237b..d1a59c03d 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -85,7 +85,7 @@ CREATE FUNCTION public.target_tsv_trigger() RETURNS trigger
SET default_tablespace = '';
-SET default_with_oids = false;
+SET default_table_access_method = heap;
--
-- Name: active_admin_comments; Type: TABLE; Schema: public; Owner: -
@@ -321,7 +321,8 @@ CREATE TABLE public.bank_assessment_indicators (
text text NOT NULL,
created_at timestamp(6) without time zone NOT NULL,
updated_at timestamp(6) without time zone NOT NULL,
- comment text
+ comment text,
+ disable_bubbles_at_chart boolean DEFAULT false
);
@@ -3732,6 +3733,7 @@ INSERT INTO "schema_migrations" (version) VALUES
('20230622073030'),
('20230622093001'),
('20230712074753'),
-('20230713121501');
+('20230713121501'),
+('20230926075145');
diff --git a/db/test-dump.psql b/db/test-dump.psql
index f5d62789f..2f95720a4 100644
Binary files a/db/test-dump.psql and b/db/test-dump.psql differ