Fixes a couple segment handling regressions in the UI (#15110)

* When trying to see whether we should decode a segment, favor encoded segment since it appears to be more common.

* Replace existing param in URL if it exists but empty (eg, segment=).

* If editing segment during comparison, remove comparison in case edited segment is one being compared.

* Solve the problem of matching segments that end up decoded a different way to avoid side effects.

* Revert test file change.

* Add test for getStoredSegmentName().

1 files changed, 2 insertions, 2 deletions

diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js
index 70e37d779d..1c5618b049 100644
--- a/plugins/SegmentEditor/javascripts/Segmentation.js
+++ b/plugins/SegmentEditor/javascripts/Segmentation.js
@@ -939,10 +939,10 @@ $(document).ready(function() {
             segmentDefinition = this.uriEncodeSegmentDefinition(segmentDefinition);
 
             if (piwikHelper.isAngularRenderingThePage()) {
-                return broadcast.propagateNewPage('', true, 'addSegmentAsNew=&segment=' + segmentDefinition);
+                return broadcast.propagateNewPage('', true, 'addSegmentAsNew=&segment=' + segmentDefinition, ['compareSegments', 'comparePeriods']);
             } else {
                 // eg in case of exported dashboard
-                return broadcast.propagateNewPage('segment=' + segmentDefinition, true, 'addSegmentAsNew=&segment=' + segmentDefinition);
+                return broadcast.propagateNewPage('segment=' + segmentDefinition, true, 'addSegmentAsNew=&segment=' + segmentDefinition, ['compareSegments', 'comparePeriods']);
             }
         };