From 0f6190147f6ea6de43904d4115beebba110a01e6 Mon Sep 17 00:00:00 2001
From: Lova ANDRIARIMALALA <43842786+Xpirix@users.noreply.github.com>
Date: Tue, 14 Nov 2023 16:02:20 +0300
Subject: [PATCH 1/3] Add show more button and items per page options

---
 .../templates/plugins/plugin_list.html        | 48 ++++++++++++++++++-
 qgis-app/plugins/views.py                     |  2 +
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/qgis-app/plugins/templates/plugins/plugin_list.html b/qgis-app/plugins/templates/plugins/plugin_list.html
index 3a53ca42..513a8d09 100644
--- a/qgis-app/plugins/templates/plugins/plugin_list.html
+++ b/qgis-app/plugins/templates/plugins/plugin_list.html
@@ -108,8 +108,54 @@ <h2>{% if title %}{{title}}{% else %}{% trans "All plugins" %}{% endif %}</h2>
             {% endfor %}
         </tbody>
     </table>
-    <div class="pagination">
+    <div class="pagination" style="display:flex;justify-content: space-between;align-items: center;">
     {% include 'sortable_listview/pagination.html' %}
+
+    <div style="margin-top:20px;">
+        {% if show_more_items_number <= page_obj.paginator.count %}
+        <button class="btn" onclick="set_per_page({{show_more_items_number}})">
+            {% trans "Show more" %}
+        </button>
+        {% else %}
+        <button class="btn" disabled>
+            {% trans "Show more" %}
+        </button>
+        {% endif %}
+    </div>
+    <div style="margin-top:20px;">
+        <span>
+            {% trans "Elements per page:" %}&nbsp;
+        </span>
+        <select class="form-select" id="items_per_page" style="margin:0;">
+            {% if paginator.per_page not in per_page_list%}
+                <option>{{paginator.per_page}}</option>
+            {% endif %}
+            {% for p in per_page_list %}
+                <option value="{{ p }}" {% if p ==  paginator.per_page%} selected {% endif %}>{{ p }}</option>
+            {% endfor %}
+        </select>
+
+    </div>
+    <script type="text/javascript">
+        function set_per_page(n){
+            if(window.location.href.search('per_page') >= 0){
+                 new_page = window.location.href.replace(/per_page=\d+/, 'per_page=' + n);
+            } else {
+                new_page = -1 == window.location.href.search('\\?') ? window.location.href + '?' + 'per_page=' + n : window.location.href + '&' + 'per_page=' + n;
+            }
+            // Reset page
+            new_page = new_page.replace(/&page=\d+/, '&page=1');
+            new_page = new_page.replace(/\?page=\d+/, '?page=1');
+            window.location.href = new_page;
+        }
+
+        let itemsPerPageSelect = document.getElementById("items_per_page");
+        itemsPerPageSelect.addEventListener("change", function () {
+            if (itemsPerPageSelect.value) {
+                set_per_page(itemsPerPageSelect.value)
+            }
+        });
+    </script>
     </div>
     <div class="alert">
         <button type="button" class="close" data-dismiss="alert">&times;</button>
diff --git a/qgis-app/plugins/views.py b/qgis-app/plugins/views.py
index dc48a7a1..17fdf40d 100644
--- a/qgis-app/plugins/views.py
+++ b/qgis-app/plugins/views.py
@@ -605,6 +605,8 @@ def get_context_data(self, **kwargs):
         context.update(self.additional_context)
         context["current_sort_query"] = self.get_sortstring()
         context["current_querystring"] = self.get_querystring()
+        context["per_page_list"] = [20, 50, 75, 100]
+        context["show_more_items_number"] = context["paginator"].per_page + 50
         return context
 
     def get_sortstring(self):

From 573590b140607d27ea0dd5dbfed823a576bac97d Mon Sep 17 00:00:00 2001
From: Lova ANDRIARIMALALA <43842786+Xpirix@users.noreply.github.com>
Date: Wed, 15 Nov 2023 08:00:26 +0300
Subject: [PATCH 2/3] Add test cases for plugin list

---
 qgis-app/plugins/tests/test_plugin_list.py | 55 ++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 qgis-app/plugins/tests/test_plugin_list.py

