Merge lp:~matthew-constable/tiqit/tiqit into lp:tiqit

[Matthew Constable]

Enhanced coledit.js and results.js to produce the correct URL in the taskbar (and history) when a column is added/removed on a results page.

[Matthew Hall (matt.hall)]

This is a good change, but unfortunately there's currently inconsistent behaviour displayed when search results are grouped by one of the fields.

* When a column is added using the buttons above any group, it is added to all groups and the URL updated. I think this is fine.

* When a column is removed using the buttons above any group but the first, it is removed from only that group and the URL isn't updated. The existing behaviour of the group isn't ideal, but at least your new URL handling is being consistent with it.

* When a column is remove using the buttons above the first group, it is removed from only that group and the URL *is* updated. Again, the existing grouping behavior arguably isn't ideal, but now there's also an inconsistency between the union of all columns displayed on the page and the columns listed in the URL.

We either need to avoid updating the URL when removing a column from the first group, or change the grouping behavior so that removing a column always affects all groups.

review: Needs Fixing

Unmerged revisions

6. By Matthew Constable <email address hidden> on 2015-11-30

Enhanced coledit.js and results.js to produce the correct URL in the taskbar (and history) when a column is added/removed on a results page.

=== modified file 'static/scripts/coledit.js' (properties changed: -x to +x)
--- static/scripts/coledit.js	2014-06-05 14:38:53 +0000
+++ static/scripts/coledit.js	2015-11-30 09:54:32 +0000
@@ -113,6 +113,7 @@
     // - Do some magic to make the auto-updater know about the new field
     // - Force a background reload to get the first info
     // - Suppress initial diffs for this col (but only this col)
+    // - Update the URL
 
     var tables = getTables('results');
     var newIndex = -1;
@@ -165,6 +166,7 @@
     tgt.tableName = 'results';
     generateCustomEvent('NewCol', tgt);
 
+    updateURL();
     refreshNow();
   }
 }
@@ -194,6 +196,8 @@
   for (var i = 0; i < table.rows.length; i++) {
     table.rows[i].cells[colIndex].style.display = display;
   }
+
+  updateURL();
 }
 
 function tiqitColMoveUp(event) {

=== modified file 'static/scripts/results.js' (properties changed: -x to +x)
--- static/scripts/results.js	2014-06-05 14:38:53 +0000
+++ static/scripts/results.js	2015-11-30 09:54:32 +0000
@@ -176,3 +176,34 @@
 
   document.location.href = 'search?buglist=' + bugs.join(',');
 }
+
+//
+// Update URL (if columns on display are changed by the user for instance)
+//
+
+function updateURL() {
+  var local_table = getTables('results')[0];
+  var sel_count   = 1;
+  var selections = tiqitSearchQuery.match(/(selection\d+=[\w\s-]+)/g);
+  var split_url = tiqitSearchQuery.split("&");
+
+  for (var k in selections) {
+    var temp_idx = split_url.indexOf(selections[k]);
+    split_url.splice(temp_idx, 1);
+  }
+
+  for (var k = 0; k < local_table.tHead.rows[0].cells.length; k++) {
+    var head  = local_table.tHead.rows[0].cells[k];
+    var field = head.getAttribute('field');
+
+    // Don't want to display hidden fields.
+    if (field && (head.style.display != "none")) {
+      var temp_selection = "selection" + sel_count + "=" + field;
+      split_url.push(temp_selection);
+      sel_count++;
+    }
+  }
+  var new_url = document.baseURI + "results?" + split_url.join("&");
+
+  history.replaceState(null, null, new_url);
+}