data whitelisting

__tests__/gui/data_whitelist.feature

@@ -9,6 +9,7 @@ Feature: Data Whitelist
     And I click on "Demographics" in Data Mapper
     And I click on "Language" in Data Mapper
     And I click on "Language most spoken at home" in Data Mapper
+    And I confirm that available subindicators are "20-24,30-35" in Data Mapper
     And I click on "30-35" in Data Mapper
     And I expand the filter dialog
     Then I confirm that the choropleth is filtered by "gender:Female" at index 0
@@ -20,7 +21,7 @@ Feature: Data Whitelist
 
     # Rich data panel default filter
     When I expand Rich Data Panel
-    Then I confirm that "gender:Female" is applied to "Language most spoken at home" as a site-wide filter
+    Then I confirm that "gender:Female" is applied to "Language most spoken at home"
 
   Scenario: Restricting filter values and setting profile-wide filters on a view
     Given I am on the Wazimap Homepage Test View
@@ -31,6 +32,7 @@ Feature: Data Whitelist
     And I click on "Demographics" in Data Mapper
     And I click on "Language" in Data Mapper
     And I click on "Language most spoken at home" in Data Mapper
+    And I confirm that available subindicators are "15-19,20-24,30-35" in Data Mapper
     And I click on "30-35" in Data Mapper
     And I expand the filter dialog
     Then I confirm that the choropleth is filtered by "gender:Male" at index 0
@@ -42,4 +44,4 @@ Feature: Data Whitelist
 
     # Rich data panel default filter
     When I expand Rich Data Panel
-    Then I confirm that "gender:Male" is applied to "Language most spoken at home" as a site-wide filter
+    Then I confirm that "gender:Male" is applied to "Language most spoken at home"

__tests__/gui/data_whitelist/data_whitelist.js

@@ -1,10 +1,13 @@
 import {Given, Then, When} from "cypress-cucumber-preprocessor/steps";
 import {
-    collapseMyViewPanel, confirmChartIsFiltered,
-    confirmChoroplethIsFiltered, confirmDropdownOptions,
+    confirmChartIsFiltered,
+    confirmChoroplethIsFiltered,
+    confirmDropdownOptions,
     expandChoroplethFilterDialog,
-    expandDataMapper, expandRichDataPanel,
-    gotoHomepage, selectChoroplethDropdownOption,
+    expandDataMapper,
+    expandRichDataPanel,
+    gotoHomepage,
+    selectChoroplethDropdownOption,
     setupInterceptions,
     waitUntilGeographyIsLoaded
 } from "../common_cy_functions/general";
@@ -57,7 +60,7 @@ When('I expand Rich Data Panel', () => {
     expandRichDataPanel();
 })
 
-Then(/^I confirm that "([^"]*)" is applied to "([^"]*)" as a site\-wide filter$/, function (filter, chartTitle) {
+Then(/^I confirm that "([^"]*)" is applied to "([^"]*)"$/, function (filter, chartTitle) {
     const filters = filter.split(':');
     confirmChartIsFiltered(filters[0], filters[1], chartTitle);
 });
@@ -66,3 +69,11 @@ Given('I am on the Wazimap Homepage Test View', () => {
     setupInterceptions(profiles, all_details, profile, themes, {}, [], profile_indicator_summary, profile_indicator_data);
     cy.visit("/?view=test");
 })
+
+When(/^I confirm that available subindicators are "([^"]*)" in Data Mapper$/, function (options) {
+    let optionsArr = options.split(',');
+    cy.get('.data-mapper').find('.subIndicator-item').should('have.length', optionsArr.length)
+    cy.get('.subIndicator-item').each(($div, index) => {
+        expect($div.text()).equal(optionsArr[index]);
+    })
+});

__tests__/gui/data_whitelist/profile.json

@@ -37,6 +37,10 @@
         "English",
         "Afrikaans",
         "This is ignored"
+      ],
+      "age": [
+        "20-24",
+        "30-35"
       ]
     },
     "views": {
@@ -52,6 +56,11 @@
             "English",
             "Sepedi",
             "isiXhosa"
+          ],
+          "age": [
+            "15-19",
+            "20-24",
+            "30-35"
           ]
         }
       }

__tests__/gui/data_whitelist/profile_indicator_summary.json

