From 475809c40225901bfa363690a1a3ae4740548684 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 23 May 2019 11:46:41 +0100
Subject: Do not focus on title on duplicate list removal.

Sometimes this can be a long way down,
if e.g. extra Open311 questions above.
---
 web/js/duplicates.js | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'web/js/duplicates.js')

diff --git a/web/js/duplicates.js b/web/js/duplicates.js
index 723c357e9..ff1f0bd47 100644
--- a/web/js/duplicates.js
+++ b/web/js/duplicates.js
@@ -127,23 +127,14 @@
         current_duplicate_markers = markers;
     }
 
-    function remove_duplicate_list(cb) {
-        var animations = [];
-
-        animations.push( $.Deferred() );
+    function remove_duplicate_list() {
         $('#js-duplicate-reports').slideUp(function(){
             $(this).addClass('hidden');
             $(this).find('ul').empty();
-            animations[0].resolve();
         });
         if ( $('#problem_form').length ) {
-            animations.push( $.Deferred() );
-            $('.js-hide-if-invalid-category').slideDown(function(){
-                animations[1].resolve();
-            });
+            $('.js-hide-if-invalid-category').slideDown();
         }
-
-        $.when.apply(this, animations).then(cb);
     }
 
     function remove_duplicate_pins() {
@@ -180,9 +171,7 @@
     $('.js-hide-duplicate-suggestions').on('click', function(e){
         e.preventDefault();
         remove_duplicate_pins();
-        remove_duplicate_list(function(){
-            $('#form_title').focus();
-        });
+        remove_duplicate_list();
     });
 
 })();
-- 
cgit v1.2.3


From d6f264c35a4aef78e1c9df75a63aee0eecbd9a7b Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 23 May 2019 12:51:45 +0100
Subject: Have duplicate and asset messages work together.

---
 web/js/duplicates.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'web/js/duplicates.js')

diff --git a/web/js/duplicates.js b/web/js/duplicates.js
index ff1f0bd47..0844cb5f3 100644
--- a/web/js/duplicates.js
+++ b/web/js/duplicates.js
@@ -36,7 +36,7 @@
             data: url_params,
             dataType: 'json'
         }).done(function(response) {
-            if ( response.pins.length ){
+            if (response.pins.length && take_effect()) {
                 render_duplicate_list(response);
                 render_duplicate_pins(response);
             } else {
@@ -132,7 +132,7 @@
             $(this).addClass('hidden');
             $(this).find('ul').empty();
         });
-        if ( $('#problem_form').length ) {
+        if ($('#problem_form').length && take_effect()) {
             $('.js-hide-if-invalid-category').slideDown();
         }
     }
@@ -158,6 +158,17 @@
         refresh_duplicate_list();
     }
 
+    function take_effect() {
+        // We do not want to do anything if any other message is being shown
+        if (document.getElementById('js-category-stopper')) {
+            return false;
+        }
+        if ($('.js-responsibility-message:visible').length) {
+            return false;
+        }
+        return true;
+    }
+
     // Want to show potential duplicates when a regular user starts a new
     // report, or changes the category/location of a partial report.
     $(fixmystreet).on('report_new:category_change', refresh_duplicate_list);
-- 
cgit v1.2.3


From c30ae857af7f2e2bccf974da34cf2f3868e7b7f2 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 4 Jul 2019 21:12:12 +0100
Subject: Improve map JavaScript defensiveness.

Add more checking for map things so e.g. on a skipped map page
we stop getting JavaScript errors given there is no map present.
---
 web/js/duplicates.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'web/js/duplicates.js')

diff --git a/web/js/duplicates.js b/web/js/duplicates.js
index 0844cb5f3..3ed7e6079 100644
--- a/web/js/duplicates.js
+++ b/web/js/duplicates.js
@@ -121,6 +121,9 @@
     }
 
     function render_duplicate_pins(api_response) {
+        if (!fixmystreet.markers) {
+            return;
+        }
         var markers = fixmystreet.maps.markers_list( api_response.pins, true );
         fixmystreet.markers.removeFeatures( current_duplicate_markers );
         fixmystreet.markers.addFeatures( markers );
@@ -138,6 +141,9 @@
     }
 
     function remove_duplicate_pins() {
+        if (!fixmystreet.markers) {
+            return;
+        }
         fixmystreet.markers.removeFeatures( current_duplicate_markers );
     }
 
