GC, PC: use - in pagination to prevent slash collapsing

assets/js/common/contributions-lists.js

@@ -37,7 +37,11 @@ xtools.application.loadContributions = function (endpointFunc, apiTitle) {
         endpoint = endpointFunc(params),
         limit = parseInt(params.limit, 10) || 50,
         urlParams = new URLSearchParams(window.location.search),
-        newUrl = xtBaseUrl + endpoint + '/' + xtools.application.vars.offset,
+        // T403566 : Something, we have yet to figure where, replaces consecutive slashes in urls with single slashes
+        // That causes crashes in pages & globalcontribs
+        // This '-' is only a hack to prevent crashes
+        newUrl = (xtBaseUrl + endpoint + '/' + xtools.application.vars.offset)
+            .replaceAll(/\/(?=\/)/g, "/-"),
         oldToolPath = location.pathname.split('/')[1],
         newToolPath = newUrl.split('/')[1];
 

public/build/entrypoints.json

@@ -4,7 +4,7 @@
       "js": [
         "/build/runtime.c217f8c4.js",
         "/build/852.96913092.js",
-        "/build/app.a7ec0e72.js"
+        "/build/app.06e079ab.js"
       ],
       "css": [
         "/build/app.7692d209.css"

public/build/manifest.json

@@ -1,6 +1,6 @@
 {
   "build/app.css": "/build/app.7692d209.css",
-  "build/app.js": "/build/app.a7ec0e72.js",
+  "build/app.js": "/build/app.06e079ab.js",
   "build/runtime.js": "/build/runtime.c217f8c4.js",
   "build/852.96913092.js": "/build/852.96913092.js",
   "build/images/VPS-badge.svg": "/build/images/VPS-badge.svg",

src/Controller/GlobalContribsController.php

@@ -126,10 +126,10 @@ public function getGlobalContribs(
      *     name="GlobalContribsResult",
      *     requirements={
      *         "username"="(ipr-.+\/\d+[^\/])|([^\/]+)",
-     *         "namespace"="|all|\d+",
-     *         "start"="|\d*|\d{4}-\d{2}-\d{2}",
-     *         "end"="|\d{4}-\d{2}-\d{2}",
-     *         "offset"="|\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z?",
+     *         "namespace"="|\-|all|\d+",
+     *         "start"="|\-|\d*|\d{4}-\d{2}-\d{2}",
+     *         "end"="|\-|\d{4}-\d{2}-\d{2}",
+     *         "offset"="|\-|\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z?",
      *     },
      *     defaults={
      *         "namespace"="all",
@@ -172,9 +172,9 @@ public function resultsAction(
      *     requirements={
      *         "username"="(ipr-.+\/\d+[^\/])|([^\/]+)",
      *         "namespace"="|all|\d+",
-     *         "start"="|\d*|\d{4}-\d{2}-\d{2}",
-     *         "end"="|\d{4}-\d{2}-\d{2}",
-     *         "offset"="|\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z?",
+     *         "start"="|\-|\d*|\d{4}-\d{2}-\d{2}",
+     *         "end"="|\-|\d{4}-\d{2}-\d{2}",
+     *         "offset"="|\-|\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z?",
      *     },
      *     defaults={
      *         "namespace"="all",

src/Controller/PagesController.php

@@ -116,10 +116,10 @@ protected function setUpPages(PagesRepository $pagesRepo, string $redirects, str
      *         "username" = "(ipr-.+\/\d+[^\/])|([^\/]+)",
      *         "namespace"="|all|\d+",
      *         "redirects"="|[^/]+",
-     *         "deleted"="|all|live|deleted",
-     *         "start"="|\d{4}-\d{2}-\d{2}",
-     *         "end"="|\d{4}-\d{2}-\d{2}",
-     *         "offset"="|\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z?",
+     *         "deleted"="|\-|all|live|deleted",
+     *         "start"="|\-|\d{4}-\d{2}-\d{2}",
+     *         "end"="|\-|\d{4}-\d{2}-\d{2}",
+     *         "offset"="|\-|\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z?",
      *     },
      *     defaults={
      *         "namespace"=0,

src/Model/GlobalContribs.php

@@ -35,9 +35,9 @@ class GlobalContribs extends Model
      * @param EditRepository $editRepo
      * @param User $user
      * @param string|int|null $namespace Namespace ID or 'all'.
-     * @param false|int $start As Unix timestamp.
-     * @param false|int $end As Unix timestamp.
-     * @param false|int $offset As Unix timestamp.
+     * @param false|string|int $start As Unix timestamp.
+     * @param false|string|int $end As Unix timestamp.
+     * @param false|string|int $offset As Unix timestamp.
      * @param int|null $limit Number of results to return.
      */
     public function __construct(
@@ -58,9 +58,10 @@ public function __construct(
         $this->editRepo = $editRepo;
         $this->user = $user;
         $this->namespace = '' == $namespace ? 0 : $namespace;
-        $this->start = $start;
-        $this->end = $end;
-        $this->offset = $offset;
+        // see T403566 for the '-' mess
+        $this->start = '-' == $start ? false : $start;
+        $this->end = '-' == $end ? false : $end;
+        $this->offset = '-' == $offset ? false : $offset;
         $this->limit = $limit ?? self::PAGE_SIZE;
     }
 

src/Model/Pages.php

@@ -42,9 +42,9 @@ class Pages extends Model
      * @param string|int $namespace Namespace ID or 'all'.
      * @param string $redirects One of the Pages::REDIR_ constants.
      * @param string $deleted One of the Pages::DEL_ constants.
-     * @param int|false $start Start date as Unix timestamp.
-     * @param int|false $end End date as Unix timestamp.
-     * @param int|false $offset Unix timestamp. Used for pagination.
+     * @param int|string|false $start Start date as Unix timestamp.
+     * @param int|string|false $end End date as Unix timestamp.
+     * @param int|string|false $offset Unix timestamp. Used for pagination.
      */
     public function __construct(
         PagesRepository $repository,
@@ -61,11 +61,11 @@ public function __construct(
         $this->project = $project;
         $this->user = $user;
         $this->namespace = 'all' === $namespace ? 'all' : (int)$namespace;
-        $this->start = $start;
-        $this->end = $end;
+        $this->start = '-' == $start ? false : $start;
+        $this->end = '-' == $end ? false : $end;
+        $this->offset = '-' == $offset ? false : $offset;
         $this->redirects = $redirects ?: self::REDIR_NONE;
         $this->deleted = $deleted ?: self::DEL_ALL;
-        $this->offset = $offset;
     }
 
     /**

templates/pages/_pages_list.html.twig

@@ -143,7 +143,16 @@
         {##### PAGINATION #####}
         {% if not(pages.multiNamespace) and pages.results[pages.namespaces[0]]|length == pages.resultsPerPage %}
             <div class="contributions-nav clearfix">
-                <a href="{{ path('PagesResult', {project: project.domain, username: user.usernameIdent, namespace: pages.namespace, redirects: pages.redirects, deleted: pages.deleted, start: pages.startDate, end: pages.endDate, offset: pages.lastTimestamp}) }}" class="pull-right contributions--next">
+                <a href="{{ path('PagesResult', {
+                    project: project.domain,
+                    username: user.usernameIdent,
+                    namespace: pages.namespace,
+                    redirects: pages.redirects,
+                    deleted: pages.deleted,
+                    start: (pages.startDate ? pages.startDate : '-'),
+                    end: (pages.endDate ? pages.endDate : '-'),
+                    offset: (pages.lastTimestamp ? pages.lastTimestamp : '-')
+                }) }}" class="pull-right contributions--next">
                     {{ msg('pager-older-n', [pages.resultsPerPage])|ucfirst }}
                     <span class="glyphicon glyphicon-arrow-{% if isRTL() %}left{% else %}right{% endif %}"></span>
                 </a>