Merge pull request #3520 from codeeu/dev

matchmaking pagination fix

Author: bernardhanna

public/build/assets/app-C6XgTnPq.css public/build/assets/app-6G0xPgpA.csspublic/build/assets/app-C6XgTnPq.css renamed to public/build/assets/app-6G0xPgpA.css

@@ -1,16 +1,16 @@
 {
   "resources/assets/sass/app.scss": {
-    "file": "assets/app-C6XgTnPq.css",
+    "file": "assets/app-6G0xPgpA.css",
     "src": "resources/assets/sass/app.scss",
     "isEntry": true
   },
   "resources/css/app.css": {
-    "file": "assets/app-CdzMviZO.css",
+    "file": "assets/app-MKLfkB1L.css",
     "src": "resources/css/app.css",
     "isEntry": true
   },
   "resources/js/app.js": {
-    "file": "assets/app-CJVwfzJy.js",
+    "file": "assets/app-Do07iaUj.js",
     "name": "app",
     "src": "resources/js/app.js",
     "isEntry": true,
@@ -93,7 +93,7 @@
     "isDynamicEntry": true
   },
   "resources/lang/php_en.json": {
-    "file": "assets/php_en-DyEQCqmE.js",
+    "file": "assets/php_en-49NCmI3r.js",
     "name": "php_en",
     "src": "resources/lang/php_en.json",
     "isDynamicEntry": true

public/build/assets/app-CJVwfzJy.js public/build/assets/app-Do07iaUj.jspublic/build/assets/app-CJVwfzJy.js renamed to public/build/assets/app-Do07iaUj.js

@@ -409,7 +409,8 @@ export default {
       window.scrollTo(0, 0);
     };
 
-    const paginate = () => {
+    const paginate = (page) => {
+      pagination.value.current_page = page;
       scrollToTop();
       onSubmit(true);
     };
@@ -419,13 +420,27 @@ export default {
         pagination.value.current_page = 1;
       }
 
+      const toOptionValue = (item, key) =>
+        item && typeof item === 'object' ? item[key] : item;
+
       const params = {
         page: pagination.value.current_page,
-        support_types: selectedSupportTypes.value.map((item) => item.id),
-        languages: selectedLanguages.value.map((item) => item.id),
-        locations: selectedLocations.value.map((item) => item.iso),
-        types: selectedTypes.value.map((item) => item.id),
-        topics: selectedTopics.value.map((item) => item.id),
+        support_types: selectedSupportTypes.value
+          .map((item) => toOptionValue(item, 'id'))
+          .filter(Boolean),
+        // Languages are stored in DB as names, not numeric IDs.
+        languages: selectedLanguages.value
+          .map((item) => toOptionValue(item, 'name'))
+          .filter(Boolean),
+        locations: selectedLocations.value
+          .map((item) => toOptionValue(item, 'iso'))
+          .filter(Boolean),
+        types: selectedTypes.value
+          .map((item) => toOptionValue(item, 'id'))
+          .filter(Boolean),
+        topics: selectedTopics.value
+          .map((item) => toOptionValue(item, 'id'))
+          .filter(Boolean),
       };
 
       axios