-- 
cgit v1.2.3


From ea7c5b5ff6657af974bc64e1fa4618cb6a241e7b Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 7 Aug 2019 09:59:51 +0100
Subject: Have duplicate suggestion & assets coexist better.

---
 web/js/duplicates.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'web/js/duplicates.js')

diff --git a/web/js/duplicates.js b/web/js/duplicates.js
index 3ed7e6079..023808a14 100644
--- a/web/js/duplicates.js
+++ b/web/js/duplicates.js
@@ -8,7 +8,11 @@
     // but undefined on new report page.
     var report_id = $("#report_inspect_form .js-report-id").text() || undefined;
 
-    function refresh_duplicate_list() {
+    function refresh_duplicate_list(evt, params) {
+        if (params && params.skip_duplicates) {
+            return;
+        }
+
         var category = $('select[name="category"]').val();
         if (category === '-- Pick a category --') {
             return;
@@ -128,6 +132,14 @@
         fixmystreet.markers.removeFeatures( current_duplicate_markers );
         fixmystreet.markers.addFeatures( markers );
         current_duplicate_markers = markers;
+
+        // Hide any asset layer that might be visible and get confused with the duplicates
+        var layers = fixmystreet.map.getLayersBy('assets', true);
+        for (var i = 0; i<layers.length; i++) {
+            if (!layers[i].fixmystreet.always_visible && layers[i].getVisibility()) {
+                layers[i].setVisibility(false);
+            }
+        }
     }
 
     function remove_duplicate_list() {
@@ -145,6 +157,10 @@
             return;
         }
         fixmystreet.markers.removeFeatures( current_duplicate_markers );
+
+        // In order to reinstate a hidden assets layer, let's pretend we've
+        // just picked the category anew, but skip ourselves
+        $(fixmystreet).trigger('report_new:category_change', { skip_duplicates: true });
     }
 
     function inspect_form_state_change() {
-- 
cgit v1.2.3


From db511d53e549cf30581f80c5da8a80057bd12c01 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 6 Aug 2019 14:18:06 +0100
Subject: Hide category extras when dupe suggestions shown.

---
 web/js/duplicates.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'web/js/duplicates.js')

diff --git a/web/js/duplicates.js b/web/js/duplicates.js
index 3ed7e6079..b8bb35246 100644
--- a/web/js/duplicates.js
+++ b/web/js/duplicates.js
@@ -64,6 +64,7 @@
         $('#js-duplicate-reports').hide().removeClass('hidden').slideDown();
         if ( $('#problem_form').length ) {
             $('.js-hide-if-invalid-category').slideUp();
+            $('.js-hide-if-invalid-category_extras').slideUp();
         }
 
         // Highlight map pin when hovering associated list item.
@@ -137,6 +138,7 @@
         });
         if ($('#problem_form').length && take_effect()) {
             $('.js-hide-if-invalid-category').slideDown();
+            $('.js-hide-if-invalid-category_extras').slideDown();
         }
     }
 
-- 
cgit v1.2.3


From 8ea53bc313bdbbc3e1289ef2eaaba1e032feef05 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 22 Aug 2019 18:02:25 +0100
Subject: Dismiss duplicate selection UI when returning to map on mobile

---
 web/js/duplicates.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'web/js/duplicates.js')

diff --git a/web/js/duplicates.js b/web/js/duplicates.js
index 188459565..da0f7d176 100644
--- a/web/js/duplicates.js
+++ b/web/js/duplicates.js
@@ -209,4 +209,10 @@
         remove_duplicate_list();
     });
 
+    fixmystreet.duplicates = {
+        hide: function() {
+            remove_duplicate_pins();
+            remove_duplicate_list();
+        }
+    };
 })();
-- 
cgit v1.2.3


From 430d09533846ded9bdc03bc7f378d3e796776ab4 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Fri, 23 Aug 2019 16:34:00 +0100
Subject: Only show duplicate suggestions once per category change on mobile

