From ca42d65d1cbc3b83af94202394ca28d4c642a931 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sat, 12 Feb 2022 18:10:35 +0800
Subject: [PATCH] reset page when changing skin library search query fix #362

---
 .../src/views/skinlib/SkinLibrary/index.tsx   |  5 ++-
 .../tests/views/skinlib/SkinLibrary.test.tsx  | 34 ++++++++++++++++---
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/resources/assets/src/views/skinlib/SkinLibrary/index.tsx b/resources/assets/src/views/skinlib/SkinLibrary/index.tsx
index 5eb5db4e..4963ae97 100644
--- a/resources/assets/src/views/skinlib/SkinLibrary/index.tsx
+++ b/resources/assets/src/views/skinlib/SkinLibrary/index.tsx
@@ -106,7 +106,10 @@ const SkinLibrary: React.FC = () => {
     }
   }, [currentUid])
 
-  const handleFilterChange = (filter: Filter) => setFilter(filter)
+  const handleFilterChange = (filter: Filter) => {
+    setFilter(filter)
+    setPage(1)
+  }
 
   const handleNameChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     setName(event.target.value)
diff --git a/resources/assets/tests/views/skinlib/SkinLibrary.test.tsx b/resources/assets/tests/views/skinlib/SkinLibrary.test.tsx
index 1e788f26..96d40bce 100644
--- a/resources/assets/tests/views/skinlib/SkinLibrary.test.tsx
+++ b/resources/assets/tests/views/skinlib/SkinLibrary.test.tsx
@@ -44,11 +44,16 @@ test('without authenticated', async () => {
 })
 
 test('search by keyword', async () => {
-  fetch.get.mockResolvedValue(createPaginator([]))
+  fetch.get.mockResolvedValue({ ...createPaginator([]), last_page: 10 })
 
-  const { getByTitle, getByPlaceholderText } = render(<SkinLibrary />)
+  const { getByText, getByTitle, getByPlaceholderText } = render(
+    <SkinLibrary />,
+  )
   await waitFor(() => expect(fetch.get).toBeCalled())
 
+  // test for resetting page
+  fireEvent.click(getByText('2'))
+
   fireEvent.input(getByPlaceholderText(t('vendor.datatable.search')), {
     target: { value: 'k' },
   })
@@ -58,6 +63,7 @@ test('search by keyword', async () => {
       urls.skinlib.list(),
       expect.toSatisfy((search: URLSearchParams) => {
         expect(search.get('keyword')).toBe('k')
+        expect(search.get('page')).toBe('1')
         return true
       }),
     ),
@@ -66,17 +72,21 @@ test('search by keyword', async () => {
 
 test('select uploaded by self', async () => {
   window.blessing.extra.currentUid = 1
-  fetch.get.mockResolvedValue(createPaginator([]))
+  fetch.get.mockResolvedValue({ ...createPaginator([]), last_page: 10 })
 
   const { getByText, queryByText } = render(<SkinLibrary />)
   await waitFor(() => expect(fetch.get).toBeCalled())
 
+  // test for resetting page
+  fireEvent.click(getByText('2'))
+
   fireEvent.click(getByText(t('skinlib.seeMyUpload')))
   await waitFor(() =>
     expect(fetch.get).toHaveBeenLastCalledWith(
       urls.skinlib.list(),
       expect.toSatisfy((search: URLSearchParams) => {
         expect(search.get('uploader')).toBe('1')
+        expect(search.get('page')).toBe('1')
         return true
       }),
     ),
@@ -206,13 +216,16 @@ test('private texture', async () => {
 
 describe('by filter', () => {
   beforeEach(() => {
-    fetch.get.mockResolvedValue(createPaginator([]))
+    fetch.get.mockResolvedValue({ ...createPaginator([]), last_page: 10 })
   })
 
   it('skin', async () => {
     const { getByText, queryAllByText } = render(<SkinLibrary />)
     await waitFor(() => expect(fetch.get).toBeCalled())
 
+    // test for resetting page
+    fireEvent.click(getByText('2'))
+
     fireEvent.click(getByText('Steve'))
     await waitFor(() => expect(fetch.get).toBeCalled())
     fireEvent.click(getByText(t('general.skin')))
@@ -221,6 +234,7 @@ describe('by filter', () => {
         urls.skinlib.list(),
         expect.toSatisfy((search: URLSearchParams) => {
           expect(search.get('filter')).toBe('skin')
+          expect(search.get('page')).toBe('1')
           return true
         }),
       ),
@@ -234,12 +248,16 @@ describe('by filter', () => {
     const { getByText, queryAllByText } = render(<SkinLibrary />)
     await waitFor(() => expect(fetch.get).toBeCalled())
 
+    // test for resetting page
+    fireEvent.click(getByText('2'))
+
     fireEvent.click(getByText('Steve'))
     await waitFor(() =>
       expect(fetch.get).toHaveBeenLastCalledWith(
         urls.skinlib.list(),
         expect.toSatisfy((search: URLSearchParams) => {
           expect(search.get('filter')).toBe('steve')
+          expect(search.get('page')).toBe('1')
           return true
         }),
       ),
@@ -253,12 +271,16 @@ describe('by filter', () => {
     const { getByText, queryAllByText } = render(<SkinLibrary />)
     await waitFor(() => expect(fetch.get).toBeCalled())
 
+    // test for resetting page
+    fireEvent.click(getByText('2'))
+
     fireEvent.click(getByText('Alex'))
     await waitFor(() =>
       expect(fetch.get).toHaveBeenLastCalledWith(
         urls.skinlib.list(),
         expect.toSatisfy((search: URLSearchParams) => {
           expect(search.get('filter')).toBe('alex')
+          expect(search.get('page')).toBe('1')
           return true
         }),
       ),
@@ -272,12 +294,16 @@ describe('by filter', () => {
     const { getByText, queryAllByText } = render(<SkinLibrary />)
     await waitFor(() => expect(fetch.get).toBeCalled())
 
+    // test for resetting page
+    fireEvent.click(getByText('2'))
+
     fireEvent.click(getByText(t('general.cape')))
     await waitFor(() =>
       expect(fetch.get).toHaveBeenLastCalledWith(
         urls.skinlib.list(),
         expect.toSatisfy((search: URLSearchParams) => {
           expect(search.get('filter')).toBe('cape')
+          expect(search.get('page')).toBe('1')
           return true
         }),
       ),