Skip to content

Commit f9a3403

Browse files
committed
small ux tweaks for suspended table
1 parent 79e2b32 commit f9a3403

File tree

1 file changed

+75
-23
lines changed

1 file changed

+75
-23
lines changed

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

Lines changed: 75 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
v-show="showDatePicker"
55
ref="datePicker"
66
:reset="dateRangeReset"
7-
:setEndDate="searchParams.endDate"
8-
:setStartDate="searchParams.startDate"
7+
:setEndDate="searchParams.suspendedDateTo"
8+
:setStartDate="searchParams.suspendedDateFrom"
99
@submit="updateDateRange($event)"
1010
/>
1111
<v-form class="datatable-search account-suspended-search">
@@ -33,7 +33,7 @@
3333

3434
<template #no-data>
3535
<div class="py-8 no-data">
36-
{{ noDataMessage }}
36+
<div v-html="noDataMessage" />
3737
</div>
3838
</template>
3939

@@ -252,8 +252,8 @@ export default defineComponent({
252252
name: '',
253253
decisionMadeBy: '',
254254
orgType: OrgAccountTypes.ALL,
255-
startDate: '',
256-
endDate: '',
255+
suspendedDateFrom: '',
256+
suspendedDateTo: '',
257257
suspensionReasonCode: '',
258258
statuses: [AccountStatus.NSF_SUSPENDED, AccountStatus.SUSPENDED]
259259
} as any,
@@ -283,8 +283,8 @@ export default defineComponent({
283283
return (state.searchParams.name && state.searchParams.name.length > 0) ||
284284
(state.searchParams.decisionMadeBy && state.searchParams.decisionMadeBy.length > 0) ||
285285
(state.searchParams.orgType && state.searchParams.orgType !== OrgAccountTypes.ALL) ||
286-
(state.searchParams.startDate && state.searchParams.startDate.length > 0) ||
287-
(state.searchParams.endDate && state.searchParams.endDate.length > 0) ||
286+
(state.searchParams.suspendedDateFrom && state.searchParams.suspendedDateFrom.length > 0) ||
287+
(state.searchParams.suspendedDateTo && state.searchParams.suspendedDateTo.length > 0) ||
288288
(state.searchParams.suspensionReasonCode && state.searchParams.suspensionReasonCode.length > 0)
289289
})
290290
@@ -325,11 +325,11 @@ export default defineComponent({
325325
if (isEmpty(state.searchParams.suspensionReasonCode)) {
326326
delete completeSearchParams.suspensionReasonCode
327327
}
328-
if (isEmpty(state.searchParams.startDate)) {
329-
delete completeSearchParams.startDate
328+
if (isEmpty(state.searchParams.suspendedDateFrom)) {
329+
delete completeSearchParams.suspendedDateFrom
330330
}
331-
if (isEmpty(state.searchParams.endDate)) {
332-
delete completeSearchParams.endDate
331+
if (isEmpty(state.searchParams.suspendedDateTo)) {
332+
delete completeSearchParams.suspendedDateTo
333333
}
334334
const activeAccountsResp: any = await staffStore.searchOrgs(completeSearchParams)
335335
state.suspendedOrgs = activeAccountsResp?.orgs || []
@@ -356,8 +356,8 @@ export default defineComponent({
356356
name: '',
357357
decisionMadeBy: '',
358358
orgType: OrgAccountTypes.ALL,
359-
startDate: '',
360-
endDate: '',
359+
suspendedDateFrom: '',
360+
suspendedDateTo: '',
361361
suspensionReasonCode: '',
362362
statuses: [AccountStatus.NSF_SUSPENDED, AccountStatus.SUSPENDED]
363363
})
@@ -374,8 +374,8 @@ export default defineComponent({
374374
state.dateTxt = ''
375375
}
376376
377-
state.searchParams.startDate = event.startDate
378-
state.searchParams.endDate = event.endDate
377+
state.searchParams.suspendedDateFrom = event.startDate
378+
state.searchParams.suspendedDateTo = event.endDate
379379
state.showDatePicker = false
380380
}
381381
@@ -433,11 +433,11 @@ export default defineComponent({
433433
if (parsed) {
434434
Object.assign(state.searchParams, parsed)
435435
}
436-
if (state.searchParams.startDate && state.searchParams.endDate) {
437-
state.dateTxt = formatDateRange(state.searchParams.startDate, state.searchParams.endDate)
436+
if (state.searchParams.suspendedDateFrom && state.searchParams.suspendedDateTo) {
437+
state.dateTxt = formatDateRange(state.searchParams.suspendedDateFrom, state.searchParams.suspendedDateTo)
438438
}
439439
} catch {
440-
console.error('Error parsing org search filter from session:', orgSearchFilter)
440+
console.warn('Error parsing org search filter from session:', orgSearchFilter)
441441
}
442442
443443
const initialTableOptions = {
@@ -486,21 +486,49 @@ export default defineComponent({
486486
min-width: 210px !important;
487487
}
488488
489+
::v-deep table {
490+
border-collapse: separate;
491+
border-spacing: 0;
492+
}
493+
494+
::v-deep table th,
495+
::v-deep table td {
496+
border-right: none !important;
497+
border-left: none !important;
498+
}
499+
489500
.header-row-1 {
490501
th {
491-
padding: 6px 3px 4px 3px !important;
492-
border-bottom: thin solid rgba(0, 0, 0, 0.12) !important;
493-
line-height: 1.2 !important;
502+
font-size: 14px;
503+
font-weight: bold !important;
504+
padding: 18px 3px 18px 3px !important;
505+
border-bottom: thin solid rgba(0, 0, 0, 0.12);
506+
border-right: none !important;
507+
border-left: none !important;
508+
}
509+
510+
th:first-child {
511+
padding-left: 14px !important;
512+
}
513+
514+
th:last-child {
515+
padding-right: 20px !important;
494516
}
495517
}
496518
497519
.header-row-2 {
498520
th {
499521
padding: 18px 3px 18px 3px !important;
500-
border-bottom: thin solid rgba(0, 0, 0, 0.12) !important;
522+
border-bottom: thin solid rgba(0, 0, 0, 0.12);
523+
border-right: none !important;
524+
border-left: none !important;
501525
vertical-align: top !important;
502526
}
503527
528+
th:first-child {
529+
padding-left: 14px !important;
530+
}
531+
504532
.v-text-field,
505533
.v-select {
506534
margin: 0 !important;
@@ -520,6 +548,11 @@ export default defineComponent({
520548
height: 28px !important;
521549
margin: 0 !important;
522550
padding: 0 8px !important;
551+
background-color: transparent !important;
552+
border: none !important;
553+
border-bottom: thin solid rgba(0, 0, 0, 0.12) !important;
554+
border-radius: 0 !important;
555+
box-shadow: none !important;
523556
}
524557
525558
.v-text-field--filled .v-input__control,
@@ -528,6 +561,16 @@ export default defineComponent({
528561
margin-top: 0 !important;
529562
}
530563
564+
.v-text-field--filled .v-input__slot::before,
565+
.v-select--filled .v-input__slot::before {
566+
display: none !important;
567+
}
568+
569+
.v-text-field--filled .v-input__slot::after,
570+
.v-select--filled .v-input__slot::after {
571+
display: none !important;
572+
}
573+
531574
.v-text-field input {
532575
padding: 0 !important;
533576
font-size: 14px !important;
@@ -568,6 +611,16 @@ export default defineComponent({
568611
margin: 0 !important;
569612
height: 28px !important;
570613
padding: 0 8px !important;
614+
background-color: transparent !important;
615+
border: none !important;
616+
border-bottom: thin solid rgba(0, 0, 0, 0.12) !important;
617+
border-radius: 0 !important;
618+
box-shadow: none !important;
619+
}
620+
621+
.v-text-field--filled .v-input__slot::before,
622+
.v-text-field--filled .v-input__slot::after {
623+
display: none !important;
571624
}
572625
573626
input {
@@ -584,7 +637,6 @@ export default defineComponent({
584637
}
585638
}
586639
587-
588640
th:last-child {
589641
padding-right: 14px !important;
590642
background: white !important;

0 commit comments

Comments
 (0)