diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
index 9873dab81..fcdb23ed6 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
@@ -1,6 +1,6 @@
diff --git a/app/javascript/dashboard/components-next/selectmenu/SelectMenu.vue b/app/javascript/dashboard/components-next/selectmenu/SelectMenu.vue
index 38104243c..cc584dcbb 100644
--- a/app/javascript/dashboard/components-next/selectmenu/SelectMenu.vue
+++ b/app/javascript/dashboard/components-next/selectmenu/SelectMenu.vue
@@ -1,8 +1,8 @@
@@ -114,9 +160,9 @@ const updateCurrentPage = page => fetchContacts(page);
:current-page="currentPage"
:total-items="totalItems"
:show-pagination-footer="!isFetchingList && searchValue === ''"
- :active-sort="activeSort"
- :active-ordering="activeOrdering"
- @update:current-page="updateCurrentPage"
+ :active-sort="sortState.activeSort"
+ :active-ordering="sortState.activeOrdering"
+ @update:current-page="handlePageChange"
@search="searchContacts"
@sort="handleSort"
>
diff --git a/app/javascript/dashboard/routes/dashboard/contact/pages/EditContactsPageRouteView.vue b/app/javascript/dashboard/routes/dashboard/contact/pages/EditContactsPageRouteView.vue
index 31a89eb2f..ce55ebc9b 100644
--- a/app/javascript/dashboard/routes/dashboard/contact/pages/EditContactsPageRouteView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contact/pages/EditContactsPageRouteView.vue
@@ -52,9 +52,25 @@ const activeTabIndex = computed(() => {
return CONTACT_TABS_OPTIONS.findIndex(v => v.value === activeTab.value);
});
+const ROUTE_CONFIG = {
+ segments: ['segmentId', 'contacts_dashboard_segments_index'],
+ labels: ['label', 'contacts_dashboard_labels_index'],
+ default: [null, 'contacts_dashboard_index'],
+};
+
const goToContactsList = () => {
+ const routeType =
+ Object.keys(ROUTE_CONFIG).find(
+ type => route.params[ROUTE_CONFIG[type][0]]
+ ) || 'default';
+
+ const [paramKey, routeName] = ROUTE_CONFIG[routeType];
+
router.push({
- name: 'contacts_dashboard_index',
+ name: routeName,
+ ...(paramKey && {
+ params: { [paramKey]: route.params[paramKey] },
+ }),
});
};