@@ -5,6 +5,7 @@
     "subcategories": {
       "Language": {
         "order": 242,
+        "id": 1,
         "name": "Language",
         "indicators": {
           "Language most spoken at home": {
@@ -108,6 +109,7 @@
       },
       "Migration": {
         "order": 243,
+        "id": 2,
         "name": "Migration",
         "indicators": {
           "Region of birth": {
@@ -211,6 +213,7 @@
       },
       "South African Citizenship": {
         "order": 246,
+        "id": 3,
         "name": "South African Citizenship",
         "indicators": {
           "Citizenship": {

__tests__/gui/filter_comparison_snackbar/profile_default_filters/profile.json

@@ -35,7 +35,8 @@
                 "age": [
                     "15-35 (ZA)",
                     "15-24 (Intl)",
-                    "30-35"
+                    "30-35",
+                    "15-19",
                 ],
                 "race": [
                     "Coloured",

src/js/api.js

@@ -14,6 +14,15 @@ export class API extends Observable {
         this.busyLoggingIn = false;
         this.failedLogins = 0;
         this.abortController = null;
+        this._restrictValues = {};
+    }
+
+    set restrictValues(value) {
+        this._restrictValues = value;
+    }
+
+    get restrictValues() {
+        return this._restrictValues;
     }
 
     getToken() {
@@ -33,6 +42,44 @@ export class API extends Observable {
         return this.loadUrl(url, this.abortController);
     }
 
+    getProfileWrapper(profileId, areaCode, version) {
+        const self = this;
+
+        return self.getProfile(profileId, areaCode, version).then(data => {
+            Object.keys(data.profile.profile_data).forEach(categoryName => {
+                const subcategories = data.profile.profile_data[categoryName].subcategories;
+                Object.keys(subcategories).forEach(subcategoryName => {
+                    const indicators = subcategories[subcategoryName].indicators;
+                    if (indicators != null) {
+                        Object.keys(indicators).forEach((indicator) => {
+                            let indicatorData = indicators[indicator];
+
+                            Object.keys(self.restrictValues).forEach(restrictKey => {
+                                // does not contain the key
+                                // or
+                                // key value is one of the restrictValue
+                                indicatorData.data = indicatorData.data.filter(x => Object.keys(x).indexOf(restrictKey) < 0 ||
+                                    self.restrictValues[restrictKey].indexOf(x[restrictKey]) >= 0);
+
+                                // filter metadata
+                                indicatorData.metadata.groups = indicatorData.metadata.groups.map(group => {
+                                    if (group.name === restrictKey) {
+                                        group.subindicators = group.subindicators.filter(element => self.restrictValues[restrictKey].includes(element));
+                                    }
+
+                                    return group;
+                                })
+
+                            })
+                        });
+                    }
+                })
+            })
+
+            return data;
+        });
+    }
+
     getProfileWithoutVersion(profileId, areaCode) {
         const url = `${this.baseUrl}/all_details/profile/${profileId}/geography/${areaCode}/?skip-children=true&format=json`;
         return this.loadUrl(url, this.abortController);
@@ -53,6 +100,24 @@ export class API extends Observable {
         return this.loadUrl(url, this.abortController);
     }
 
+    getIndicatorChildDataWrapper(profileId, areaCode, indicatorId) {
+        const self = this;
+
+        return self.getIndicatorChildData(profileId, areaCode, indicatorId).then(data => {
+            Object.keys(data).forEach((geo) => {
+                Object.keys(self.restrictValues).forEach(restrictKey => {
+                    // does not contain the key
+                    // or
+                    // key value is one of the restrictValue
+                    data[geo] = data[geo].filter(x => Object.keys(x).indexOf(restrictKey) < 0
+                        || self.restrictValues[restrictKey].indexOf(x[restrictKey]) >= 0);
+                })
+            });
+
+            return data;
+        });
+    }
+
     loadThemes(profileId) {
         const url = `${this.baseUrl}/profile/${profileId}/points/themes/?format=json`;
         return this.loadUrl(url);
@@ -193,6 +258,40 @@ export class API extends Observable {
         return this.loadUrl(url, this.abortController);
     }
 
+    async getIndicatorSummaryWrapper(profileId, areaCode, version) {
+        const self = this;
+
+        return self.getIndicatorSummary(profileId, areaCode, version).then(data => {
+            Object.keys(data).forEach((category) => {
+                let categoryData = data[category];
+                let subCategories = categoryData.subcategories;
+
+                Object.keys(subCategories).forEach((subCategory) => {
+                    let subCategoryData = subCategories[subCategory];
+                    let indicators = subCategoryData.indicators;
+
+                    if (indicators != null) {
+                        Object.keys(indicators).forEach((indicator) => {
+                            let indicatorData = indicators[indicator];
+
+                            Object.keys(self.restrictValues).forEach(restrictKey => {
+                                indicatorData.metadata.groups = indicatorData.metadata.groups.map(group => {
+                                    if (group.name === restrictKey) {
+                                        group.subindicators = group.subindicators.filter(element => self.restrictValues[restrictKey].includes(element));
+                                    }
+
+                                    return group;
+                                })
+                            })
+                        });
+                    }
+                });
+            });
+
+            return data;
+        });
+    }
+
     cancelAndInitAbortController() {
         if (this.abortController !== null) {
             //on first request this.abortController is null