Merge pull request superdesk#122 from tomaskikutis/clear-filter-value…

…s-upon-clicking-the-button
MarkLark86 · Apr 22, 2020 · 32f8de4 · 32f8de4
1 parent fee9a2d
commit 32f8de4
Show file tree

Hide file tree

Showing 12 changed files with 106 additions and 10 deletions.
diff --git a/client/content_publishing_report/controllers/ContentPublishingReportController.js b/client/content_publishing_report/controllers/ContentPublishingReportController.js
@@ -50,6 +50,10 @@ export function ContentPublishingReportController(
     $interpolate,
     reportConfigs
 ) {
+    function resetParams() {
+        $scope.currentParams = _.cloneDeep($scope.defaultReportParams);
+    }
+
     const reportName = 'content_publishing_report';
 
     /**
@@ -70,6 +74,12 @@ export function ContentPublishingReportController(
 
         this.chart = chartConfig.newConfig('chart', _.get($scope, 'currentParams.params.chart.type'));
         $scope.updateChartConfig();
+
+        document.addEventListener('sda-source-filters--clear', resetParams);
+
+        $scope.$on('$destroy', () => {
+            document.removeEventListener('sda-source-filters--clear', resetParams);
+        });
     };
 
     /**
@@ -199,7 +209,7 @@ export function ContentPublishingReportController(
         if (_.get(newReport, '_id')) {
             $scope.currentParams = _.cloneDeep(savedReports.currentReport);
         } else {
-            $scope.currentParams = _.cloneDeep($scope.defaultReportParams);
+            resetParams();
         }
     }, true);
 

diff --git a/client/desk_activity_report/controllers/DeskActivityReportController.js b/client/desk_activity_report/controllers/DeskActivityReportController.js
@@ -57,6 +57,10 @@ export function DeskActivityReportController(
     desks,
     reportConfigs
 ) {
+    function resetParams() {
+        $scope.currentParams = _.cloneDeep($scope.defaultReportParams);
+    }
+
     const reportName = 'desk_activity_report';
 
     /**
@@ -97,6 +101,12 @@ export function DeskActivityReportController(
             'states',
             'ingest_providers',
         ];
+
+        document.addEventListener('sda-source-filters--clear', resetParams);
+
+        $scope.$on('$destroy', () => {
+            document.removeEventListener('sda-source-filters--clear', resetParams);
+        });
     };
 
     this.updateConfig = () => {
@@ -250,7 +260,7 @@ export function DeskActivityReportController(
         if (_.get(newReport, '_id')) {
             $scope.currentParams = _.cloneDeep(savedReports.currentReport);
         } else {
-            $scope.currentParams = _.cloneDeep($scope.defaultReportParams);
+            resetParams();
         }
 
         $scope.updateChartConfig();

diff --git a/client/directives/AnalyticsContainer.js b/client/directives/AnalyticsContainer.js
@@ -290,6 +290,8 @@ export function AnalyticsContainer() {
 
                 $scope.onClearFilters = () => {
                     $scope.changeReportParams();
+
+                    document.dispatchEvent(new Event('sda-source-filters--clear'));
                 };
 
                 $scope.beforeGenerateChart = () => {

diff --git a/client/featuremedia_updates_report/controllers/FeaturemediaUpdatesReportController.js b/client/featuremedia_updates_report/controllers/FeaturemediaUpdatesReportController.js
@@ -48,6 +48,10 @@ export function FeaturemediaUpdatesReportController(
     chartConfig,
     reportConfigs
 ) {
+    function resetParams() {
+        $scope.currentParams = _.cloneDeep($scope.defaultReportParams);
+    }
+
     const reportName = 'featuremedia_updates_report';
 
     /**
@@ -74,6 +78,12 @@ export function FeaturemediaUpdatesReportController(
 
         this.chart = chartConfig.newConfig('chart', 'table');
         $scope.updateChartConfig();
+
+        document.addEventListener('sda-source-filters--clear', resetParams);
+
+        $scope.$on('$destroy', () => {
+            document.removeEventListener('sda-source-filters--clear', resetParams);
+        });
     };
 
     /**
@@ -157,7 +167,7 @@ export function FeaturemediaUpdatesReportController(
         if (_.get(newReport, '_id')) {
             $scope.currentParams = _.cloneDeep(savedReports.currentReport);
         } else {
-            $scope.currentParams = _.cloneDeep($scope.defaultReportParams);
+            resetParams();
         }
     }, true);
 

diff --git a/client/planning_usage_report/controllers/PlanningUsageReportController.js b/client/planning_usage_report/controllers/PlanningUsageReportController.js
@@ -45,6 +45,10 @@ export function PlanningUsageReportController(
     $q,
     reportConfigs
 ) {
+    function resetParams() {
+        $scope.currentParams = _.cloneDeep($scope.defaultReportParams);
+    }
+
     const reportName = 'planning_usage_report';
 
     /**
@@ -86,6 +90,12 @@ export function PlanningUsageReportController(
 
         this.chart = chartConfig.newConfig(reportName, 'bar');
         $scope.updateChartConfig();
+
+        document.addEventListener('sda-source-filters--clear', resetParams);
+
+        $scope.$on('$destroy', () => {
+            document.removeEventListener('sda-source-filters--clear', resetParams);
+        });
     };
 
     /**
@@ -162,7 +172,7 @@ export function PlanningUsageReportController(
         if (_.get(newReport, '_id')) {
             $scope.currentParams = _.cloneDeep(savedReports.currentReport);
         } else {
-            $scope.currentParams = _.cloneDeep($scope.defaultReportParams);
+            resetParams();
         }
     }, true);
 

diff --git a/client/production_time_report/controllers/ProductionTimeReportController.js b/client/production_time_report/controllers/ProductionTimeReportController.js
@@ -52,6 +52,10 @@ export function ProductionTimeReportController(
     $q,
     reportConfigs
 ) {
+    function resetParams() {
+        $scope.currentParams = _.cloneDeep($scope.defaultReportParams);
+    }
+
     const reportName = 'production_time_report';
 
     /**
@@ -91,6 +95,12 @@ export function ProductionTimeReportController(
             SOURCE_FILTERS.STATS.DESK_TRANSITIONS.ENTER,
             SOURCE_FILTERS.STATS.DESK_TRANSITIONS.EXIT,
         ];
+
+        document.addEventListener('sda-source-filters--clear', resetParams);
+
+        $scope.$on('$destroy', () => {
+            document.removeEventListener('sda-source-filters--clear', resetParams);
+        });
     };
 
     /**
@@ -193,7 +203,7 @@ export function ProductionTimeReportController(
         if (_.get(newReport, '_id')) {
             $scope.currentParams = _.cloneDeep(savedReports.currentReport);
         } else {
-            $scope.currentParams = _.cloneDeep($scope.defaultReportParams);
+            resetParams();
         }
 
         $scope.updateChartConfig();

diff --git a/client/publishing_performance_report/controllers/PublishingPerformanceReportController.js b/client/publishing_performance_report/controllers/PublishingPerformanceReportController.js
@@ -51,6 +51,10 @@ export function PublishingPerformanceReportController(
     $interpolate,
     reportConfigs
 ) {
+    function resetParams() {
+        $scope.currentParams = _.cloneDeep($scope.defaultReportParams);
+    }
+
     const reportName = 'publishing_performance_report';
 
     /**
@@ -78,6 +82,12 @@ export function PublishingPerformanceReportController(
 
         this.chart = chartConfig.newConfig('chart', _.get($scope, 'currentParams.params.chart.type'));
         $scope.updateChartConfig();
+
+        document.addEventListener('sda-source-filters--clear', resetParams);
+
+        $scope.$on('$destroy', () => {
+            document.removeEventListener('sda-source-filters--clear', resetParams);
+        });
     };
 
     /**
@@ -203,7 +213,7 @@ export function PublishingPerformanceReportController(
         if (_.get(newReport, '_id')) {
             $scope.currentParams = _.cloneDeep(savedReports.currentReport);
         } else {
-            $scope.currentParams = _.cloneDeep($scope.defaultReportParams);
+            resetParams();
         }
     }, true);
 

diff --git a/client/saved_reports/views/save-generate-report.html b/client/saved_reports/views/save-generate-report.html
@@ -14,7 +14,7 @@
                     ng-click="clearFilters()"
                     ng-disabled="!isDirty()"
                     translate
-            >Clear Filters</button>
+            >Reset Filters</button>
             <button class="btn btn--primary"
                     ng-click="generateReport()"
                     translate

diff --git a/client/search/directives/SourceFilters.js b/client/search/directives/SourceFilters.js
@@ -188,6 +188,14 @@ export function SourceFilters(
             paddingBottom: '=?',
         },
         link: function(scope) {
+            function clearFilters() {
+                Object.keys(scope.filters).forEach((key) => {
+                    const filter = scope.filters[key];
+
+                    filter.selected = [];
+                    filter.exclude = false;
+                });
+            }
             /**
              * @ngdoc method
              * @name SourceFilters#init
@@ -228,6 +236,8 @@ export function SourceFilters(
                         });
 
                         scope.flags.ready = true;
+
+                        document.addEventListener('sda-source-filters--clear', clearFilters);
                     });
             };
 
@@ -554,6 +564,10 @@ export function SourceFilters(
             };
 
             this.init();
+
+            scope.$on('$destroy', () => {
+                document.removeEventListener('sda-source-filters--clear', clearFilters);
+            });
         },
     };
 }
diff --git a/client/search/index.js b/client/search/index.js
@@ -21,7 +21,7 @@ import * as directives from './directives';
 angular.module('superdesk.analytics.search', [])
     .service('searchReport', svc.SearchReport)
 
-    .directive('sdaSourceFilters', directives.SourceFilters)
+    .directive('sdaSourceFilters', directives.SourceFilters) // !!! used in superdesk-aap project
     .directive('sdaDateFilters', directives.DateFilters)
 
     .directive('sdaPreviewDateFilter', directives.PreviewDateFilter)

diff --git a/client/update_time_report/controllers/UpdateTimeReportController.js b/client/update_time_report/controllers/UpdateTimeReportController.js
@@ -47,6 +47,10 @@ export function UpdateTimeReportController(
     chartConfig,
     reportConfigs
 ) {
+    function resetParams() {
+        $scope.currentParams = _.cloneDeep($scope.defaultReportParams);
+    }
+
     const reportName = 'update_time_report';
 
     /**
@@ -85,6 +89,12 @@ export function UpdateTimeReportController(
 
         this.chart = chartConfig.newConfig('chart', 'table');
         $scope.updateChartConfig();
+
+        document.addEventListener('sda-source-filters--clear', resetParams);
+
+        $scope.$on('$destroy', () => {
+            document.removeEventListener('sda-source-filters--clear', resetParams);
+        });
     };
 
     /**
@@ -176,7 +186,7 @@ export function UpdateTimeReportController(
         if (_.get(newReport, '_id')) {
             $scope.currentParams = _.cloneDeep(savedReports.currentReport);
         } else {
-            $scope.currentParams = _.cloneDeep($scope.defaultReportParams);
+            resetParams();
         }
     }, true);
 

diff --git a/client/user_activity_report/controllers/UserActivityReportController.js b/client/user_activity_report/controllers/UserActivityReportController.js
@@ -64,6 +64,10 @@ export function UserActivityReportController(
     $compile,
     reportConfigs
 ) {
+    function resetParams() {
+        $scope.currentParams = _.cloneDeep($scope.defaultReportParams);
+    }
+
     const reportName = 'user_activity_report';
 
     /**
@@ -103,6 +107,12 @@ export function UserActivityReportController(
 
         $scope.translatedOperations = getTranslatedOperations(gettext);
         $scope.selectedItem = null;
+
+        document.addEventListener('sda-source-filters--clear', resetParams);
+
+        $scope.$on('$destroy', () => {
+            document.removeEventListener('sda-source-filters--clear', resetParams);
+        });
     };
 
     /**
@@ -204,7 +214,7 @@ export function UserActivityReportController(
         if (_.get(newReport, '_id')) {
             $scope.currentParams = _.cloneDeep(savedReports.currentReport);
         } else {
-            $scope.currentParams = _.cloneDeep($scope.defaultReportParams);
+            resetParams();
         }
 
         $scope.updateChartConfig();