From e86f9ec1339e8766957a33d9466c945658870db1 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Tue, 18 Apr 2023 15:13:25 +0200
Subject: [PATCH 1/2] Fix pagination after increasing items per page

---
 ...pagination-after-increasing-items-per-page |  6 ++
 .../src/components/AppBar/ViewOptions.vue     | 58 +++++++++++++------
 .../components/AppBar/ViewOptions.spec.ts     | 45 ++++++++++----
 3 files changed, 81 insertions(+), 28 deletions(-)
 create mode 100644 changelog/unreleased/bugfix-pagination-after-increasing-items-per-page

diff --git a/changelog/unreleased/bugfix-pagination-after-increasing-items-per-page b/changelog/unreleased/bugfix-pagination-after-increasing-items-per-page
new file mode 100644
index 00000000000..5c12467ce45
--- /dev/null
+++ b/changelog/unreleased/bugfix-pagination-after-increasing-items-per-page
@@ -0,0 +1,6 @@
+Bugfix: Pagination after increasing items per page
+
+An issue where the file list incorrectly showed no items after paginating and increasing the amount of items per page has been fixed.
+
+https://github.com/owncloud/web/issues/6768
+https://github.com/owncloud/web/pull/8854
diff --git a/packages/web-app-files/src/components/AppBar/ViewOptions.vue b/packages/web-app-files/src/components/AppBar/ViewOptions.vue
index 3a49ac95861..6a1b593b9c1 100644
--- a/packages/web-app-files/src/components/AppBar/ViewOptions.vue
+++ b/packages/web-app-files/src/components/AppBar/ViewOptions.vue
@@ -71,7 +71,7 @@
           v-if="viewModes.includes(ViewModeConstants.tilesView)"
           class="files-view-options-list-item oc-visible@s oc-flex oc-flex-between oc-flex-middle"
         >
-          <label for="tiles-size-slider" v-text="resizeTilesLabel" />
+          <label for="tiles-size-slider" v-text="$gettext('Tile size')" />
           <input
             v-model="viewSizeCurrent"
             type="range"
@@ -89,9 +89,16 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, ref, unref, watch } from 'vue'
+import { computed, defineComponent, PropType, ref, unref, watch } from 'vue'
 import { mapMutations, mapState } from 'vuex'
-import { queryItemAsString, useRouteQueryPersisted } from 'web-pkg/src/composables'
+import { useGettext } from 'vue3-gettext'
+import {
+  queryItemAsString,
+  useRoute,
+  useRouteQuery,
+  useRouteQueryPersisted,
+  useRouter
+} from 'web-pkg/src/composables'
 import { ViewMode } from 'web-pkg/src/ui/types'
 import { PaginationConstants, ViewModeConstants } from '../../composables'
 
