@@ -39,7 +53,8 @@ LegendItem.propTypes = {
hoverIndex: PropTypes.number.isRequired,
color: PropTypes.string,
selectActiveDonutIndex: PropTypes.func.isRequired,
- disableAbbr: PropTypes.bool
+ disableAbbr: PropTypes.bool,
+ infoText: PropTypes.string
};
LegendItem.defaultProps = {
diff --git a/app/javascript/app/components/ndcs/shared/legend-item/legend-item-styles.scss b/app/javascript/app/components/ndcs/shared/legend-item/legend-item-styles.scss
index 5c803ad42e..ecd52a4b2e 100644
--- a/app/javascript/app/components/ndcs/shared/legend-item/legend-item-styles.scss
+++ b/app/javascript/app/components/ndcs/shared/legend-item/legend-item-styles.scss
@@ -10,15 +10,22 @@ $progress-bar-width: 180px;
}
.legendName {
+ display: flex;
+ align-items: center;
max-width: $progress-bar-width;
margin-bottom: 2px;
}
+ .infoContainer {
+ margin: 0 0 -3px 5px;
+ }
+
.legendDot {
height: 10px;
display: inline-block;
margin-right: 5px;
width: 10px;
+ min-width: 10px;
border-radius: 50%;
}
diff --git a/app/javascript/app/data/constants.js b/app/javascript/app/data/constants.js
index 6e1d751cf7..4235c8da2f 100644
--- a/app/javascript/app/data/constants.js
+++ b/app/javascript/app/data/constants.js
@@ -384,8 +384,8 @@ export const AGRICULTURE_INDICATORS_MAP_BUCKETS = {
export const DEFAULT_NDC_EXPLORE_CATEGORY_SLUG = 'unfccc_process';
export const CATEGORY_SOURCES = {
- NDC_EXPLORE: ['CAIT', 'WB', 'NDC Explorer'],
- NDC_CONTENT: ['CAIT', 'WB', 'NDC Explorer']
+ NDC_EXPLORE: ['CAIT', 'WB', 'NDC Explorer', 'UNICEF'],
+ NDC_CONTENT: ['CAIT', 'WB', 'NDC Explorer', 'UNICEF']
};
export const ENHANCEMENT_CATEGORIES = [
diff --git a/app/javascript/app/data/data-explorer-constants.js b/app/javascript/app/data/data-explorer-constants.js
index 390dc2eeaf..0cced99868 100644
--- a/app/javascript/app/data/data-explorer-constants.js
+++ b/app/javascript/app/data/data-explorer-constants.js
@@ -154,7 +154,14 @@ export const DATA_EXPLORER_METHODOLOGY_SOURCE = {
GCP: ['historical_emissions_gcp']
},
'ndc-sdg-linkages': ['ndc_sdg_all indicators'],
- 'ndc-content': ['ndc_cw', 'ndc_wb', 'ndc_die', 'ndc_adaptation'],
+ 'ndc-content': [
+ 'ndc_cw',
+ 'ndc_wb',
+ 'ndc_die',
+ 'ndc_adaptation',
+ 'ndc_unicef',
+ 'ndc_finance'
+ ],
'lts-content': ['lts'],
'net-zero-content': ['net_zero'],
'emission-pathways': [null] // model, scenario and indicator related metadata
diff --git a/app/javascript/app/providers/ndcs-explore-provider/ndcs-explore-provider-actions.js b/app/javascript/app/providers/ndcs-explore-provider/ndcs-explore-provider-actions.js
index d8cb12c959..fb430174b8 100644
--- a/app/javascript/app/providers/ndcs-explore-provider/ndcs-explore-provider-actions.js
+++ b/app/javascript/app/providers/ndcs-explore-provider/ndcs-explore-provider-actions.js
@@ -22,7 +22,7 @@ const fetchNDCS = createThunkAction('fetchNDCS', props => (dispatch, state) => {
if (ndcsExplore && !ndcsExplore.loading) {
promises.push(
apiWithCache.get(
- `/api/v1/ndcs?filter=map&source[]=CAIT&source[]=WB&source[]=NDC%20Explorer'${
+ `/api/v1/ndcs?filter=map&source[]=CAIT&source[]=WB&source[]=NDC%20Explorer&source[]=UNICEF${
params.length ? `&${params.join('&')}` : ''
}`
)
@@ -33,7 +33,7 @@ const fetchNDCS = createThunkAction('fetchNDCS', props => (dispatch, state) => {
// and as it is not filtered by category also serves the whole list of categories
promises.push(
apiWithCache.get(
- '/api/v1/ndcs?indicators=ndce_ghg, submission, submission_date&filter=map&source[]=CAIT&source[]=WB&source[]=NDC%20Explorer'
+ '/api/v1/ndcs?indicators=ndce_ghg, submission, submission_date&filter=map&source[]=CAIT&source[]=WB&source[]=NDC%20Explorer&source[]=UNICEF'
)
);
diff --git a/app/javascript/app/providers/ndcs-provider/ndcs-provider-actions.js b/app/javascript/app/providers/ndcs-provider/ndcs-provider-actions.js
index 96db10dff3..074181fd8d 100644
--- a/app/javascript/app/providers/ndcs-provider/ndcs-provider-actions.js
+++ b/app/javascript/app/providers/ndcs-provider/ndcs-provider-actions.js
@@ -23,7 +23,9 @@ const fetchNDCS = createThunkAction('fetchNDCS', props => (dispatch, state) => {
params.push(`indicators=${indicatorSlugs.join(',')}`);
}
if (!overrideFilter) {
- params.push('filter=map&source[]=CAIT&source[]=WB&source[]=NDC%20Explorer');
+ params.push(
+ 'filter=map&source[]=CAIT&source[]=WB&source[]=NDC%20Explorer&source[]=UNICEF'
+ );
}
if (subcategory) {
params.push(`subcategory=${subcategory}`);
@@ -54,7 +56,7 @@ const fetchNDCS = createThunkAction('fetchNDCS', props => (dispatch, state) => {
`/api/v1/ndcs?indicators=${additionalIndicatorSlugs.join(',')}${
overrideFilter
? ''
- : '&filter=map&source[]=CAIT&source[]=WB&source[]=NDC%20Explorer'
+ : '&filter=map&source[]=CAIT&source[]=WB&source[]=NDC%20Explorer&source[]=UNICEF'
}`
)
);
diff --git a/app/models/indc/source.rb b/app/models/indc/source.rb
index a4463bd104..ffc2e9a8e7 100644
--- a/app/models/indc/source.rb
+++ b/app/models/indc/source.rb
@@ -9,8 +9,23 @@
#
module Indc
class Source < ApplicationRecord
- validates :name, presence: true
- validates :name, uniqueness: true
+ VALID_SOURCES = [
+ 'CAIT',
+ 'LSE',
+ 'LTS',
+ 'NDC Explorer',
+ 'Net_Zero',
+ 'Pledges',
+ 'UNICEF',
+ 'WB'
+ ].freeze
+
+ validates :name, presence: true, uniqueness: true, inclusion: {
+ in: VALID_SOURCES,
+ message: "%{value} is not supported. Supported values for source: #{VALID_SOURCES.join(', ')}",
+ allow_blank: true # to have only presence error if nil
+ }
+
scope :lts, -> { where("name ilike 'LTS'") }
scope :net_zero, -> { where("name ilike 'Net_Zero'") }
scope :ndc, -> { where.not(id: lts).where.not(id: net_zero) }
diff --git a/app/services/import_indc.rb b/app/services/import_indc.rb
index c1f3db8c0b..57da6838f7 100644
--- a/app/services/import_indc.rb
+++ b/app/services/import_indc.rb
@@ -442,7 +442,8 @@ def import_labels
def import_values_ndc
valid_sources = [@sources_index['CAIT'], @sources_index['NDC Explorer'],
- @sources_index['WB'], @sources_index['Net_Zero']]
+ @sources_index['WB'], @sources_index['Net_Zero'],
+ @sources_index['UNICEF']]
values = []
Indc::Indicator.
where(source: valid_sources).
diff --git a/spec/factories/indc_sources.rb b/spec/factories/indc_sources.rb
index 181be0f520..8338069c9e 100644
--- a/spec/factories/indc_sources.rb
+++ b/spec/factories/indc_sources.rb
@@ -9,6 +9,8 @@
#
FactoryBot.define do
factory :indc_source, class: 'Indc::Source' do
- sequence(:name) { |n| 'My Name ' + ('AA'..'ZZ').to_a[n] }
+ name { 'CAIT' }
+
+ initialize_with { Indc::Source.find_or_create_by(name: name) }
end
end
diff --git a/spec/models/indc/source_spec.rb b/spec/models/indc/source_spec.rb
index 17c9dab006..ac49888fa3 100644
--- a/spec/models/indc/source_spec.rb
+++ b/spec/models/indc/source_spec.rb
@@ -10,9 +10,17 @@
require 'rails_helper'
describe Indc::Source, type: :model do
+ subject { FactoryBot.build(:indc_source) }
+
+ it { is_expected.to be_valid }
+
it 'should be invalid when name not present' do
- expect(
- FactoryBot.build(:indc_source, name: nil)
- ).to have(1).errors_on(:name)
+ subject.name = nil
+ expect(subject).to have(1).errors_on(:name)
+ end
+
+ it 'should be invalid with wrong name' do
+ subject.name = 'source'
+ expect(subject).to have(1).errors_on(:name)
end
end