From ce4fe44b03a3278382b58dfeedacf05d4fac9b75 Mon Sep 17 00:00:00 2001 From: carlossa Date: Fri, 17 Nov 2023 14:06:43 +0100 Subject: [PATCH] refs #6157 refactor --- src/components/ui/VnPaginate.vue | 1 + src/composables/useArrayData.js | 2 +- src/css/app.scss | 6 ++ src/pages/Claim/Card/ClaimAction.vue | 89 +++++++++----------- test/cypress/integration/claimAction.spec.js | 16 ++++ test/cypress/support/commands.js | 3 +- 6 files changed, 68 insertions(+), 49 deletions(-) diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue index d21d073f2..a4d9af51b 100644 --- a/src/components/ui/VnPaginate.vue +++ b/src/components/ui/VnPaginate.vue @@ -68,6 +68,7 @@ const arrayData = useArrayData(props.dataKey, { limit: props.limit, order: props.order, userParams: props.userParams, + skip: 0, }); const store = arrayData.store; diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js index 9aff0eaa8..35997c9d5 100644 --- a/src/composables/useArrayData.js +++ b/src/composables/useArrayData.js @@ -42,7 +42,7 @@ export function useArrayData(key, userOptions) { ]; if (typeof userOptions === 'object') { for (const option in userOptions) { - const isEmpty = userOptions[option] == null || userOptions[option] == ''; + const isEmpty = userOptions[option] == null || userOptions[option] === ''; if (isEmpty || !allowedOptions.includes(option)) continue; if (Object.prototype.hasOwnProperty.call(store, option)) { diff --git a/src/css/app.scss b/src/css/app.scss index 0f04c9ad8..99170202d 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -45,3 +45,9 @@ body.body--dark { .bg-vn-dark { background-color: var(--vn-dark); } + +.vn-card { + background-color: var(--vn-gray); + color: var(--vn-text); + border-radius: 8px; +} diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue index c52741160..58ee38dd0 100644 --- a/src/pages/Claim/Card/ClaimAction.vue +++ b/src/pages/Claim/Card/ClaimAction.vue @@ -1,5 +1,5 @@