---
 web/js/duplicates.js | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'web/js/duplicates.js')

diff --git a/web/js/duplicates.js b/web/js/duplicates.js
index da0f7d176..a8aceb9e3 100644
--- a/web/js/duplicates.js
+++ b/web/js/duplicates.js
@@ -4,6 +4,11 @@
     // quickly remove them when we’re finished showing duplicates.
     var current_duplicate_markers;
 
+    // keep track of whether the suggestion UI has already been dismissed
+    // for this category
+    var dismissed = false;
+    var dismissed_category = null;
+
     // Report ID will be available on report inspect page,
     // but undefined on new report page.
     var report_id = $("#report_inspect_form .js-report-id").text() || undefined;
@@ -35,6 +40,17 @@
             url_params.pin_size = 'normal';
         }
 
+        if (category && params && params.check_duplicates_dismissal ) {
+            dismissed = category === dismissed_category;
+            dismissed_category = category;
+
+            if (!take_effect()) {
+                remove_duplicate_pins();
+                remove_duplicate_list();
+                return;
+            }
+        }
+
         $.ajax({
             url: nearby_url,
             data: url_params,
@@ -190,6 +206,10 @@
         if ($('.js-responsibility-message:visible').length) {
             return false;
         }
+        // On mobile only show once per category
+        if ($('html').hasClass('mobile') && dismissed) {
+            return false;
+        }
         return true;
     }
 
@@ -205,14 +225,14 @@
 
     $('.js-hide-duplicate-suggestions').on('click', function(e){
         e.preventDefault();
-        remove_duplicate_pins();
-        remove_duplicate_list();
+        fixmystreet.duplicates.hide();
     });
 
     fixmystreet.duplicates = {
         hide: function() {
             remove_duplicate_pins();
             remove_duplicate_list();
+            dismissed = true;
         }
     };
 })();
-- 
cgit v1.2.3


From b9bf7359af5ae992f09ec770681fa7354ccb68eb Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 14 Oct 2019 14:06:41 +0100
Subject: Fix issue loading inspector duplicates on /around.

As there are two category drop-downs in this situation (one in the
hidden reporting form, one in the inspect form), the correct entry
needs to be specified.
---
 web/js/duplicates.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'web/js/duplicates.js')

diff --git a/web/js/duplicates.js b/web/js/duplicates.js
index a8aceb9e3..ede22dc18 100644
--- a/web/js/duplicates.js
+++ b/web/js/duplicates.js
@@ -13,12 +13,14 @@
     // but undefined on new report page.
     var report_id = $("#report_inspect_form .js-report-id").text() || undefined;
 
-    function refresh_duplicate_list(evt, params) {
+    function refresh_duplicate_list(evt, params, category) {
         if (params && params.skip_duplicates) {
             return;
         }
 
-        var category = $('select[name="category"]').val();
+        if (!category) {
+            category = $('select[name="category"]').val();
+        }
         if (category === '-- Pick a category --') {
             return;
         }
@@ -195,7 +197,8 @@
         if (!!duplicate_of) {
             return;
         }
-        refresh_duplicate_list();
+        var category = $("#report_inspect_form [name=category]").val();
+        refresh_duplicate_list(undefined, {}, category);
     }
 
     function take_effect() {
-- 
cgit v1.2.3


From 363cbb0ea0acf35a5bf56fcef6b3d60acc4f5fe7 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 16 Jan 2020 15:51:44 +0000
Subject: Display inline map for duplicate suggestions on mobile

For #2668.
---
 web/js/duplicates.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'web/js/duplicates.js')

diff --git a/web/js/duplicates.js b/web/js/duplicates.js
index ede22dc18..22f800694 100644
--- a/web/js/duplicates.js
+++ b/web/js/duplicates.js
@@ -42,6 +42,10 @@
             url_params.pin_size = 'normal';
         }
 
