Merge branch 'fix-search-page-bug' into 'develop'

Fix issue with album and artist search page

See merge request funkwhale/funkwhale!1178

changes/changelog.d/search-page.bugfix

@@ -0,0 +1 @@
+Fixed an issue with search pages where results would not appear after navigating to another page

front/src/components/library/Albums.vue

@@ -4,7 +4,7 @@
       <h2 class="ui header">
         <translate translate-context="Content/Album/Title">Browsing albums</translate>
       </h2>
-      <form :class="['ui', {'loading': isLoading}, 'form']" @submit.prevent="updateQueryString();fetchData()">
+      <form :class="['ui', {'loading': isLoading}, 'form']" @submit.prevent="updatePage();updateQueryString();fetchData()">
         <div class="fields">
           <div class="field">
             <label>
@@ -195,6 +195,9 @@ export default {
     },
     selectPage: function(page) {
       this.page = page
+    },
+    updatePage() {
+      this.page = this.defaultPage
     }
   },
   watch: {

front/src/components/library/Artists.vue

@@ -4,7 +4,7 @@
       <h2 class="ui header">
         <translate translate-context="Content/Artist/Title">Browsing artists</translate>
       </h2>
-      <form :class="['ui', {'loading': isLoading}, 'form']" @submit.prevent="updateQueryString();fetchData()">
+      <form :class="['ui', {'loading': isLoading}, 'form']" @submit.prevent="updatePage();updateQueryString();fetchData()">
         <div class="fields">
           <div class="field">
             <label>
@@ -195,6 +195,9 @@ export default {
     },
     selectPage: function(page) {
       this.page = page
+    },
+    updatePage() {
+      this.page = this.defaultPage
     }
   },
   watch: {