Support redirect (#1640)

Author: joanagmaia

frontend/src/modules/member/components/list/member-list-toolbar.vue

@@ -115,11 +115,11 @@
 
 <script setup>
 
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref } from 'vue';
 import { MemberPermissions } from '@/modules/member/member-permissions';
 import { useMemberStore } from '@/modules/member/store/pinia';
 import { storeToRefs } from 'pinia';
-import { mapActions, mapGetters } from '@/shared/vuex/vuex.helpers';
+import { mapGetters } from '@/shared/vuex/vuex.helpers';
 import { MemberService } from '@/modules/member/member-service';
 import ConfirmDialog from '@/shared/dialog/confirm-dialog';
 import Message from '@/shared/message/message';
@@ -136,7 +136,6 @@ import AppTagPopover from '@/modules/tag/components/tag-popover.vue';
 import AppSvg from '@/shared/svg/svg.vue';
 
 const { currentUser, currentTenant } = mapGetters('auth');
-const { doRefreshCurrentUser } = mapActions('auth');
 const memberStore = useMemberStore();
 const { selectedMembers, filters } = storeToRefs(memberStore);
 const { fetchMembers, getMemberCustomAttributes } = memberStore;
@@ -234,10 +233,6 @@ const handleMergeMembers = () => {
     });
 };
 
-onMounted(() => {
-  doRefreshCurrentUser({});
-});
-
 const doDestroyAllWithConfirm = () => ConfirmDialog({
   type: 'danger',
   title: 'Delete contacts',

frontend/src/modules/member/components/member-dropdown.vue

@@ -292,15 +292,11 @@ export default {
       return !this.isHubspotConnected || this.isHubspotDisabledForMember || !this.isHubspotFeatureEnabled;
     },
   },
-  created() {
-    this.doRefreshCurrentUser({});
-  },
   methods: {
     ...mapActions({
       doFind: 'member/doFind',
       doDestroy: 'member/doDestroy',
       doEnrich: 'member/doEnrich',
-      doRefreshCurrentUser: 'auth/doRefreshCurrentUser',
     }),
     ...piniaMapActions(useMemberStore, ['fetchMembers']),
     async doDestroyWithConfirm(id) {

frontend/src/modules/member/member-routes.js

@@ -72,6 +72,48 @@ export default [
         },
         props: true,
       },
+      {
+        path: '/members',
+        redirect: (to) => ({
+          path: '/contacts',
+          query: to.query,
+        }),
+      },
+      {
+        path: '/members/new',
+        redirect: (to) => ({
+          path: '/contacts/new',
+          query: to.query,
+        }),
+      },
+      {
+        path: '/members/:id/edit',
+        redirect: (to) => ({
+          path: `/contacts/${to.params.id}/edit`,
+          query: to.query,
+        }),
+      },
+      {
+        path: '/members/merge-suggestions',
+        redirect: (to) => ({
+          path: '/contacts/merge-suggestions',
+          query: to.query,
+        }),
+      },
+      {
+        path: '/members/:id',
+        redirect: (to) => ({
+          path: `/contacts/${to.params.id}`,
+          query: to.query,
+        }),
+      },
+      {
+        path: '/members/:id/merge',
+        redirect: (to) => ({
+          path: `/contacts/${to.params.id}/merge`,
+          query: to.query,
+        }),
+      },
     ],
   },
 ];

frontend/src/modules/member/pages/member-list-page.vue

@@ -88,7 +88,7 @@ import {
 } from 'vue';
 import { MemberService } from '@/modules/member/member-service';
 import { MemberPermissions } from '@/modules/member/member-permissions';
-import { mapGetters } from '@/shared/vuex/vuex.helpers';
+import { mapGetters, mapActions } from '@/shared/vuex/vuex.helpers';
 import { FilterQuery } from '@/shared/modules/filters/types/FilterQuery';
 import CrSavedViews from '@/shared/modules/saved-views/components/SavedViews.vue';
 import AppMemberListTable from '@/modules/member/components/list/member-list-table.vue';
@@ -104,6 +104,7 @@ const membersToMergeCount = ref(0);
 
 const { listByPlatform } = mapGetters('integration');
 const { currentUser, currentTenant } = mapGetters('auth');
+const { doRefreshCurrentUser } = mapActions('auth');
 
 const memberFilter = ref<CrFilter | null>(null);
 
@@ -193,6 +194,7 @@ const onPaginationChange = ({
 };
 
 onMounted(() => {
+  doRefreshCurrentUser({});
   fetchMembersToMergeCount();
   doGetMembersCount();
   getMemberCustomAttributes();

frontend/src/modules/organization/components/organization-dropdown.vue

@@ -142,11 +142,10 @@
 </template>
 
 <script setup>
-import { computed, onMounted } from 'vue';
+import { computed } from 'vue';
 import { useRouter } from 'vue-router';
 import {
   mapGetters,
-  mapActions,
 } from '@/shared/vuex/vuex.helpers';
 import ConfirmDialog from '@/shared/dialog/confirm-dialog';
 import Message from '@/shared/message/message';
@@ -177,7 +176,6 @@ const emit = defineEmits([
 const store = useStore();
 
 const { currentUser, currentTenant } = mapGetters('auth');
-const { doRefreshCurrentUser } = mapActions('auth');
 
 const organizationStore = useOrganizationStore();
 const { fetchOrganizations, fetchOrganization } = organizationStore;
@@ -208,10 +206,6 @@ const isHubspotEnabled = computed(() => FeatureFlag.isFlagEnabled(
 
 const isSyncingWithHubspot = (organization) => organization.attributes?.syncRemote?.hubspot || false;
 
-onMounted(() => {
-  doRefreshCurrentUser({});
-});
-
 const isHubspotConnected = computed(() => {
   const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
   const enabledFor = hubspot.settings?.enabledFor || [];

frontend/src/modules/organization/pages/organization-list-page.vue

@@ -78,6 +78,7 @@ import AppPageWrapper from '@/shared/layout/page-wrapper.vue';
 import AppOrganizationListTable from '@/modules/organization/components/list/organization-list-table.vue';
 import {
   mapGetters,
+  mapActions,
 } from '@/shared/vuex/vuex.helpers';
 import CrSavedViews from '@/shared/modules/saved-views/components/SavedViews.vue';
 import CrFilter from '@/shared/modules/filters/components/Filter.vue';
@@ -90,6 +91,7 @@ import { OrganizationService } from '@/modules/organization/organization-service
 import { OrganizationPermissions } from '../organization-permissions';
 
 const { currentUser, currentTenant } = mapGetters('auth');
+const { doRefreshCurrentUser } = mapActions('auth');
 
 const organizationStore = useOrganizationStore();
 const { filters, totalOrganizations, savedFilterBody } = storeToRefs(organizationStore);
@@ -189,6 +191,7 @@ const fetchOrganizationsToMergeCount = () => {
 };
 
 onMounted(async () => {
+  doRefreshCurrentUser({});
   fetchOrganizationsToMergeCount();
   doGetOrganizationCount();
   (window as any).analytics.page('Organization');