From 55a9656c4205c3b3aaf4d043e4fddfd460d06b7d Mon Sep 17 00:00:00 2001
From: dbroqua <contact@darkou.fr>
Date: Wed, 22 Mar 2023 14:34:14 +0100
Subject: [PATCH] =?UTF-8?q?#79=20-=20Soucis=20de=20param=C3=A8tres=20dans?=
 =?UTF-8?q?=20les=20filtres?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 javascripts/collection.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/javascripts/collection.js b/javascripts/collection.js
index d9a24e0..f99e921 100644
--- a/javascripts/collection.js
+++ b/javascripts/collection.js
@@ -32,6 +32,9 @@ Vue.createApp({
         this.fetch();
     },
     methods: {
+        formatParams(param) {
+            return param.replace("&", "%26").replace("+", "%2B");
+        },
         fetch() {
             this.loading = true;
             this.total = 0;
@@ -64,19 +67,19 @@ Vue.createApp({
 
             let url = `/api/v1/albums?page=${this.page}&limit=${this.limit}&sort=${this.sort}&order=${this.order}`;
             if (this.artist) {
-                url += `&artists_sort=${this.artist.replace("&", "%26")}`;
+                url += `&artists_sort=${this.formatParams(this.artist)}`;
             }
             if (this.format) {
-                url += `&format=${this.format.replace("&", "%26")}`;
+                url += `&format=${this.formatParams(this.format)}`;
             }
             if (this.year) {
                 url += `&year=${this.year}`;
             }
             if (this.genre) {
-                url += `&genre=${this.genre.replace("&", "%26")}`;
+                url += `&genre=${this.formatParams(this.genre)}`;
             }
             if (this.style) {
-                url += `&style=${this.style.replace("&", "%26")}`;
+                url += `&style=${this.formatParams(this.style)}`;
             }
 
             axios
@@ -101,19 +104,19 @@ Vue.createApp({
         changeUrl() {
             let url = `?page=${this.page}&limit=${this.limit}&sort=${this.sort}&order=${this.order}`;
             if (this.artist) {
-                url += `&artists_sort=${this.artist.replace("&", "%26")}`;
+                url += `&artists_sort=${this.formatParams(this.artist)}`;
             }
             if (this.format) {
-                url += `&format=${this.format.replace("&", "%26")}`;
+                url += `&format=${this.formatParams(this.format)}`;
             }
             if (this.year) {
                 url += `&year=${this.year}`;
             }
             if (this.genre) {
-                url += `&genre=${this.genre.replace("&", "%26")}`;
+                url += `&genre=${this.formatParams(this.genre)}`;
             }
             if (this.style) {
-                url += `&style=${this.style.replace("&", "%26")}`;
+                url += `&style=${this.formatParams(this.style)}`;
             }
 
             window.location.href = url;