Skip to content

Commit

Permalink
WIP: Invitation fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ewhanson committed Dec 9, 2024
1 parent b182fad commit c29367c
Showing 5 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/components/Modal/Dialog.vue
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@
<div class="flex min-h-12 items-center">
<DialogTitle
v-if="title"
class="m-0 inline-flex min-w-[1px] items-center overflow-x-hidden overflow-ellipsis whitespace-nowrap px-8 pt-12 text-4xl-bold"
class="m-0 inline-flex min-w-[1px] items-center overflow-x-hidden overflow-ellipsis px-8 pt-12 text-4xl-bold"
:class="icon ? 'pb-5' : 'pb-8'"
>
<div v-if="icon" :class="iconStyles">
Original file line number Diff line number Diff line change
@@ -2,10 +2,10 @@
<p>{{ message }}</p>
<div>
<ul role="list">
<li>{{ t('user.email') }}:{{ email }}</li>
<li>{{ t('userInvitation.roleTable.role') }}:{{ roles }}</li>
<li>{{ t('common.status') }}:{{ status }}</li>
<li>{{ t('user.affiliation') }}:{{ affiliation }}</li>
<li>{{ t('user.email') }}: {{ email }}</li>
<li>{{ t('userInvitation.roleTable.role') }}: {{ roles }}</li>
<li>{{ t('common.status') }}: {{ status }}</li>
<li>{{ t('user.affiliation') }}: {{ affiliation }}</li>
</ul>
</div>
</template>
Original file line number Diff line number Diff line change
@@ -131,7 +131,7 @@ export const useUserInvitationManagerStore = defineComponentStore(
}),
affiliation: invitationObj.existingUser
? localize(invitationObj.existingUser.affiliation)
: invitationObj.affiliation,
: localize(invitationObj.affiliation),
},
actions: [
{
3 changes: 2 additions & 1 deletion src/pages/acceptInvitation/AcceptInvitationPageStore.js
Original file line number Diff line number Diff line change
@@ -92,8 +92,9 @@ export const useAcceptInvitationPageStore = defineComponentStore(
'privacyStatement',
userId.value ? true : false,
);
updateAcceptInvitationPayload('affiliation', data.value.affiliation);
// add username to invitation payload for validations
updateAcceptInvitationPayload('username', null);
updateAcceptInvitationPayload('username', data.value.username);
// add password to invitation payload for validations
updateAcceptInvitationPayload('password', null);
errors.value = [];
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
<div class="my-4">
<FieldText
:label="t('user.username')"
:value="fields.username"
:value="store.acceptInvitationPayload.username"
:description="t('acceptInvitation.usernameField.description')"
:is-required="true"
name="username"

0 comments on commit c29367c

Please sign in to comment.