From 8ef5244271e6a5505046d2013fe3ea9295e52f1f Mon Sep 17 00:00:00 2001 From: Ifycode Date: Sat, 30 Jul 2022 18:39:19 +0100 Subject: [PATCH 01/11] Add ussd checkbox to dropdown UI, leave sources unchecked by default --- legacy/app/common/services/post-filters.service.js | 2 +- .../app/map/post-toolbar/filters/filter-form.directive.js | 2 ++ .../app/map/post-toolbar/filters/filter-source.directive.js | 3 +++ legacy/app/map/post-toolbar/filters/filter-source.html | 6 ++++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/legacy/app/common/services/post-filters.service.js b/legacy/app/common/services/post-filters.service.js index f5631c72fb..eb74c2f83c 100644 --- a/legacy/app/common/services/post-filters.service.js +++ b/legacy/app/common/services/post-filters.service.js @@ -204,7 +204,7 @@ function PostFiltersService(_, FormEndpoint, TagEndpoint, $q) { form: _.pluck(forms, 'id'), set: [], user: false, - source: ['sms', 'twitter','web', 'email'] + source: [] }; } diff --git a/legacy/app/map/post-toolbar/filters/filter-form.directive.js b/legacy/app/map/post-toolbar/filters/filter-form.directive.js index e5570f96c5..df08551bab 100644 --- a/legacy/app/map/post-toolbar/filters/filter-form.directive.js +++ b/legacy/app/map/post-toolbar/filters/filter-form.directive.js @@ -54,6 +54,8 @@ function FormSelectDirective($rootScope, SurveysSdk, TranslationService) { } function renderModelValue() { + console.log('scope.selectedForms: ', scope.selectedForms) + // console.log('ngModel.$viewValue: ', ngModel.$viewValue) // Update selectedForms w/o breaking references used by checklist-model Array.prototype.splice.apply(scope.selectedForms, [0, scope.selectedForms.length].concat(ngModel.$viewValue)); } diff --git a/legacy/app/map/post-toolbar/filters/filter-source.directive.js b/legacy/app/map/post-toolbar/filters/filter-source.directive.js index ba04a6919f..bce188741b 100644 --- a/legacy/app/map/post-toolbar/filters/filter-source.directive.js +++ b/legacy/app/map/post-toolbar/filters/filter-source.directive.js @@ -25,6 +25,9 @@ function SourceSelectDirective($rootScope) { function renderModelValue() { // Update selectedSources w/o breaking references used by checklist-model + // scope.selectedSources.push('ussd'); + console.log('scope.selectedSources: ', scope.selectedSources) + console.log('What happens?: ', Array.prototype.splice.apply(scope.selectedSources, [0, scope.selectedSources.length].concat(ngModel.$viewValue))) Array.prototype.splice.apply(scope.selectedSources, [0, scope.selectedSources.length].concat(ngModel.$viewValue)); } diff --git a/legacy/app/map/post-toolbar/filters/filter-source.html b/legacy/app/map/post-toolbar/filters/filter-source.html index 224397585d..47c1296da3 100644 --- a/legacy/app/map/post-toolbar/filters/filter-source.html +++ b/legacy/app/map/post-toolbar/filters/filter-source.html @@ -25,6 +25,12 @@ Web +
+ +
From 0d25fab63ab4074951c439a87a305a8c6d760c38 Mon Sep 17 00:00:00 2001 From: Ifycode Date: Sat, 30 Jul 2022 19:25:34 +0100 Subject: [PATCH 02/11] Clean ups --- legacy/app/map/post-toolbar/filters/filter-form.directive.js | 2 -- legacy/app/map/post-toolbar/filters/filter-source.directive.js | 3 --- 2 files changed, 5 deletions(-) diff --git a/legacy/app/map/post-toolbar/filters/filter-form.directive.js b/legacy/app/map/post-toolbar/filters/filter-form.directive.js index df08551bab..e5570f96c5 100644 --- a/legacy/app/map/post-toolbar/filters/filter-form.directive.js +++ b/legacy/app/map/post-toolbar/filters/filter-form.directive.js @@ -54,8 +54,6 @@ function FormSelectDirective($rootScope, SurveysSdk, TranslationService) { } function renderModelValue() { - console.log('scope.selectedForms: ', scope.selectedForms) - // console.log('ngModel.$viewValue: ', ngModel.$viewValue) // Update selectedForms w/o breaking references used by checklist-model Array.prototype.splice.apply(scope.selectedForms, [0, scope.selectedForms.length].concat(ngModel.$viewValue)); } diff --git a/legacy/app/map/post-toolbar/filters/filter-source.directive.js b/legacy/app/map/post-toolbar/filters/filter-source.directive.js index bce188741b..ba04a6919f 100644 --- a/legacy/app/map/post-toolbar/filters/filter-source.directive.js +++ b/legacy/app/map/post-toolbar/filters/filter-source.directive.js @@ -25,9 +25,6 @@ function SourceSelectDirective($rootScope) { function renderModelValue() { // Update selectedSources w/o breaking references used by checklist-model - // scope.selectedSources.push('ussd'); - console.log('scope.selectedSources: ', scope.selectedSources) - console.log('What happens?: ', Array.prototype.splice.apply(scope.selectedSources, [0, scope.selectedSources.length].concat(ngModel.$viewValue))) Array.prototype.splice.apply(scope.selectedSources, [0, scope.selectedSources.length].concat(ngModel.$viewValue)); } From 96fb35db8293be91eee8439a7336811abff0b990 Mon Sep 17 00:00:00 2001 From: Ifycode Date: Sun, 31 Jul 2022 20:01:14 +0100 Subject: [PATCH 03/11] Fix failing tests --- .../main/post/views/filters/filter-post-order-asc-desc.spec.js | 2 +- .../views/filters/filter-post-sorting-options.directive.spec.js | 2 +- .../post/views/filters/filter-unlocked-on-top.directive.spec.js | 2 +- .../unit/main/post/views/filters/post-filters.service.spec.js | 2 +- .../views/filters/sort-and-filter-counter.directive.spec.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/legacy/test/unit/main/post/views/filters/filter-post-order-asc-desc.spec.js b/legacy/test/unit/main/post/views/filters/filter-post-order-asc-desc.spec.js index cc8b7a68f2..284f8a101b 100644 --- a/legacy/test/unit/main/post/views/filters/filter-post-order-asc-desc.spec.js +++ b/legacy/test/unit/main/post/views/filters/filter-post-order-asc-desc.spec.js @@ -24,7 +24,7 @@ describe('filter post order ASC/DESC directive', function () { form: [], set: [], user: false, - source: ['sms', 'twitter','web', 'email'] + source: [] }; beforeEach(function () { fixture.setBase('mocked_backend/api/v3'); diff --git a/legacy/test/unit/main/post/views/filters/filter-post-sorting-options.directive.spec.js b/legacy/test/unit/main/post/views/filters/filter-post-sorting-options.directive.spec.js index f1551eebd8..13f0b5c012 100644 --- a/legacy/test/unit/main/post/views/filters/filter-post-sorting-options.directive.spec.js +++ b/legacy/test/unit/main/post/views/filters/filter-post-sorting-options.directive.spec.js @@ -24,7 +24,7 @@ describe('filter post sorting options on top directive', function () { form: [], set: [], user: false, - source: ['sms', 'twitter','web', 'email'] + source: [] }; beforeEach(function () { fixture.setBase('mocked_backend/api/v3'); diff --git a/legacy/test/unit/main/post/views/filters/filter-unlocked-on-top.directive.spec.js b/legacy/test/unit/main/post/views/filters/filter-unlocked-on-top.directive.spec.js index 1a06dcdc69..983a1c22f6 100644 --- a/legacy/test/unit/main/post/views/filters/filter-unlocked-on-top.directive.spec.js +++ b/legacy/test/unit/main/post/views/filters/filter-unlocked-on-top.directive.spec.js @@ -40,7 +40,7 @@ describe('filter unlocked on top directive', function () { form: [], set: [], user: false, - source: ['sms', 'twitter','web', 'email'] + source: [] }; // $scope.models = {}; // $scope.models.modelUnlocked = 'true'; diff --git a/legacy/test/unit/main/post/views/filters/post-filters.service.spec.js b/legacy/test/unit/main/post/views/filters/post-filters.service.spec.js index 9b33bc90fa..16fb98f796 100644 --- a/legacy/test/unit/main/post/views/filters/post-filters.service.spec.js +++ b/legacy/test/unit/main/post/views/filters/post-filters.service.spec.js @@ -82,7 +82,7 @@ describe('Post Filters Service', function () { form: ['none'], set: [], user: false, - source: ['sms', 'twitter', 'web', 'email'], + source: [], saved_search: '', orderby: 'created', order: 'desc', diff --git a/legacy/test/unit/main/post/views/filters/sort-and-filter-counter.directive.spec.js b/legacy/test/unit/main/post/views/filters/sort-and-filter-counter.directive.spec.js index d66d6eea1f..ecf2727ab1 100644 --- a/legacy/test/unit/main/post/views/filters/sort-and-filter-counter.directive.spec.js +++ b/legacy/test/unit/main/post/views/filters/sort-and-filter-counter.directive.spec.js @@ -24,7 +24,7 @@ describe('filter unlocked on top directive', function () { form: [], set: [], user: false, - source: ['sms', 'twitter','web', 'email'] + source: [] }; beforeEach(function () { fixture.setBase('mocked_backend/api/v3'); From 725c28ac3cba340a79454ebc3837300e9e1d1ed9 Mon Sep 17 00:00:00 2001 From: David Losada Carballo Date: Sun, 7 Aug 2022 18:48:53 +0300 Subject: [PATCH 04/11] chore: add whatsapp in the sources filtering options --- legacy/app/map/post-toolbar/filters/filter-source.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/legacy/app/map/post-toolbar/filters/filter-source.html b/legacy/app/map/post-toolbar/filters/filter-source.html index 47c1296da3..8e999241d1 100644 --- a/legacy/app/map/post-toolbar/filters/filter-source.html +++ b/legacy/app/map/post-toolbar/filters/filter-source.html @@ -25,6 +25,12 @@ Web +
+ +
-
+
-
+