Merge branch 'filter-segments'

FrancescoE · Jun 25, 2018 · a3d4bd1 · a3d4bd1
2 parents 1880a42 + 915d51b
commit a3d4bd1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/static/src/css/sass/microsoft-core.scss b/static/src/css/sass/microsoft-core.scss
@@ -1,14 +1,6 @@
 
-.advanced-filter-searchbox {
-    .filters-container {
-        display: none;
-    }
-
-    .search-settings {
-        display: none;
-    }
-
-    .data-sample-checkbox-container {
+.filter-wrapper {
+    .filter-activities {
         display: none;
     }
 }
@@ -22,7 +14,7 @@ body.review {
         display: none;
     }
 
-    #advanced-filter, .advanced-filter-searchbox.searchbox {
+    #advanced-filter, .filter-wrapper {
         display: none;
     }
 }

diff --git a/static/src/js/cat_source/microsoft-core.extension.js b/static/src/js/cat_source/microsoft-core.extension.js
@@ -73,15 +73,15 @@
             let storedState = SegmentFilter.getStoredState();
             if (config.isReview && !storedState.reactState) {
                 return {
-                    searchSettingsOpen: false,
                     selectedStatus: '',
-                    samplingEnabled: true,
                     samplingType: filter_type,
                     samplingSize: filte_size,
                     filtering: false,
                     filteredCount: 0,
                     segmentsArray: [],
-                    moreFilters: this.moreFilters
+                    moreFilters: this.moreFilters,
+                    filtersEnabled: true,
+                    dataSampleEnabled: true,
 
                 }
             } else {