{html ? :
);
InfoTooltip.propTypes = {
diff --git a/app/javascript/components/tpi/Select.js b/app/javascript/components/tpi/Select.js
index abca539e0..f2e1405e5 100644
--- a/app/javascript/components/tpi/Select.js
+++ b/app/javascript/components/tpi/Select.js
@@ -20,7 +20,7 @@ const Select = ({
value,
allowSearch,
placeholder,
- label
+ required
}) => {
const [searchValue, setSearchValue] = useState('');
const [isOpen, setIsOpen] = useState(false);
@@ -59,6 +59,7 @@ const Select = ({
const handleOptionClick = (opt) => {
setIsOpen(false);
+ setSearchValue(opt.value);
onSelect({ name, value: opt.value, label: opt.label });
};
@@ -144,18 +145,15 @@ const Select = ({
role="button"
aria-label={isOpen ? 'Close dropdown' : 'Open dropdown'}
>
- {isOpen && allowSearch ? (
- setSearchValue(e.target.value)}
- placeholder="Type or select"
- />
- ) : (
-
- {value || placeholder}
-
- )}
+ setSearchValue(e.target.value)}
+ placeholder={placeholder}
+ required={required}
+ name={name}
+ value={isOpen && allowSearch ? searchValue : value}
+ />
{trigger}
}
@@ -121,7 +123,7 @@ const BubbleChart = ({ levels, sectors }) => {
+ { i > 0
+ && }
))}
{parsedData.map((dataRow) => (
@@ -172,6 +187,22 @@ const BubbleChart = ({ levels, sectors }) => {
key={dataRow.sector}
/>
))}
+ {/*
@@ -162,6 +164,19 @@ const BubbleChart = ({ levels, sectors }) => {
{LEVELS_SUBTITLES[el]}
+ {levelsSignature.map((dataRow) => (
+
+ ))}
+
*/}
{item.value} {item.value === 1 ? 'company' : 'companies'} - {item.percentage}% diff --git a/app/views/data_download_mailer/send_download_file_info_email.html.erb b/app/views/data_download_mailer/send_download_file_info_email.html.erb index 3fd2a9a18..6e05995b2 100644 --- a/app/views/data_download_mailer/send_download_file_info_email.html.erb +++ b/app/views/data_download_mailer/send_download_file_info_email.html.erb @@ -10,6 +10,10 @@
Purposes
-
<% Array.wrap(@data[:purposes]).each do |purpose| %>
-
- <%= purpose %> + <% if purpose == "other_purpose_checkbox" %> +
- Other: <%= @data[:other_purpose] %> + <% else %> +
- <%= purpose %> + <% end %> <% end %>
<%= render 'tpi/shared/mq_beta_scores', has_data: @company.beta_mq_assessments? %>
diff --git a/app/views/tpi/sectors/index.html.erb b/app/views/tpi/sectors/index.html.erb
index 0d07715c9..048728362 100644
--- a/app/views/tpi/sectors/index.html.erb
+++ b/app/views/tpi/sectors/index.html.erb
@@ -15,14 +15,14 @@
+ <%= react_component('DownloadFormModal', {
+ downloadUrl: user_download_all_tpi_sectors_path
+ }) %>
<%= link_to user_download_methodology_tpi_sectors_path, class: 'button is-primary is-pulled-right with-icon with-border' do %>
Download Methodology
<% end %>
- <%= link_to user_download_all_tpi_sectors_path, class: 'button is-primary is-pulled-right with-icon with-border' do %>
-
- Download CP & MQ Data
- <% end %>
Download Methodology
<% end %>
- <%= link_to user_download_all_tpi_sectors_path, class: 'button is-primary is-pulled-right with-icon with-border' do %>
-
- Download CP & MQ Data
- <% end %>
<%= render 'tpi/shared/mq_beta_scores', has_data: true %>
diff --git a/app/views/tpi/sectors/show.html.erb b/app/views/tpi/sectors/show.html.erb
index 88e2140e7..395a64c3d 100644
--- a/app/views/tpi/sectors/show.html.erb
+++ b/app/views/tpi/sectors/show.html.erb
@@ -15,30 +15,19 @@
+ <%= react_component('DownloadFormModal', {
+ downloadUrl: user_download_all_tpi_sectors_path
+ }) %>
<%= link_to user_download_methodology_tpi_sectors_path, class: 'button is-primary is-pulled-right with-icon with-border' do %>
Download Methodology
<% end %>
- <%= link_to user_download_all_tpi_sectors_path, class: 'button is-primary with-icon with-border' do %>
-
- Download CP & MQ Data
- <% end %>
+
Download Methodology
<% end %>
- <%= link_to user_download_all_tpi_sectors_path, class: 'button is-primary with-icon with-border' do %>
-
- Download CP & MQ Data
- <% end %>
+
<%= render 'tpi/shared/mq_beta_scores', has_data: true %>
+ <%= react_component('DownloadFormModal', {
+ downloadUrl: user_download_tpi_sector_path(@sector)
+ }) %>
<%= link_to user_download_methodology_tpi_sectors_path, class: 'button is-primary is-pulled-right with-icon with-border' do %>
Download Methodology
<% end %>
- <%= link_to user_download_tpi_sector_path(@sector), class: 'button is-primary is-pulled-right with-icon with-border' do %>
-
- Download CP & MQ Data
- <% end %>
Download Methodology
<% end %>
- <%= link_to user_download_tpi_sector_path(@sector), class: 'button is-primary is-pulled-right with-icon with-border' do %>
-
- Download CP & MQ Data
- <% end %>
<%= render 'tpi/shared/mq_beta_scores', has_data: true %>
-
-
- Management Quality
-
- <% if any_cp_assessment? %>
-
- Carbon Performance
-
- <% end %>
-