Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions public/build/manifest.json
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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
Expand Down
27 changes: 21 additions & 6 deletions resources/js/components/matchmaking/MatchMakingToolForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,8 @@ export default {
window.scrollTo(0, 0);
};

const paginate = () => {
const paginate = (page) => {
pagination.value.current_page = page;
scrollToTop();
onSubmit(true);
};
Expand All @@ -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
Expand Down