@@ -106,8 +113,19 @@ export default defineComponent({
     }
   },
   setup() {
+    const router = useRouter()
+    const currentRoute = useRoute()
+    const { $gettext } = useGettext()
+
     const queryParamsLoading = ref(false)
 
+    const currentPageQuery = useRouteQuery('page')
+    const currentPage = computed(() => {
+      if (!unref(currentPageQuery)) {
+        return 1
+      }
+      return parseInt(queryItemAsString(unref(currentPageQuery)))
+    })
     const itemsPerPageQuery = useRouteQueryPersisted({
       name: PaginationConstants.perPageQueryName,
       defaultValue: PaginationConstants.perPageDefault
@@ -130,6 +148,21 @@ export default defineComponent({
       }
     }
 
+    const setItemsPerPage = (itemsPerPage: string) => {
+      const resetPagination = itemsPerPage > unref(itemsPerPageQuery) && unref(currentPage) > 1
+      return router.replace({
+        query: {
+          ...unref(currentRoute).query,
+          'items-per-page': itemsPerPage,
+          ...(resetPagination && { page: '1' })
+        }
+      })
+    }
+
+    const setViewMode = (mode: ViewMode) => {
+      viewModeQuery.value = mode.name
+    }
+
     watch(
       [itemsPerPageQuery, viewModeQuery, viewSizeQuery],
       (params) => {
@@ -154,19 +187,15 @@ export default defineComponent({
       viewSizeCurrent: viewSizeQuery,
       itemsPerPageCurrent: itemsPerPageQuery,
       queryParamsLoading,
-      setTilesViewSize
+      setTilesViewSize,
+      setItemsPerPage,
+      setViewMode,
+      viewOptionsButtonLabel: $gettext('Display customization options of the files list')
     }
   },
   computed: {
     ...mapState('Files', ['areHiddenFilesShown', 'areFileExtensionsShown']),
 
-    viewOptionsButtonLabel() {
-      return this.$gettext('Display customization options of the files list')
-    },
-    resizeTilesLabel() {
-      return this.$gettext('Tile size')
-    },
-
     hiddenFilesShownModel: {
       get() {
         return this.areHiddenFilesShown
@@ -189,12 +218,7 @@ export default defineComponent({
   methods: {
     queryItemAsString,
     ...mapMutations('Files', ['SET_HIDDEN_FILES_VISIBILITY', 'SET_FILE_EXTENSIONS_VISIBILITY']),
-    setViewMode(mode) {
-      this.viewModeCurrent = mode.name
-    },
-    setItemsPerPage(itemsPerPage) {
-      this.itemsPerPageCurrent = itemsPerPage
-    },
+
     updateHiddenFilesShownModel(event) {
       this.hiddenFilesShownModel = event
     },
diff --git a/packages/web-app-files/tests/unit/components/AppBar/ViewOptions.spec.ts b/packages/web-app-files/tests/unit/components/AppBar/ViewOptions.spec.ts
index 4d2d6896b17..372a9a4d31a 100644
--- a/packages/web-app-files/tests/unit/components/AppBar/ViewOptions.spec.ts
+++ b/packages/web-app-files/tests/unit/components/AppBar/ViewOptions.spec.ts
@@ -1,16 +1,23 @@
 import ViewOptions from 'web-app-files/src/components/AppBar/ViewOptions.vue'
-import { useRouteQueryPersisted } from 'web-pkg/src/composables/router'
-import { ref, nextTick } from 'vue'
+import { useRouteQueryPersisted, useRouteQuery } from 'web-pkg/src/composables/router'
+import { ref } from 'vue'
 import {
   createStore,
   defaultPlugins,
   defaultStoreMockOptions,
   defaultComponentMocks,
-  mount
+  mount,
+  RouteLocation
 } from 'web-test-helpers'
 import { ViewModeConstants } from 'web-app-files/src/composables'
+import { mock } from 'jest-mock-extended'
+
+jest.mock('web-pkg/src/composables/router', () => ({
+  ...jest.requireActual('web-pkg/src/composables/router'),
+  useRouteQueryPersisted: jest.fn(),
+  useRouteQuery: jest.fn()
+}))
 
-jest.mock('web-pkg/src/composables/router')
 const selectors = {
   pageSizeSelect: '.oc-page-size',
   hiddenFilesSwitch: '[data-testid="files-switch-hidden-files"]',
@@ -30,14 +37,26 @@ describe('ViewOptions component', () => {
       const { wrapper } = getWrapper({ perPage })
       expect(wrapper.findComponent<any>(selectors.pageSizeSelect).props().selected).toBe(perPage)
     })
-    it('sets the correct files page limit', async () => {
+    it('sets the correct files page limit', () => {
       const perPage = '100'
       const newItemsPerPage = '500'
-      const { wrapper } = getWrapper({ perPage })
+      const { wrapper, mocks } = getWrapper({ perPage })
+      wrapper.vm.setItemsPerPage(newItemsPerPage)
+      expect(mocks.$router.replace).toHaveBeenCalledWith(
+        expect.objectContaining({
+          query: expect.objectContaining({ 'items-per-page': newItemsPerPage })
+        })
+      )
+    })
+    it('resets the page to 1 if current page is > 1 and amount of items per page is being increased', () => {
+      const perPage = '100'
+      const newItemsPerPage = '500'
+      const { wrapper, mocks } = getWrapper({ perPage, currentPage: '2' })
       wrapper.vm.setItemsPerPage(newItemsPerPage)
-      await nextTick()
-      expect(wrapper.findComponent<any>(selectors.pageSizeSelect).props().selected).toBe(
-        newItemsPerPage
+      expect(mocks.$router.replace).toHaveBeenCalledWith(
+        expect.objectContaining({
+          query: expect.objectContaining({ 'items-per-page': newItemsPerPage, page: '1' })
+        })
       )
     })
   })
@@ -109,15 +128,19 @@ function getWrapper({
   perPage = '100',
   viewMode = ViewModeConstants.default.name,
   tileSize = '1',
-  props = {}
+  props = {},
+  currentPage = '1'
 } = {}) {
   jest.mocked(useRouteQueryPersisted).mockImplementationOnce(() => ref(perPage))
   jest.mocked(useRouteQueryPersisted).mockImplementationOnce(() => ref(viewMode))
   jest.mocked(useRouteQueryPersisted).mockImplementationOnce(() => ref(tileSize))
+  jest.mocked(useRouteQuery).mockImplementationOnce(() => ref(currentPage))
 
   const storeOptions = { ...defaultStoreMockOptions }
   const store = createStore(storeOptions)
-  const mocks = { ...defaultComponentMocks() }
+  const mocks = {
+    ...defaultComponentMocks({ currentRoute: mock<RouteLocation>({ path: '/files' }) })
+  }
   return {
     storeOptions,
     mocks,

From f5e193f19fe6beb42098b727f756ba5d485f2cd7 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Wed, 19 Apr 2023 11:57:03 +0200
Subject: [PATCH 2/2] Reset page every time that items-per-page gets changed

---
 packages/web-app-files/src/components/AppBar/ViewOptions.vue   | 3 +--
 .../tests/unit/components/AppBar/ViewOptions.spec.ts           | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/web-app-files/src/components/AppBar/ViewOptions.vue b/packages/web-app-files/src/components/AppBar/ViewOptions.vue
index 6a1b593b9c1..07b146c7bb5 100644
--- a/packages/web-app-files/src/components/AppBar/ViewOptions.vue
+++ b/packages/web-app-files/src/components/AppBar/ViewOptions.vue
@@ -149,12 +149,11 @@ export default defineComponent({
     }
 
     const setItemsPerPage = (itemsPerPage: string) => {
-      const resetPagination = itemsPerPage > unref(itemsPerPageQuery) && unref(currentPage) > 1
       return router.replace({
         query: {
           ...unref(currentRoute).query,
           'items-per-page': itemsPerPage,
-          ...(resetPagination && { page: '1' })
+          ...(unref(currentPage) > 1 && { page: '1' })
         }
       })
     }
diff --git a/packages/web-app-files/tests/unit/components/AppBar/ViewOptions.spec.ts b/packages/web-app-files/tests/unit/components/AppBar/ViewOptions.spec.ts
index 372a9a4d31a..4d695ce3134 100644
--- a/packages/web-app-files/tests/unit/components/AppBar/ViewOptions.spec.ts
+++ b/packages/web-app-files/tests/unit/components/AppBar/ViewOptions.spec.ts
@@ -48,7 +48,7 @@ describe('ViewOptions component', () => {
         })
       )
     })
-    it('resets the page to 1 if current page is > 1 and amount of items per page is being increased', () => {
+    it('resets the page to 1 if current page is > 1', () => {
       const perPage = '100'
       const newItemsPerPage = '500'
       const { wrapper, mocks } = getWrapper({ perPage, currentPage: '2' })