Merge remote-tracking branch 'upstream/pull/5823'

diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js
index dddd84354473d6a126895b1f738f6261b40cfda5..229fdc2b609901b672a72a03769c47d71ba4f777 100644 (file)
--- a/app/assets/javascripts/index/history.js
+++ b/app/assets/javascripts/index/history.js
@@ -47,12 +47,30 @@ OSM.History = function (map) {
     $("#sidebar_content .changesets").html(html);
   }
 
-  function displayMoreChangesets(html) {
-    $("#sidebar_content .changeset_more").replaceWith(html);
-    const oldList = $("#sidebar_content .changesets ol").first();
-    const newList = oldList.next("ol");
-    newList.children().appendTo(oldList);
-    newList.remove();
+  function displayMoreChangesets(div, html) {
+    const sidebar = $("#sidebar")[0];
+    const previousScrollHeightMinusTop = sidebar.scrollHeight - sidebar.scrollTop;
+
+    const oldList = $("#sidebar_content .changesets ol");
+
+    div.replaceWith(html);
+
+    const prevNewList = oldList.prevAll("ol");
+    if (prevNewList.length) {
+      prevNewList.next(".changeset_more").remove();
+      prevNewList.children().prependTo(oldList);
+      prevNewList.remove();
+
+      // restore scroll position only if prepending
+      sidebar.scrollTop = sidebar.scrollHeight - previousScrollHeightMinusTop;
+    }
+
+    const nextNewList = oldList.nextAll("ol");
+    if (nextNewList.length) {
+      nextNewList.prev(".changeset_more").remove();
+      nextNewList.children().appendTo(oldList);
+      nextNewList.remove();
+    }
   }
 
   function update() {
@@ -71,6 +89,9 @@ OSM.History = function (map) {
     if (params.has("before")) {
       data.set("before", params.get("before"));
     }
+    if (params.has("after")) {
+      data.set("after", params.get("after"));
+    }
 
     fetch(location.pathname + "?" + data)
       .then(response => response.text())
@@ -90,7 +111,7 @@ OSM.History = function (map) {
     div.find(".loader").show();
 
     $.get($(this).attr("href"), function (html) {
-      displayMoreChangesets(html);
+      displayMoreChangesets(div, html);
       updateMap();
     });
   }

diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb
index abdc23f0439b942ff9240eaaff278e5e9fb047d7..5e79f4da62a70ac42bc4e75203c60a70d073de24 100644 (file)
--- a/app/controllers/changesets_controller.rb
+++ b/app/controllers/changesets_controller.rb
@@ -2,6 +2,7 @@
 
 class ChangesetsController < ApplicationController
   include UserMethods
+  include PaginationMethods
 
   layout "site"
 
@@ -18,11 +19,12 @@ class ChangesetsController < ApplicationController
   # list non-empty changesets in reverse chronological order
   def index
     param! :before, Integer, :min => 1
+    param! :after, Integer, :min => 1
 
-    @params = params.permit(:display_name, :bbox, :friends, :nearby, :before, :list)
+    @params = params.permit(:display_name, :bbox, :friends, :nearby, :before, :after, :list)
 
-    if request.format == :atom && @params[:before]
-      redirect_to url_for(@params.merge(:before => nil)), :status => :moved_permanently
+    if request.format == :atom && (@params[:before] || @params[:after])
+      redirect_to url_for(@params.merge(:before => nil, :after => nil)), :status => :moved_permanently
       return
     end
 
@@ -59,9 +61,7 @@ class ChangesetsController < ApplicationController
         changesets = changesets.where(:user => current_user.nearby)
       end
 
-      changesets = changesets.where(:changesets => { :id => ...@params[:before] }) if @params[:before]
-
-      @changesets = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags, :comments)
+      @changesets, @newer_changesets_id, @older_changesets_id = get_page_items(changesets, :includes => [:user, :changeset_tags, :comments])
 
       render :action => :index, :layout => false
     end

diff --git a/app/views/changesets/index.html.erb b/app/views/changesets/index.html.erb
index 85c5f0bcb08a94e2e267fbc6fb8aa6dd82523713..3f25cf134bfbf7bce96fe25afd0c2bb1d599d59d 100644 (file)
--- a/app/views/changesets/index.html.erb
+++ b/app/views/changesets/index.html.erb
@@ -1,17 +1,17 @@
-<% if @changesets.present? %>
-  <ol class="changesets list-group list-group-flush">
-    <%= render @changesets %>
-  </ol>
-<% if @changesets.size == 20 -%>
-  <div class="changeset_more mt-3 text-center">
-    <%= link_to t(".load_more"), url_for(@params.merge(:before => @changesets.last.id)), :class => "btn btn-primary" %>
+<% if @newer_changesets_id %>
+  <div class="changeset_more my-3 text-center">
+    <%= link_to t(".load_more"), url_for(@params.merge(:before => nil, :after => @newer_changesets_id)), :class => "btn btn-primary" %>
     <div class="text-center loader">
       <div class="spinner-border" role="status">
         <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
       </div>
     </div>
   </div>
-<% end -%>
+<% end %>
+<% if @changesets.present? %>
+  <ol class="changesets list-group list-group-flush">
+    <%= render @changesets %>
+  </ol>
 <% elsif params[:bbox] %>
   <p class="mx-3"><%= params[:before] ? t(".no_more_area") : t(".empty_area") %></p>
 <% elsif params[:display_name] %>
@@ -19,3 +19,13 @@
 <% else %>
   <p class="mx-3"><%= params[:before] ? t(".no_more") : t(".empty") %></p>
 <% end %>
+<% if @older_changesets_id -%>
+  <div class="changeset_more my-3 text-center">
+    <%= link_to t(".load_more"), url_for(@params.merge(:before => @older_changesets_id, :after => nil)), :class => "btn btn-primary" %>
+    <div class="text-center loader">
+      <div class="spinner-border" role="status">
+        <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
+      </div>
+    </div>
+  </div>
+<% end -%>

diff --git a/config/wiki_pages.yml b/config/wiki_pages.yml
index 1995dcf380a6843c4e9efc93093cc70a4b84b78d..72736751ca7a00afce33c317ad983b4bdf5110a1 100644 (file)
--- a/config/wiki_pages.yml
+++ b/config/wiki_pages.yml
@@ -6498,6 +6498,7 @@ en:
     centralkey: Key:centralkey
     change: Key:change
     change:lanes: Key:change:lanes
+    changesets_count: ChangesetKey:changesets count
     changing_table: Key:changing table
     changing_table:adult: Key:changing table:adult
     changing_table:count: Key:changing table:count
@@ -7483,6 +7484,7 @@ en:
     horse_scale: Key:horse scale
     hospital:level:CN: Key:hospital:level:CN
     hospital:level:DE: Key:hospital:level:DE
+    host: Key:host
     hot_water: Key:hot water
     house: Key:house
     hov: Key:hov
@@ -7866,6 +7868,7 @@ en:
     memorial:subject:wikidata: Key:memorial:subject:wikidata
     memorial:subject:wikipedia: Key:memorial:subject:wikipedia
     memorial:type: Key:memorial:type
+    merge_conflict_resolved: ChangesetKey:merge conflict resolved
     message: Key:message
     mhs:inscription_date: Key:mhs:inscription date
     microbrewery: Key:microbrewery

diff --git a/script/misc/update-wiki-pages b/script/misc/update-wiki-pages
index d40708c96178bde29bd0fd3431236ce2b9fd1b94..84205fa35b95b36dde4c805ef45d6dd766cd2af9 100755 (executable)
--- a/script/misc/update-wiki-pages
+++ b/script/misc/update-wiki-pages
@@ -71,9 +71,15 @@ for my $lang ('', map { "${_}:" } qw[ Pt Fi De It HU Cz Fr RU Pl ]) {
     $cnt = stick_content_in_hash("tag", "Template:${lang}ValueDescription", \%feature);
     ok(1, "    Got $cnt value pages");
     $count{value} += $cnt;
+
+    # ChangesetKey pages
+    ok(1, "    Getting changeset key pages");
+    $cnt = stick_content_in_hash("key", "Template:${lang}ChangesetKeyDescription", \%feature, "ChangesetKey");
+    ok(1, "    Got $cnt changeset key pages");
+    $count{changesetkey} += $cnt;
 }
 
-ok(1, "Got a total of $count{$_} ${_}s") for qw[ key keyprefix value ];
+ok(1, "Got a total of $count{$_} ${_}s") for qw[ key keyprefix changesetkey value ];
 
 # Dump to .yml file
 open my $out, ">", $out_file or die "Can't open file '$out_file' supplied on the command line";
@@ -87,8 +93,9 @@ exit 0;
 
 sub stick_content_in_hash
 {
-    my ($key, $title, $hash) = @_;
+    my ($key, $title, $hash, $namespace) = @_;
     my $ukey = ucfirst $key;
+    $namespace ||= $ukey;
 
     my $space_to_underscore = sub {
         my $txt = shift;
@@ -105,7 +112,7 @@ sub stick_content_in_hash
         my $title = $link->{title};
         my $lang;
         my $key_name;
-        if ($title =~ /^$ukey:(?<key_name>.*?)$/) {
+        if ($title =~ /^($namespace|$ukey):(?<key_name>.*?)$/) {
             # English by default
             $lang = "en";
             $key_name = $space_to_underscore->($+{key_name});

diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb
index 4274f7c313cc7856a6dceaae7a5a7c19babefea7..452084951105492536e344cf21e6247aeacc2f24 100644 (file)
--- a/test/controllers/changesets_controller_test.rb
+++ b/test/controllers/changesets_controller_test.rb
@@ -82,6 +82,9 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     %w[-1 0 fred].each do |id|
       get history_path(:format => "html", :list => "1", :before => id)
       assert_redirected_to :controller => :errors, :action => :bad_request
+
+      get history_path(:format => "html", :list => "1", :after => id)
+      assert_redirected_to :controller => :errors, :action => :bad_request
     end
   end
 
@@ -238,6 +241,23 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     check_index_result [changeset1]
   end
 
+  def test_index_after_id
+    changeset1 = create(:changeset, :num_changes => 1)
+    changeset2 = create(:changeset, :num_changes => 1)
+
+    get history_path(:format => "html", :after => changeset1.id), :xhr => true
+    assert_response :success
+    assert_template "history"
+    assert_template :layout => "xhr"
+    assert_select "h2", :text => "Changesets", :count => 1
+
+    get history_path(:format => "html", :list => "1", :after => changeset1.id), :xhr => true
+    assert_response :success
+    assert_template "index"
+
+    check_index_result [changeset2]
+  end
+
   ##
   # Check that a list with a next page link works
   def test_index_more
@@ -416,6 +436,11 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     assert_redirected_to :action => :feed
   end
 
+  def test_feed_after
+    get history_feed_path(:format => "atom", :after => 100)
+    assert_redirected_to :action => :feed
+  end
+
   private
 
   ##

diff --git a/test/system/history_test.rb b/test/system/history_test.rb
index 4f2114f25dbc1669bc11642d86e75cf737a77b5b..7d730355a083c9b327cd6452b3dd4aca96f216e8 100644 (file)
--- a/test/system/history_test.rb
+++ b/test/system/history_test.rb
@@ -81,6 +81,34 @@ class HistoryTest < ApplicationSystemTestCase
     end
   end
 
+  test "user history starts after specified changeset" do
+    user = create(:user)
+    changeset0 = create(:changeset)
+    changeset1 = create_visible_changeset(user, "1st-changeset-in-history")
+    changeset2 = create_visible_changeset(user, "2nd-changeset-in-history")
+
+    visit "#{user_path user}/history?after=#{changeset2.id}"
+
+    within_sidebar do
+      assert_no_link "1st-changeset-in-history"
+      assert_no_link "2nd-changeset-in-history"
+    end
+
+    visit "#{user_path user}/history?after=#{changeset1.id}"
+
+    within_sidebar do
+      assert_no_link "1st-changeset-in-history"
+      assert_link "2nd-changeset-in-history"
+    end
+
+    visit "#{user_path user}/history?after=#{changeset0.id}"
+
+    within_sidebar do
+      assert_link "1st-changeset-in-history"
+      assert_link "2nd-changeset-in-history"
+    end
+  end
+
   private
 
   def create_visible_changeset(user, comment)