diff --git a/qgis-app/plugins/tests/test_plugin_list.py b/qgis-app/plugins/tests/test_plugin_list.py
new file mode 100644
index 00000000..d5984f1b
--- /dev/null
+++ b/qgis-app/plugins/tests/test_plugin_list.py
@@ -0,0 +1,55 @@
+from django.test import TestCase
+from django.urls import reverse
+
+class PluginsListViewTestCase(TestCase):
+    fixtures = [
+        "fixtures/styles.json",
+        "fixtures/auth.json",
+        "fixtures/simplemenu.json",
+        "fixtures/plugins.json",
+    ]
+
+    def setUp(self):
+        pass
+
+    def test_plugins_list_view(self):
+        # Test the main plugins list view without any parameters
+        response = self.client.get(reverse('approved_plugins'))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'plugins/plugin_list.html')
+        self.assertTrue('current_sort_query' in response.context)
+        self.assertTrue('current_querystring' in response.context)
+        self.assertTrue('per_page_list' in response.context)
+        self.assertTrue('show_more_items_number' in response.context)
+
+    def test_plugins_list_pagination(self):
+        # Test the plugins list view with pagination
+        response = self.client.get(reverse('approved_plugins'), {'per_page': 20})
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue('current_sort_query' in response.context)
+        self.assertTrue('current_querystring' in response.context)
+        self.assertTrue('per_page_list' in response.context)
+        self.assertTrue('show_more_items_number' in response.context)
+
+        show_more_items_number = response.context['show_more_items_number']
+        self.assertEqual(show_more_items_number, 70)
+
+        response = self.client.get(reverse('approved_plugins'), {'per_page': show_more_items_number})
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue('current_sort_query' in response.context)
+        self.assertTrue('current_querystring' in response.context)
+        self.assertTrue('per_page_list' in response.context)
+        self.assertTrue('show_more_items_number' in response.context)
+
+        show_more_items_number = response.context['show_more_items_number']
+        self.assertEqual(show_more_items_number, 120)
+
+    def test_plugins_list_sorting(self):
+        # Test the plugins list view with sorting
+        response = self.client.get(reverse('approved_plugins'), {'sort': 'name'})
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue('current_sort_query' in response.context)
+        self.assertTrue('current_querystring' in response.context)
+        self.assertTrue('per_page_list' in response.context)
+        self.assertTrue('show_more_items_number' in response.context)
+

From 7a35e0ba7c086a3a7c81a231917764753f87f34b Mon Sep 17 00:00:00 2001
From: Lova ANDRIARIMALALA <43842786+Xpirix@users.noreply.github.com>
Date: Mon, 20 Nov 2023 14:51:40 +0300
Subject: [PATCH 3/3] Use number from per_page_list for show more

---
 qgis-app/plugins/tests/test_plugin_list.py |  8 +++++---
 qgis-app/plugins/views.py                  | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/qgis-app/plugins/tests/test_plugin_list.py b/qgis-app/plugins/tests/test_plugin_list.py
index d5984f1b..b17c0e17 100644
--- a/qgis-app/plugins/tests/test_plugin_list.py
+++ b/qgis-app/plugins/tests/test_plugin_list.py
@@ -1,5 +1,6 @@
 from django.test import TestCase
 from django.urls import reverse
+from ..models import Plugin
 
 class PluginsListViewTestCase(TestCase):
     fixtures = [
@@ -32,9 +33,9 @@ def test_plugins_list_pagination(self):
         self.assertTrue('show_more_items_number' in response.context)
 
         show_more_items_number = response.context['show_more_items_number']
-        self.assertEqual(show_more_items_number, 70)
+        self.assertEqual(show_more_items_number, 50)
 
-        response = self.client.get(reverse('approved_plugins'), {'per_page': show_more_items_number})
+        response = self.client.get(reverse('approved_plugins'), {'per_page': 110})
         self.assertEqual(response.status_code, 200)
         self.assertTrue('current_sort_query' in response.context)
         self.assertTrue('current_querystring' in response.context)
@@ -42,7 +43,8 @@ def test_plugins_list_pagination(self):
         self.assertTrue('show_more_items_number' in response.context)
 
         show_more_items_number = response.context['show_more_items_number']
-        self.assertEqual(show_more_items_number, 120)
+        records_count = Plugin.approved_objects.count()
+        self.assertEqual(show_more_items_number, records_count + 1)
 
     def test_plugins_list_sorting(self):
         # Test the plugins list view with sorting
diff --git a/qgis-app/plugins/views.py b/qgis-app/plugins/views.py
index 17fdf40d..db666c18 100644
--- a/qgis-app/plugins/views.py
+++ b/qgis-app/plugins/views.py
@@ -606,7 +606,19 @@ def get_context_data(self, **kwargs):
         context["current_sort_query"] = self.get_sortstring()
         context["current_querystring"] = self.get_querystring()
         context["per_page_list"] = [20, 50, 75, 100]
-        context["show_more_items_number"] = context["paginator"].per_page + 50
+
+        try:
+            # Get the next value of per page from per_page_list
+            next_per_page_id = context["per_page_list"].index(context["paginator"].per_page) + 1
+            next_per_page = context["per_page_list"][next_per_page_id]
+        except (ValueError, IndexError):
+            # If the 'per_page' value in the request parameter 
+            # is not found in the 'per_page_list' or if the 
+            # next index is out of range, set the 'next_per_page' 
+            # value to a number greater than the total count 
+            # of records. This action effectively disables the button."
+            next_per_page = context["paginator"].count + 1
+        context["show_more_items_number"] = next_per_page
         return context
 
     def get_sortstring(self):