Merge branch '902-page-reload-on-search' into 'develop'

Resolve "Search playlist unexpectedly triggers keyboard sortcut commands"

Closes #902

See merge request funkwhale/funkwhale!891

changes/changelog.d/902.bugfix

@@ -0,0 +1 @@
+Fixed search usability issue when browsing artists, albums, radios and playlists (#902)

front/src/components/library/Albums.vue

@@ -110,7 +110,7 @@ export default {
       result: null,
       page: parseInt(this.defaultPage),
       query: this.defaultQuery,
-      tags: this.defaultTags.filter((t) => { return t.length > 0 }) || [],
+      tags: (this.defaultTags || []).filter((t) => { return t.length > 0 }),
       paginateBy: parseInt(this.defaultPaginateBy || 25),
       orderingDirection: defaultOrdering.direction || "+",
       ordering: defaultOrdering.field,
@@ -135,15 +135,18 @@ export default {
   },
   methods: {
     updateQueryString: _.debounce(function() {
-      this.$router.replace({
+      history.pushState(
-        query: {
+        {},
+        null,
+        this.$route.path + '?' + new URLSearchParams(
+          {
           query: this.query,
           page: this.page,
           tag: this.tags,
           paginateBy: this.paginateBy,
           ordering: this.getOrderingAsString()
-        }
+        }).toString()
-      })
+      )
     }, 500),
     fetchData: _.debounce(function() {
       var self = this

front/src/components/library/Artists.vue

@@ -98,7 +98,7 @@ export default {
       result: null,
       page: parseInt(this.defaultPage),
       query: this.defaultQuery,
-      tags: this.defaultTags.filter((t) => { return t.length > 0 }) || [],
+      tags: (this.defaultTags || []).filter((t) => { return t.length > 0 }),
       paginateBy: parseInt(this.defaultPaginateBy || 30),
       orderingDirection: defaultOrdering.direction || "+",
       ordering: defaultOrdering.field,
@@ -123,15 +123,18 @@ export default {
   },
   methods: {
     updateQueryString: _.debounce(function() {
-      this.$router.replace({
+      history.pushState(
-        query: {
+        {},
+        null,
+        this.$route.path + '?' + new URLSearchParams(
+          {
           query: this.query,
           page: this.page,
           tag: this.tags,
           paginateBy: this.paginateBy,
           ordering: this.getOrderingAsString()
-        }
+        }).toString()
-      })
+      )
     }, 500),
     fetchData: _.debounce(function() {
       var self = this

front/src/components/library/Radios.vue

@@ -154,14 +154,17 @@ export default {
   },
   methods: {
     updateQueryString: _.debounce(function() {
-      this.$router.replace({
+      history.pushState(
-        query: {
+        {},
+        null,
+        this.$route.path + '?' + new URLSearchParams(
+          {
           query: this.query,
           page: this.page,
           paginateBy: this.paginateBy,
           ordering: this.getOrderingAsString()
-        }
+        }).toString()
-      })
+      )
     }, 500),
     fetchData: _.debounce(function() {
       var self = this

front/src/views/playlists/List.vue

@@ -113,14 +113,17 @@ export default {
   },
   methods: {
     updateQueryString: _.debounce(function() {
-      this.$router.replace({
+      history.pushState(
-        query: {
+        {},
+        null,
+        this.$route.path + '?' + new URLSearchParams(
+          {
           query: this.query,
           page: this.page,
           paginateBy: this.paginateBy,
           ordering: this.getOrderingAsString()
-        }
+        }).toString()
-      })
+      )
     }, 250),
     fetchData: _.debounce(function() {
       var self = this