Merge pull request #4725 from wri/develop

Deploy

components/widgets/fires/fires-alerts-cumulative/selectors.js

@@ -32,6 +32,7 @@ const getSentences = (state) => state.sentences || null;
 const getLocationName = (state) => state.locationLabel;
 const getOptionsSelected = (state) => state.optionsSelected;
 const getIndicator = (state) => state.indicator;
+const getSettings = (state) => state.settings;
 
 export const getCompareYears = createSelector(
   [getCompareYear, getAllYears],
@@ -401,9 +402,9 @@ export const parseSentence = createSelector(
     getDataset,
     getLocationName,
     getStartIndex,
-    // getEndIndex,
     getOptionsSelected,
     getIndicator,
+    getSettings,
   ],
   (
     raw_data,
@@ -413,18 +414,29 @@ export const parseSentence = createSelector(
     dataset,
     location,
     startIndex,
-    // endIndex //broken?
     options,
-    indicator
+    indicator,
+    settings
   ) => {
     if (!data || isEmpty(data)) return null;
+
     const {
       highConfidence,
       allAlerts,
       highConfidenceWithInd,
       allAlertsWithInd,
     } = sentences;
-    const { confidence } = options;
+    const { confidenceToggle } = settings;
+    let { confidence } = options;
+
+    /*
+      Validation for the Analysis
+    */
+    if (confidenceToggle) {
+      confidence =
+        confidenceToggle === 'true' ? { value: 'h' } : { value: 'all' };
+    }
+
     const indicatorLabel =
       indicator && indicator.label ? indicator.label : null;
     const start = startIndex;

components/widgets/fires/fires-alerts-historical-daily/selectors.js

@@ -11,6 +11,7 @@ const getAlerts = (state) => state.data;
 const getColors = (state) => state.colors || null;
 const getStartDate = (state) => state.settings.startDate;
 const getEndDate = (state) => state.settings.endDate;
+const getSettings = (state) => state.settings;
 const getSentences = (state) => state.sentences || null;
 const getLocationObject = (state) => state.location;
 const getOptionsSelected = (state) => state.optionsSelected;
@@ -87,6 +88,7 @@ export const parseSentence = createSelector(
     getEndDate,
     getOptionsSelected,
     getIndicator,
+    getSettings,
   ],
   (
     data,
@@ -96,11 +98,24 @@ export const parseSentence = createSelector(
     startDate,
     endDate,
     options,
-    indicator
+    indicator,
+    settings
   ) => {
     if (!data) return null;
     const { initial, withInd, highConfidence } = sentences;
-    const { confidence, dataset } = options;
+    const { confidenceToggle } = settings;
+    const { dataset } = options;
+
+    let { confidence } = options;
+
+    /*
+      Validation for the Analysis
+    */
+    if (confidenceToggle) {
+      confidence =
+        confidenceToggle === 'true' ? { value: 'h' } : { value: 'all' };
+    }
+
     const indicatorLabel =
       indicator && indicator.label ? indicator.label : null;
     const total = sumBy(data, 'alert__count');