From 023df649d8a56ffb79c29531b19e7faf5d07c818 Mon Sep 17 00:00:00 2001 From: deetz99 <73151365+deetz99@users.noreply.github.com> Date: Thu, 19 Dec 2024 14:44:56 -0800 Subject: [PATCH] All - UI: radio group position (#410) * use new account change route meta * fix radio group position * fix dep verison * fix dep version --- strr-base-web/app/app.config.ts | 4 ++-- strr-base-web/app/composables/useStrrModals.ts | 17 ++++++----------- strr-base-web/package.json | 2 +- strr-base-web/pnpm-lock.yaml | 8 ++++---- strr-host-pm-web/package.json | 4 ++-- strr-host-pm-web/pnpm-lock.yaml | 8 ++++---- .../app/pages/platform/application.vue | 14 ++------------ .../app/pages/platform/dashboard.vue | 13 ++----------- strr-platform-web/app/utils/account-change.ts | 14 ++++++++++++++ strr-platform-web/package.json | 4 ++-- strr-platform-web/pnpm-lock.yaml | 8 ++++---- strr-strata-web/package.json | 4 ++-- strr-strata-web/pnpm-lock.yaml | 8 ++++---- 13 files changed, 49 insertions(+), 59 deletions(-) create mode 100644 strr-platform-web/app/utils/account-change.ts diff --git a/strr-base-web/app/app.config.ts b/strr-base-web/app/app.config.ts index 23b66d247..ade6a1970 100644 --- a/strr-base-web/app/app.config.ts +++ b/strr-base-web/app/app.config.ts @@ -52,8 +52,8 @@ export default defineAppConfig({ label: '-mt-[2px] pl-3 text-base cursor-pointer' }, radioGroup: { - wrapper: 'max-w-bcGovInput', - fieldset: 'space-y-4 -mt-4', + wrapper: 'max-w-bcGovInput group', + fieldset: 'space-y-4 group-has-[legend]:-mt-4 [&:not(:has(legend))]:mt-1', legend: 'text-sm font-medium text-gray-700 dark:text-gray-200 mb-0' }, select: { diff --git a/strr-base-web/app/composables/useStrrModals.ts b/strr-base-web/app/composables/useStrrModals.ts index d7f5e3310..991be9fd9 100644 --- a/strr-base-web/app/composables/useStrrModals.ts +++ b/strr-base-web/app/composables/useStrrModals.ts @@ -72,27 +72,22 @@ export const useStrrModals = () => { }) } - function openConfirmSwitchAccountModal (oldAccountId: string) { + function openConfirmSwitchAccountModal (newAccountId: string) { modal.open(ModalBase, { title: t('modal.changeAccountConfirm.title'), content: t('modal.changeAccountConfirm.content'), - persist: true, - closeFn: () => { - accountStore.switchCurrentAccount(oldAccountId) - modal.close() - }, actions: [ { label: t('modal.changeAccountConfirm.leaveBtn'), - handler: () => handleExternalRedirect(config.registryHomeURL + 'dashboard') + handler: () => { + accountStore.switchCurrentAccount(newAccountId) + handleExternalRedirect(config.registryHomeURL + 'dashboard') + } }, { label: t('btn.cancel'), variant: 'outline', - handler: () => { - accountStore.switchCurrentAccount(oldAccountId) - modal.close() - } + handler: () => modal.close() } ] }) diff --git a/strr-base-web/package.json b/strr-base-web/package.json index b4b16f40e..ee0d8088b 100644 --- a/strr-base-web/package.json +++ b/strr-base-web/package.json @@ -42,7 +42,7 @@ "vitest": "^1.6.0" }, "dependencies": { - "@daxiom/nuxt-core-layer-test": "^0.0.15", + "@daxiom/nuxt-core-layer-test": "^0.0.17", "@vuepic/vue-datepicker": "^9.0.3", "country-codes-list": "^1.6.11", "luxon": "^3.5.0", diff --git a/strr-base-web/pnpm-lock.yaml b/strr-base-web/pnpm-lock.yaml index 0a99c4b81..7a75733e6 100644 --- a/strr-base-web/pnpm-lock.yaml +++ b/strr-base-web/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: '@daxiom/nuxt-core-layer-test': - specifier: ^0.0.15 - version: 0.0.15(nuxt@3.12.3)(pinia@2.1.7)(rollup@4.18.0)(typescript@5.5.3)(vite@5.3.3)(vue@3.4.31) + specifier: ^0.0.17 + version: 0.0.17(nuxt@3.12.3)(pinia@2.1.7)(rollup@4.18.0)(typescript@5.5.3)(vite@5.3.3)(vue@3.4.31) '@vuepic/vue-datepicker': specifier: ^9.0.3 version: 9.0.3(vue@3.4.31) @@ -645,8 +645,8 @@ packages: postcss-selector-parser: 6.1.0 dev: false - /@daxiom/nuxt-core-layer-test@0.0.15(nuxt@3.12.3)(pinia@2.1.7)(rollup@4.18.0)(typescript@5.5.3)(vite@5.3.3)(vue@3.4.31): - resolution: {integrity: sha512-21/x0s9iEuA7QTbeUuwHdIisZ7Galr5ozXmziWtowjaLIhBNRkE0kBMJpg/My73KR2+9GjN6Fj0dnCoCLrA3XQ==} + /@daxiom/nuxt-core-layer-test@0.0.17(nuxt@3.12.3)(pinia@2.1.7)(rollup@4.18.0)(typescript@5.5.3)(vite@5.3.3)(vue@3.4.31): + resolution: {integrity: sha512-nwuQgH6O3xowIAbN3ZZkREgqZVlhHdDfLgVilcqEtmRPck0Z+Dhq5GBRKlWX6ZxlKqx9ryDQF9ROPDsh6WN1bw==} dependencies: '@iconify-json/mdi': 1.1.68 '@nuxt/content': 2.13.2(nuxt@3.12.3)(rollup@4.18.0)(vue@3.4.31) diff --git a/strr-host-pm-web/package.json b/strr-host-pm-web/package.json index c0bc4ff5d..da6fe0eaf 100644 --- a/strr-host-pm-web/package.json +++ b/strr-host-pm-web/package.json @@ -2,7 +2,7 @@ "name": "strr-host-pm-web", "private": true, "type": "module", - "version": "0.0.16", + "version": "0.0.17", "scripts": { "build-check": "nuxt build", "build": "nuxt generate", @@ -42,7 +42,7 @@ "vitest": "^1.6.0" }, "dependencies": { - "@daxiom/nuxt-core-layer-test": "^0.0.15", + "@daxiom/nuxt-core-layer-test": "^0.0.17", "@nuxt/ui": "2.19.2", "@vuepic/vue-datepicker": "^9.0.3", "country-codes-list": "^1.6.11", diff --git a/strr-host-pm-web/pnpm-lock.yaml b/strr-host-pm-web/pnpm-lock.yaml index eaccfc23f..d5ff41837 100644 --- a/strr-host-pm-web/pnpm-lock.yaml +++ b/strr-host-pm-web/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: '@daxiom/nuxt-core-layer-test': - specifier: ^0.0.15 - version: 0.0.15(nuxt@3.12.3)(pinia@2.3.0)(rollup@4.18.0)(typescript@5.5.3)(vite@5.3.3)(vue@3.5.13) + specifier: ^0.0.17 + version: 0.0.17(nuxt@3.12.3)(pinia@2.3.0)(rollup@4.18.0)(typescript@5.5.3)(vite@5.3.3)(vue@3.5.13) '@nuxt/ui': specifier: 2.19.2 version: 2.19.2(rollup@4.18.0)(vite@5.3.3)(vue@3.5.13) @@ -798,8 +798,8 @@ packages: postcss-selector-parser: 7.0.0 dev: false - /@daxiom/nuxt-core-layer-test@0.0.15(nuxt@3.12.3)(pinia@2.3.0)(rollup@4.18.0)(typescript@5.5.3)(vite@5.3.3)(vue@3.5.13): - resolution: {integrity: sha512-21/x0s9iEuA7QTbeUuwHdIisZ7Galr5ozXmziWtowjaLIhBNRkE0kBMJpg/My73KR2+9GjN6Fj0dnCoCLrA3XQ==} + /@daxiom/nuxt-core-layer-test@0.0.17(nuxt@3.12.3)(pinia@2.3.0)(rollup@4.18.0)(typescript@5.5.3)(vite@5.3.3)(vue@3.5.13): + resolution: {integrity: sha512-nwuQgH6O3xowIAbN3ZZkREgqZVlhHdDfLgVilcqEtmRPck0Z+Dhq5GBRKlWX6ZxlKqx9ryDQF9ROPDsh6WN1bw==} dependencies: '@iconify-json/mdi': 1.2.2 '@nuxt/content': 2.13.4(nuxt@3.12.3)(rollup@4.18.0)(vue@3.5.13) diff --git a/strr-platform-web/app/pages/platform/application.vue b/strr-platform-web/app/pages/platform/application.vue index 33a02b175..0bd4a21ec 100644 --- a/strr-platform-web/app/pages/platform/application.vue +++ b/strr-platform-web/app/pages/platform/application.vue @@ -4,7 +4,6 @@ import { ConnectStepper, FormPlatformReviewConfirm } from '#components' const { t } = useI18n() const localePath = useLocalePath() const strrModal = useStrrModals() -const accountStore = useConnectAccountStore() const { validateContact } = useStrrContactStore() const { validatePlatformBusiness } = useStrrPlatformBusiness() @@ -214,16 +213,6 @@ watch(activeStepIndex, (val) => { setButtonControl({ leftButtons: [], rightButtons: buttons }) }, { immediate: true }) -// manage account changes mid-application -const originalAccountId = accountStore.currentAccount.id // TODO: find better solution than this -watch(() => accountStore.currentAccount.id, - (newVal, oldVal) => { - if (newVal !== undefined && newVal !== originalAccountId) { - strrModal.openConfirmSwitchAccountModal(oldVal) - } - } -) - // page stuff useHead({ title: t('strr.title.application') @@ -231,7 +220,8 @@ useHead({ definePageMeta({ layout: 'connect-form', - middleware: ['auth', 'check-tos', 'require-premium-account', 'application-page'] + middleware: ['auth', 'check-tos', 'require-premium-account', 'application-page'], + onAccountChange: (oldAccount: Account, newAccount: Account) => manageAccountChangeApplication(oldAccount, newAccount) }) setBreadcrumbs([ diff --git a/strr-platform-web/app/pages/platform/dashboard.vue b/strr-platform-web/app/pages/platform/dashboard.vue index 674656adb..efb25698e 100644 --- a/strr-platform-web/app/pages/platform/dashboard.vue +++ b/strr-platform-web/app/pages/platform/dashboard.vue @@ -1,7 +1,6 @@