Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

15769 - Manage a B.C. Business modal view for Corporation #2468

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
ca1cfc9
Design updates
rodrigo-barraza Aug 16, 2023
d07d66d
Merge branch 'feature-business-registry-dashboard-updates' into featu…
rodrigo-barraza Aug 16, 2023
612a262
Merge branch 'feature-business-registry-dashboard-updates' into featu…
rodrigo-barraza Aug 17, 2023
57cfecc
Updating copy and styles
rodrigo-barraza Aug 17, 2023
fdb339d
Style fixes
rodrigo-barraza Aug 17, 2023
32caf37
Business logic for modal
rodrigo-barraza Aug 18, 2023
629d03f
Updating tests
rodrigo-barraza Aug 18, 2023
15f5990
Clean up tests
rodrigo-barraza Aug 18, 2023
8852628
Revert package.json
rodrigo-barraza Aug 18, 2023
84d6843
Merge branch 'feature-business-registry-dashboard-updates' into featu…
rodrigo-barraza Aug 18, 2023
fdf4bfa
Style fix
rodrigo-barraza Aug 18, 2023
cd0c788
Small fix
rodrigo-barraza Aug 18, 2023
4162ea6
Moving logic to computed
rodrigo-barraza Aug 18, 2023
9c6b048
Firm cleanup
rodrigo-barraza Aug 18, 2023
17bbbb0
Refactoring CSS
rodrigo-barraza Aug 18, 2023
e8c96ba
Remove isFirmNumber
rodrigo-barraza Aug 18, 2023
4eef39d
Linting issues
rodrigo-barraza Aug 18, 2023
6ca0624
Lint fix
rodrigo-barraza Aug 18, 2023
3c70d67
Check for businessContactEmail
rodrigo-barraza Aug 18, 2023
2574d09
Contact info fix
rodrigo-barraza Aug 18, 2023
d3e086b
Passing orgId
rodrigo-barraza Aug 18, 2023
8a90964
Working CreateAffiliationInvitation
rodrigo-barraza Aug 18, 2023
2fab1bd
Merge branch 'feature-business-registry-dashboard-updates' into featu…
rodrigo-barraza Aug 20, 2023
7038724
Cleanup, bug and PR fixes
rodrigo-barraza Aug 21, 2023
5ed0b35
Test fix
rodrigo-barraza Aug 21, 2023
9d2e246
Updating tests
rodrigo-barraza Aug 21, 2023
269becc
Lint fix
rodrigo-barraza Aug 21, 2023
2fa590b
Close modal upon addition
rodrigo-barraza Aug 21, 2023
79bb873
Fixes
rodrigo-barraza Aug 21, 2023
be2cdac
Identifier
rodrigo-barraza Aug 21, 2023
492cc0f
Updating copy
rodrigo-barraza Aug 21, 2023
36f1497
Authorization on close
rodrigo-barraza Aug 21, 2023
ebc4804
Merge branch 'feature-business-registry-dashboard-updates' into featu…
rodrigo-barraza Aug 21, 2023
bfdaf00
Fixes
rodrigo-barraza Aug 21, 2023
b3bcc32
Merge branch 'feature-business-registry-dashboard-updates' into featu…
rodrigo-barraza Aug 22, 2023
1c34ad0
Lint fix
rodrigo-barraza Aug 22, 2023
52f1e43
Lint fix
rodrigo-barraza Aug 22, 2023
142cd02
Uncomment
rodrigo-barraza Aug 22, 2023
f22a4ad
Stuck loader fix
rodrigo-barraza Aug 22, 2023
03e7599
Merge branch 'feature-business-registry-dashboard-updates' into featu…
rodrigo-barraza Aug 22, 2023
0cde62b
Merge branch 'feature-business-registry-dashboard-updates' into featu…
rodrigo-barraza Aug 23, 2023
148f7fb
Merge fixes
rodrigo-barraza Aug 23, 2023
e664630
Flow fixes
rodrigo-barraza Aug 23, 2023
e21e547
ENUMs and SCSS path fix
rodrigo-barraza Aug 23, 2023
584fb11
Cleanup
rodrigo-barraza Aug 23, 2023
5f4300d
ENUM
rodrigo-barraza Aug 23, 2023
c3fec44
Resending email
rodrigo-barraza Aug 23, 2023
5791463
Cleanup form validation
rodrigo-barraza Aug 23, 2023
33f8df1
Validation cleanup
rodrigo-barraza Aug 23, 2023
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
16 changes: 16 additions & 0 deletions auth-web/src/assets/scss/ModalDialog.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.v-dialog {
> .v-card {
> div {
padding: 16px 40px 0 40px;
&:first-of-type {
padding: 40px 40px 0 40px;
}
&:last-of-type {
padding: 40px 40px 40px 40px;
button {
padding: 0 20px;
}
}
}
}
}
10 changes: 8 additions & 2 deletions auth-web/src/components/auth/common/HelpDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
max-width="45rem"
>
<v-card>
<v-card-title>Need Assistance?</v-card-title>
<v-card-title>
<h1>Need Help?</h1>
</v-card-title>
<v-card-text>
<p
class="mb-7"
Expand Down Expand Up @@ -43,7 +45,7 @@
color="primary"
@click="close()"
>
OK
Close
</v-btn>
</v-card-actions>
</v-card>
Expand Down Expand Up @@ -77,3 +79,7 @@ export default class HelpDialog extends Vue {
}
}
</script>