+        if ($('html').hasClass('mobile')) {
+            url_params.inline_maps = 1;
+        }
+
         if (category && params && params.check_duplicates_dismissal ) {
             dismissed = category === dismissed_category;
             dismissed_category = category;
-- 
cgit v1.2.3


From 6525931fb9194e90a4430660086a5e981567fb7f Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Fri, 17 Jan 2020 10:33:11 +0000
Subject: =?UTF-8?q?Don=E2=80=99t=20highlight=20duplicate=20pins=20on=20mob?=
 =?UTF-8?q?ile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The presence of the ‘mouseenter’ handler meant two taps were required
to expand the report preview.
---
 web/js/duplicates.js | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'web/js/duplicates.js')

diff --git a/web/js/duplicates.js b/web/js/duplicates.js
index 22f800694..4f1574c0f 100644
--- a/web/js/duplicates.js
+++ b/web/js/duplicates.js
@@ -93,15 +93,21 @@
             $('.js-hide-if-invalid-category_extras').slideUp();
         }
 
-        // Highlight map pin when hovering associated list item.
-        var timeout;
-        $reports.on('mouseenter', function(){
-            var id = parseInt( $(this).data('reportId'), 10 );
-            clearTimeout( timeout );
-            fixmystreet.maps.markers_highlight( id );
-        }).on('mouseleave', function(){
-            timeout = setTimeout( fixmystreet.maps.markers_highlight, 50 );
-        });
+        if (!fixmystreet.map.events.extensions.buttonclick.isDeviceTouchCapable) {
+            // Highlight map pin when hovering associated list item.
+            // (not on touchscreens though because a) the 'mouseenter' handler means
+            // two taps are required on the 'read more' button - one to highlight
+            // the list item and another to activate the button- and b) the pins
+            // might be scrolled off the top of the screen anyway e.g. on phones)
+            var timeout;
+            $reports.on('mouseenter', function(){
+                var id = parseInt( $(this).data('reportId'), 10 );
+                clearTimeout( timeout );
+                fixmystreet.maps.markers_highlight( id );
+            }).on('mouseleave', function(){
+                timeout = setTimeout( fixmystreet.maps.markers_highlight, 50 );
+            });
+        }
 
         // Add a "select this report" button, when on the report inspect form.
         if ( $('#report_inspect_form').length ) {
-- 
cgit v1.2.3


From c0f2abdbfcea725aaf32404fbf1e263585a69835 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 31 Mar 2020 13:45:22 +0100
Subject: Only one duplicate call in progress at once.

Without this check, it is possible for calls to overlap and end up with
a situation whereby both the duplicate list and the form are hidden.
---
 web/js/duplicates.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'web/js/duplicates.js')

diff --git a/web/js/duplicates.js b/web/js/duplicates.js
index 4f1574c0f..853456932 100644
--- a/web/js/duplicates.js
+++ b/web/js/duplicates.js
@@ -13,11 +13,18 @@
     // but undefined on new report page.
     var report_id = $("#report_inspect_form .js-report-id").text() || undefined;
 
+    // Don't make another call whilst one is in progress
+    var in_progress = false;
+
     function refresh_duplicate_list(evt, params, category) {
         if (params && params.skip_duplicates) {
             return;
         }
 
+        if (in_progress) {
+            return;
+        }
+
         if (!category) {
             category = $('select[name="category"]').val();
         }
@@ -57,6 +64,7 @@
             }
         }
 
+        in_progress = true;
         $.ajax({
             url: nearby_url,
             data: url_params,
@@ -87,7 +95,9 @@
         $("#js-duplicate-reports ul").empty().prepend( $reports );
         fixmystreet.set_up.fancybox_images();
 
-        $('#js-duplicate-reports').hide().removeClass('hidden').slideDown();
+        $('#js-duplicate-reports').hide().removeClass('hidden').slideDown(function(){
+            in_progress = false;
+        });
         if ( $('#problem_form').length ) {
             $('.js-hide-if-invalid-category').slideUp();
             $('.js-hide-if-invalid-category_extras').slideUp();
@@ -175,6 +185,7 @@
         $('#js-duplicate-reports').slideUp(function(){
             $(this).addClass('hidden');
             $(this).find('ul').empty();
+            in_progress = false;
         });
         if ($('#problem_form').length && take_effect()) {
             $('.js-hide-if-invalid-category').slideDown();
-- 
cgit v1.2.3