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

20416 - Animation added when there a new linkage established #2804

Merged
merged 1 commit into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions auth-web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion auth-web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "auth-web",
"version": "2.6.2",
"version": "2.6.3",
"appName": "Auth Web",
"sbcName": "SBC Common Components",
"private": true,
Expand Down
2 changes: 0 additions & 2 deletions auth-web/src/components/pay/LinkedShortNameTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
:updateFilter="updateFilter"
:useObserver="true"
:observerCallback="infiniteScrollCallback"
:highlight-index="state.highlightIndex"
highlight-class="base-table__item-row-green"
@update-table-options="tableDataOptions = $event"
>
<template #header-title>
Expand Down
27 changes: 17 additions & 10 deletions auth-web/src/components/pay/ShortNameSummaryTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
:updateFilter="updateFilter"
:useObserver="true"
:observerCallback="() => infiniteScrollCallback(true)"
:highlight-index="highlightIndex"
highlight-class="base-table__item-row-green"
@update-table-options="options = $event"
>
<template #header-title>
Expand Down Expand Up @@ -196,7 +198,7 @@ export default defineComponent({
snackbarText: ''
})
const {
infiniteScrollCallback, loadTableData, loadTableSummaryData, updateFilter
infiniteScrollCallback, loadTableSummaryData, updateFilter
} = useShortNameTable(state, emit)
const createHeader = (col, label, type, value, filterValue = '', hasFilter = true, minWidth = '125px') => ({
col,
Expand Down Expand Up @@ -340,15 +342,20 @@ export default defineComponent({
}

async function onLinkedAccount (account: EFTShortnameResponse) {
if (account) {
await loadTableData()
state.snackbarText = `Bank short name ${account.shortName} was successfully linked.`
state.highlightIndex = state.results.findIndex((result) => result.id === account.id)
state.snackbar = true
setTimeout(() => {
state.highlightIndex = -1
}, 4000)
}
if (!account) return

const { results } = state
const shortName = results.find(result => result.id === account.shortNameId)

if (!shortName) return

state.snackbarText = `Bank short name ${shortName.shortName} was successfully linked.`
state.highlightIndex = results.indexOf(shortName)
state.snackbar = true

setTimeout(() => {
state.highlightIndex = -1
}, 4000)
}

watch(() => props.linkedAccount, (account: EFTShortnameResponse) => {
Expand Down
46 changes: 35 additions & 11 deletions auth-web/src/components/pay/eft/ShortNameAccountLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<v-card v-if="shortNameDetails.shortName">
<ShortNameLinkingDialog
:isShortNameLinkingDialogOpen="isShortNameLinkingDialogOpen"
:selectedShortName="shortNameDetails"
:selectedShortName="eftShortNameSummary"
@close-short-name-linking-dialog="closeShortNameLinkingDialog"
@on-link-account="onLinkAccount"
/>
Expand Down Expand Up @@ -32,7 +32,8 @@
>
+ Link a New Account
</v-btn>
<div>
<!-- move highlight index to data table when multi-linking is implemented -->
<div :class="{'base-table__item-row-green': highlightIndex === 1}">
All payments from {{ shortNameDetails.shortName }} will be applied to: <b>{{ accountDisplayText }}</b>
</div>
</v-card-text>
Expand All @@ -54,9 +55,8 @@
</template>
<script lang="ts">

import { computed, defineComponent, reactive, toRefs } from '@vue/composition-api'
import ConfigHelper from '@/util/config-helper'
import { SessionStorageKeys } from '@/util/constants'
import { computed, defineComponent, reactive, toRefs, watch } from '@vue/composition-api'
import PaymentService from '@/services/payment.services'
import ShortNameLinkingDialog from '@/components/pay/eft/ShortNameLinkingDialog.vue'

export default defineComponent({
Expand All @@ -66,11 +66,17 @@ export default defineComponent({
shortNameDetails: {
type: Object,
default: () => ({})
},
highlightIndex: {
type: Number,
default: -1
}
},
setup (props, { root }) {
emits: ['on-link-account'],
setup (props, { emit }) {
const state = reactive({
isShortNameLinkingDialogOpen: false
isShortNameLinkingDialogOpen: false,
eftShortNameSummary: {}
})

const isLinked = computed<boolean>(() => {
Expand All @@ -90,18 +96,33 @@ export default defineComponent({
}

function onLinkAccount (account: any) {
ConfigHelper.addToSession(SessionStorageKeys.LinkedAccount, JSON.stringify(account))
ConfigHelper.addToSession(SessionStorageKeys.ShortNamesTabIndex, 0)
root.$router.push('/pay/manage-shortnames')
emit('on-link-account', account)
}

async function getEFTShortNameSummaries () {
const filters = {
filterPayload: {
shortName: props.shortNameDetails.shortName
}
}
const EFTShortNameSummaries = await PaymentService.getEFTShortNameSummaries(filters)
if (EFTShortNameSummaries.data && EFTShortNameSummaries.data.items.length > 0) {
state.eftShortNameSummary = EFTShortNameSummaries.data.items[0]
}
}

watch(() => props.shortNameDetails.shortName, () => {
getEFTShortNameSummaries()
})

return {
...toRefs(state),
isLinked,
accountDisplayText,
openAccountLinkingDialog,
closeShortNameLinkingDialog,
onLinkAccount
onLinkAccount,
getEFTShortNameSummaries
}
}
})
Expand All @@ -121,5 +142,8 @@ export default defineComponent({
font-size: 36px;
}
}
.base-table__item-row-green {
background-color: $table-green !important;
}

</style>
1 change: 0 additions & 1 deletion auth-web/src/services/payment.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@ export default class PaymentService {
if (viewAll) {
params.append('viewAll', `${viewAll}`)
}

if (filterParams.filterPayload) {
for (const [key, value] of Object.entries(filterParams.filterPayload)) {
if (value) {
Expand Down
2 changes: 1 addition & 1 deletion auth-web/src/views/pay/ShortNameMappingView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export default defineComponent({
})

function onLinkAccount (account: any) {
tab.value = 1
tab.value = 0
state.linkedAccount = account
ConfigHelper.addToSession(SessionStorageKeys.ShortNamesTabIndex, tab.value)
}
Expand Down
39 changes: 33 additions & 6 deletions auth-web/src/views/pay/eft/ShortNameDetailsView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
id="shortname-details"
class="view-container"
>
<v-snackbar
id="linked-account-snackbar"
v-model="snackbar"
:timeout="4000"
transition="fade"
>
{{ snackbarText }}
</v-snackbar>
<div class="view-header flex-column">
<h1 class="view-header__title">
Payment Details
Expand All @@ -12,16 +20,20 @@
</p>
</div>

<ShortNameTransactions
<ShortNameAccountLinkage
class="mb-12"
:shortNameDetails="state.shortNameDetails"
:shortNameDetails="shortNameDetails"
:highlightIndex="highlightIndex"
@on-link-account="onLinkAccount"
/>

<ShortNameAccountLinkage :shortNameDetails="state.shortNameDetails" />
<ShortNameTransactions
:shortNameDetails="shortNameDetails"
/>
</v-container>
</template>
<script lang="ts">
import { PropType, defineComponent, onMounted, reactive } from '@vue/composition-api'
import { PropType, defineComponent, onMounted, reactive, toRefs } from '@vue/composition-api'
import PaymentService from '@/services/payment.services'
import ShortNameAccountLinkage from '@/components/pay/eft/ShortNameAccountLink.vue'
import ShortNameTransactions from '@/components/pay/eft/ShortNameTransactions.vue'
Expand All @@ -37,13 +49,27 @@ export default defineComponent({
},
setup (props) {
const state = reactive({
shortNameDetails: {}
shortNameDetails: {},
highlightIndex: -1,
snackbar: false,
snackbarText: ''
})

onMounted(async () => {
await loadShortname(props.shortNameId)
})

async function onLinkAccount () {
await loadShortname(props.shortNameId)
state.snackbarText = `Bank short name ${state.shortNameDetails.shortName} was successfully linked.`
state.highlightIndex = 1 // highlight indexOf when multi-linking is implemented
state.snackbar = true

setTimeout(() => {
state.highlightIndex = -1
}, 4000)
}

async function loadShortname (shortnameId: string): Promise<void> {
try {
const response = await PaymentService.getEFTShortname(shortnameId)
Expand All @@ -59,7 +85,8 @@ export default defineComponent({
}

return {
state
...toRefs(state),
onLinkAccount
}
}
})
Expand Down
Loading