update invitation page url and add separate prop user extended meta data

Author: ipula

src/managers/UserAccessManager/UserAccessManagerStore.js

@@ -111,7 +111,7 @@ export const useUserAccessManagerStore = defineComponentStore(
 		 * redirect to send invitation page
 		 */
 		function editUser({user}) {
-			const {redirectToPage} = useUrl(`invitation/editUser/${user.id}`);
+			const {redirectToPage} = useUrl(`management/settings/user/${user.id}`);
 			redirectToPage();
 		}
 

src/managers/UserInvitationManager/UserInvitationManagerStore.js

@@ -1,6 +1,6 @@
 import {defineComponentStore} from '@/utils/defineComponentStore';
-import {useUrl} from '@/composables/useUrl';
 import {useAnnouncer} from '@/composables/useAnnouncer';
+import {useUrl} from '@/composables/useUrl';
 import {useLocalize} from '@/composables/useLocalize';
 import {useFetchPaginated} from '@/composables/useFetchPaginated';
 import {useFetch} from '@/composables/useFetch';
@@ -21,9 +21,9 @@ export const useUserInvitationManagerStore = defineComponentStore(
 		/**
 		 * redirect to send invitation page
 		 */
-		const {pageUrl: sendInvitationPageUrl} = useUrl('invitation/invite');
+		const {redirectToPage} = useUrl('invitation/create/userRoleAssignment');
 		function createNewInvitation() {
-			window.location = sendInvitationPageUrl.value;
+			redirectToPage();
 		}
 
 		/**
@@ -81,6 +81,9 @@ export const useUserInvitationManagerStore = defineComponentStore(
 		}
 
 		function handleEditInvitation(invitationObj) {
+			const {redirectToPage: redirectToEditInvitationPage} = useUrl(
+				`invitation/edit/${invitationObj.id}`,
+			);
 			openDialog({
 				title: t('userInvitation.edit.title'),
 				message: t('userInvitation.edit.message'),
@@ -89,8 +92,7 @@ export const useUserInvitationManagerStore = defineComponentStore(
 						label: t('userInvitation.edit.title'),
 						isPrimary: true,
 						callback: async (close) => {
-							window.location =
-								sendInvitationPageUrl.value + '/' + invitationObj.id;
+							redirectToEditInvitationPage();
 						},
 					},
 					{
@@ -132,7 +134,7 @@ export const useUserInvitationManagerStore = defineComponentStore(
 				actions: [
 					{
 						label: t('invitation.cancelInvite.title'),
-						isPrimary: true,
+						isWarnable: true,
 						callback: async (close) => {
 							const {apiUrl: cancelApiUrl} = useUrl(
 								`invitations/${invitationObj.id}/cancel`,

src/pages/userInvitation/UserInvitationExtendedMetaData.vue

@@ -4,8 +4,8 @@
 			heading-element="h4"
 			:heading="t('user.url')"
 			:value="
-				store.invitationPayload.homePageUrl
-					? store.invitationPayload.homePageUrl
+				store.invitationUserData.homePageUrl
+					? store.invitationUserData.homePageUrl
 					: '--'
 			"
 		></FormDisplayItemBasic>
@@ -14,60 +14,52 @@
 			heading-element="h4"
 			:heading="t('user.phone')"
 			:value="
-				store.invitationPayload.phone ? store.invitationPayload.phone : '--'
+				store.invitationUserData.phone ? store.invitationUserData.phone : '--'
 			"
 		></FormDisplayItemBasic>
 		<FormDisplayItemBasic
 			heading-element="h4"
 			:heading="t('user.workingLanguages')"
 			:value="
-				store.invitationPayload.locales ? store.invitationPayload.locales : '--'
-			"
-		></FormDisplayItemBasic>
-
-		<FormDisplayItemBasic
-			heading-element="h4"
-			:heading="t('user.interests')"
-			:value="
-				localize(store.invitationPayload.reviewerInterests)
-					? localize(store.invitationPayload.reviewerInterests)
+				store.invitationUserData.locales
+					? store.invitationUserData.locales
 					: '--'
 			"
 		></FormDisplayItemBasic>
 
 		<FormDisplayItemBasic
 			heading-element="h4"
-			:heading="t('user.affiliation')"
+			:heading="t('user.interests')"
 			:value="
-				localize(store.invitationPayload.affiliation)
-					? localize(store.invitationPayload.affiliation)
+				localize(store.invitationUserData.reviewerInterests)
+					? localize(store.invitationUserData.reviewerInterests)
 					: '--'
 			"
 		></FormDisplayItemBasic>
 		<FormDisplayItemBasic
 			heading-element="h4"
 			:heading="t('user.bioStatement')"
 			:html-value="
-				localize(store.invitationPayload.biography)
-					? localize(store.invitationPayload.biography)
+				localize(store.invitationUserData.biography)
+					? localize(store.invitationUserData.biography)
 					: '--'
 			"
 		></FormDisplayItemBasic>
 		<FormDisplayItemBasic
 			heading-element="h4"
 			:heading="t('user.mailingAddress')"
 			:html-value="
-				store.invitationPayload.mailingAddress
-					? store.invitationPayload.mailingAddress
+				store.invitationUserData.mailingAddress
+					? store.invitationUserData.mailingAddress
 					: '--'
 			"
 		></FormDisplayItemBasic>
 		<FormDisplayItemBasic
 			heading-element="h4"
 			:heading="t('user.signature')"
 			:html-value="
-				localize(store.invitationPayload.signature)
-					? localize(store.invitationPayload.signature)
+				localize(store.invitationUserData.signature)
+					? localize(store.invitationUserData.signature)
 					: '--'
 			"
 		></FormDisplayItemBasic>

src/pages/userInvitation/UserInvitationPage.vue

@@ -128,6 +128,10 @@ const props = defineProps({
 		type: String,
 		required: true,
 	},
+	invitationUserData: {
+		type: Array,
+		required: true,
+	},
 });
 const {t} = useLocalize();
 const wrapper = ref(null);

src/pages/userInvitation/UserInvitationPageStore.js

@@ -23,6 +23,7 @@ export const useUserInvitationPageStore = defineComponentStore(
 		const updatedPayload = ref({});
 		const invitationType = ref(pageInitConfig.invitationType);
 		const invitationMode = ref(pageInitConfig.invitationMode);
+		const invitationUserData = ref(pageInitConfig.invitationUserData);
 		const detectChanges = ref(false);
 
 		function updatePayload(fieldName, value, initialValue = true) {
@@ -349,7 +350,7 @@ export const useUserInvitationPageStore = defineComponentStore(
 								},
 							},
 						],
-						modalStyle: 'success',
+						modalStyle: 'primary',
 					});
 				} else {
 					isSubmitting.value = false;
@@ -411,6 +412,7 @@ export const useUserInvitationPageStore = defineComponentStore(
 			updatePayload,
 			registerActionForStepId,
 			emailTemplatesApiUrl,
+			invitationUserData,
 
 			currentStep,
 			currentStepIndex,