<style lang="scss" scoped>
@import '@/assets/scss/ModalDialog.scss';
</style>
2 changes: 1 addition & 1 deletion auth-web/src/components/auth/common/ModalDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
data-test="dialog-ok-button"
@click="close()"
>
<span>OK</span>
<span>Close</span>
</v-btn>
</slot>
</v-card-actions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ export default defineComponent({
}

const getRequestForAuthorizationStatusText = (affiliationInviteInfos: AffiliationInviteInfo[]) => {
if (isCurrentOrganization(affiliationInviteInfos[0].toOrg.id)) {
if (isCurrentOrganization(affiliationInviteInfos[0]?.toOrg?.id)) {
seeker25 marked this conversation as resolved.
Show resolved Hide resolved
// incoming request for access
const getAlwaysSameOrderArr = affiliationInviteInfos.slice().sort()
const andOtherAccounts = affiliationInviteInfos.length > 1 ? ` and ${affiliationInviteInfos.length - 1} other account(s)` : ''
Expand All @@ -527,7 +527,7 @@ export default defineComponent({
// outgoing request for access
switch (affiliationInviteInfos[0].status) {
case AffiliationInvitationStatus.Pending:
statusText = 'Request sent, pending authorization'
statusText = 'Confirmation email sent, pending authorization.'
break
case AffiliationInvitationStatus.Accepted:
statusText = '<strong>Authorized</strong> - you can now manage this business.'
Expand Down Expand Up @@ -606,6 +606,10 @@ export default defineComponent({
}

const getPrimaryAction = (item: Business): string => {
const invitationStatus = item?.affiliationInvites?.[0]?.status
if ([AffiliationInvitationStatus.Pending, AffiliationInvitationStatus.Expired].includes(invitationStatus)) {
return 'Resend Email'
}
if (isTemporaryBusiness(item)) {
return 'Resume Draft'
} else if (isNameRequest(item)) {
Expand All @@ -628,6 +632,11 @@ export default defineComponent({
}

const isOpenExternal = (item: Business): boolean => {
const invitationStatus = item?.affiliationInvites?.[0]?.status
if ([AffiliationInvitationStatus.Pending, AffiliationInvitationStatus.Expired].includes(invitationStatus)) {
return false
}

if (isTemporaryBusiness(item)) {
return false
}
Expand Down Expand Up @@ -768,6 +777,11 @@ export default defineComponent({
}

const action = (item: Business): void => {
const invitationStatus = item?.affiliationInvites?.[0]?.status
if ([AffiliationInvitationStatus.Pending, AffiliationInvitationStatus.Expired].includes(invitationStatus)) {
context.emit('resend-affiliation-invitation', item)
return
}
if (isShowRemoveAsPrimaryAction(item)) {
removeBusiness(item)
} else {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<template>
<v-dialog
v-model="computedIsVisible"
attach="#entity-management"
persistent
scrollable
max-width="50rem"
data-test-tag="authorization-email-sent-dialog"
>
<v-card>
<v-card-title>
<h1>Authorization Email Sent</h1>
</v-card-title>
<v-card-text>
<p>An email was sent to <span class="email-address">{{ email }}</span></p>
<p>Confirm your access by clicking the link inside. This will add the business to your Business Registry List. The link is valid for 15 minutes.</p>
</v-card-text>
<v-card-actions class="form__btns">
<span
id="help-button"
class="pl-2 pr-2 mr-auto"
@click.stop="openHelp()"
>
<v-icon>mdi-help-circle-outline</v-icon>
Help
</span>
<v-spacer />
<v-btn
large
color="primary"
@click="closeAuthEmailSentDialog()"
>
Close
</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
</template>
<script lang="ts">
import { computed, defineComponent } from '@vue/composition-api'

export default defineComponent({
name: 'AuthorizationEmailSent',
props: {
email: {
type: String,
default: ''
},
isVisible: {
type: Boolean,
default: false
}
},
setup (props, { emit }) {
const openHelp = () => {
emit('open-help')
}
const closeAuthEmailSentDialog = () => {
emit('close-dialog')
}

const computedIsVisible = computed(() => {
return props.isVisible
})

return {
computedIsVisible,
openHelp,
closeAuthEmailSentDialog
}
}
})
</script>

<style lang="scss" scoped>
@import '$assets/scss/theme.scss';
@import '@/assets/scss/ModalDialog.scss';

.email-address {
font-weight: 600;
}

#help-button {
cursor: pointer;
color: var(--v-primary-base) !important;
.v-icon {
transform: translate(0, -2px) !important;
color: var(--v-primary-base) !important;
}
}
</style>
Loading
Loading