Skip to content

Commit ad0095a

Browse files
committed
Feedback for suspended accounts table
1 parent f9a3403 commit ad0095a

File tree

1 file changed

+19
-28
lines changed

1 file changed

+19
-28
lines changed

auth-web/src/components/auth/staff/account-management/StaffSuspendedAccountsTable.vue

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
:scope="getIndexedTag('find-header-col2', i)"
5858
>
5959
<v-text-field
60-
v-if="['name', 'decisionMadeBy'].includes(header.value)"
60+
v-if="['name', 'id', 'decisionMadeBy'].includes(header.value)"
6161
:id="header.value"
6262
v-model.trim="searchParams[header.value]"
6363
input
@@ -70,21 +70,6 @@
7070
hide-details="auto"
7171
/>
7272

73-
<div
74-
v-else-if="header.value === 'orgType'"
75-
class="mt-0"
76-
>
77-
<v-select
78-
v-model="searchParams[header.value]"
79-
:items="accountTypes"
80-
filled
81-
item-text="description"
82-
item-value="code"
83-
data-test="select-status"
84-
hide-details="auto"
85-
/>
86-
</div>
87-
8873
<div
8974
v-else-if="header.value === 'suspendedOn'"
9075
class="date-filter-wrapper"
@@ -141,8 +126,8 @@
141126
</thead>
142127
</template>
143128

144-
<template #[`item.orgType`]="{ item }">
145-
{{ getAccountTypeFromOrgAndAccessType(item) }}
129+
<template #[`item.id`]="{ item }">
130+
{{ item.id || 'N/A' }}
146131
</template>
147132
<template #[`item.statusCode`]="{ item }">
148133
{{ getStatusText(item) }}
@@ -211,35 +196,35 @@ export default defineComponent({
211196
value: 'name'
212197
},
213198
{
214-
text: 'Type',
199+
text: 'Account Number',
215200
align: 'left',
216201
sortable: false,
217-
value: 'orgType'
202+
value: 'id'
218203
},
219204
{
220-
text: 'Suspended by',
205+
text: 'Reason',
221206
align: 'left',
222207
sortable: false,
223-
value: 'decisionMadeBy'
208+
value: 'statusCode'
224209
},
225210
{
226-
text: 'Date Suspended',
211+
text: 'Suspended by',
227212
align: 'left',
228213
sortable: false,
229-
value: 'suspendedOn'
214+
value: 'decisionMadeBy'
230215
},
231216
{
232-
text: 'Reason',
217+
text: 'Date Suspended',
233218
align: 'left',
234219
sortable: false,
235-
value: 'statusCode'
220+
value: 'suspendedOn'
236221
},
237222
{
238223
text: 'Actions',
239224
align: 'left',
240225
value: 'action',
241226
sortable: false,
242-
width: '105'
227+
width: '90'
243228
}
244229
]
245230
@@ -250,6 +235,7 @@ export default defineComponent({
250235
suspendedOrgs: [] as Organization[],
251236
searchParams: {
252237
name: '',
238+
id: '',
253239
decisionMadeBy: '',
254240
orgType: OrgAccountTypes.ALL,
255241
suspendedDateFrom: '',
@@ -281,6 +267,7 @@ export default defineComponent({
281267
282268
const searchParamsExist = computed(() => {
283269
return (state.searchParams.name && state.searchParams.name.length > 0) ||
270+
(state.searchParams.id && state.searchParams.id.length > 0) ||
284271
(state.searchParams.decisionMadeBy && state.searchParams.decisionMadeBy.length > 0) ||
285272
(state.searchParams.orgType && state.searchParams.orgType !== OrgAccountTypes.ALL) ||
286273
(state.searchParams.suspendedDateFrom && state.searchParams.suspendedDateFrom.length > 0) ||
@@ -325,6 +312,9 @@ export default defineComponent({
325312
if (isEmpty(state.searchParams.suspensionReasonCode)) {
326313
delete completeSearchParams.suspensionReasonCode
327314
}
315+
if (isEmpty(state.searchParams.id)) {
316+
delete completeSearchParams.id
317+
}
328318
if (isEmpty(state.searchParams.suspendedDateFrom)) {
329319
delete completeSearchParams.suspendedDateFrom
330320
}
@@ -354,6 +344,7 @@ export default defineComponent({
354344
state.dateRangeReset++
355345
Object.assign(state.searchParams, {
356346
name: '',
347+
id: '',
357348
decisionMadeBy: '',
358349
orgType: OrgAccountTypes.ALL,
359350
suspendedDateFrom: '',
@@ -698,7 +689,7 @@ export default defineComponent({
698689
699690
table > thead > tr > th:last-child {
700691
width: auto !important;
701-
min-width: 140px !important;
692+
min-width: 90px !important;
702693
padding-right: 14px !important;
703694
}
704695

0 commit comments

Comments
 (0)