From e4d9f8686d0d45b3bd97b74a3fe9c22965986f19 Mon Sep 17 00:00:00 2001 From: Vitalii Date: Thu, 23 Mar 2023 16:14:26 +0200 Subject: [PATCH] satellite/{web, console}: remove old access grant and billing flows Removed old flows along with feature flags. Issue: https://github.com/storj/storj/issues/5694 Change-Id: Ib3a1cbb12435500bdc2c540bb67615c64ca19e5e --- satellite/console/consoleweb/config.go | 2 - satellite/console/consoleweb/server.go | 8 - scripts/testdata/satellite-config.yaml.lock | 6 - web/satellite/index.html | 2 - web/satellite/src/App.vue | 5 - .../components/accessGrants/AccessGrants.vue | 49 +- .../accessGrants/CreateAccessModal.vue | 317 -------- .../CreateAccessGrantFlow.vue | 22 +- .../components/ButtonsContainer.vue | 0 .../components/ContainerWithIcon.vue | 0 .../components/EndDatePicker.vue | 0 .../components/EndDateSelection.vue | 0 .../components/LinkButton.vue | 0 .../components/Radio.vue | 0 .../components/Toggle.vue | 0 .../components/ValueWithBlur.vue | 0 .../steps/AccessCreatedStep.vue | 6 +- .../steps/AccessEncryptionStep.vue | 6 +- .../steps/CLIAccessCreatedStep.vue | 6 +- .../steps/ChoosePermissionStep.vue | 8 +- .../steps/ConfirmDetailsStep.vue | 4 +- .../steps/CreateNewAccessStep.vue | 8 +- .../steps/EncryptionInfoStep.vue | 4 +- .../steps/EnterPassphraseStep.vue | 4 +- .../steps/PassphraseGeneratedStep.vue | 6 +- .../steps/S3CredentialsCreatedStep.vue | 6 +- .../accessGrants/modals/CreateForm.vue | 702 ------------------ .../accessGrants/modals/EncryptForm.vue | 403 ---------- .../modals/EncryptionInfoForm.vue | 136 ---- .../accessGrants/modals/GrantCreatedForm.vue | 538 -------------- .../src/components/account/SettingsArea.vue | 1 - .../account/billing/BillingArea.vue | 153 +--- .../account/billing/HistoryDropdown.vue | 75 -- .../billing/billingTabs/BillingHistory.vue | 2 +- .../billingTabs/CreditCardContainer.vue | 21 +- .../account/billing/billingTabs/Overview.vue | 17 +- .../billing/billingTabs/PaymentMethods.vue | 43 +- .../SortingHeader.vue} | 0 .../UsageAndChargesItem.vue} | 0 .../account/billing/coupons/CouponArea.vue | 247 ------ .../DetailedHistory.vue | 177 ----- .../PaymentsHistoryItemDate.vue | 107 --- .../depositAndBillingHistory/PaymentsItem.vue | 102 --- .../PeriodSelection.vue | 229 ------ .../SmallDepositHistory.vue | 97 --- .../SortingHeader.vue | 64 -- .../EstimatedCostsAndCredits.vue | 156 ---- .../UsageAndChargesItem.vue | 291 -------- .../billing/paymentMethods/AddCardForm.vue | 138 ---- .../billing/paymentMethods/AddStorjForm.vue | 68 -- .../paymentMethods/BalanceTokenCard.vue | 321 -------- .../billing/paymentMethods/CardComponent.vue | 214 ------ .../billing/paymentMethods/CardDialog.vue | 98 --- .../billing/paymentMethods/PaymentMethods.vue | 432 ----------- .../billing/paymentMethods/PaymentsBonus.vue | 95 --- .../paymentMethods/TokenDepositSelection.vue | 487 ------------ .../src/components/browser/BreadCrumbs.vue | 2 +- .../components/common/RegistrationSuccess.vue | 2 +- .../src/components/navigation/AccountArea.vue | 19 +- .../components/navigation/NavigationArea.vue | 12 +- .../components/navigation/QuickStartLinks.vue | 33 +- .../notifications/BillingNotification.vue | 11 +- .../steps/cliFlow/AGPermissions.vue | 6 +- .../cliFlow}/permissions/BucketNameBullet.vue | 0 .../cliFlow}/permissions/BucketsDropdown.vue | 0 .../cliFlow}/permissions/BucketsSelection.vue | 2 +- .../cliFlow}/permissions/DurationPicker.vue | 0 .../permissions/DurationSelection.vue | 2 +- web/satellite/src/router/index.ts | 70 +- web/satellite/src/store/modules/appState.ts | 4 - web/satellite/src/store/mutationConstants.ts | 1 - .../all-dashboard/components/Heading.vue | 10 +- .../components/MyAccountButton.vue | 10 +- .../static/images/account/billing/back.svg | 4 - .../static/images/account/billing/card.svg | 6 - .../images/account/billing/chargesExpand.svg | 3 - .../images/account/billing/chargesHide.svg | 3 - .../images/account/billing/couponAdd.svg | 5 - .../images/account/billing/couponLarge.svg | 3 - .../images/account/billing/datePicker.svg | 3 - .../static/images/account/billing/expand.svg | 3 - .../static/images/account/billing/hide.svg | 3 - .../static/images/account/billing/loading.gif | Bin 3485 -> 0 bytes .../static/images/account/billing/lock.svg | 4 - .../images/account/billing/lowBalance.svg | 3 - .../account/billing/negativeBalance.svg | 5 - .../images/account/billing/selected.svg | 4 - .../static/images/account/billing/success.svg | 5 - .../static/images/account/billing/update.svg | 3 - .../deleteAccountPopup/deleteAccount.svg | 30 - .../static/images/buckets/bucket.png | Bin 4180 -> 0 bytes .../static/images/common/BlackArrowHide.svg | 3 - .../static/images/common/BlueExpand.svg | 3 - .../static/images/common/BlueHide.svg | 3 - .../static/images/common/greyInfo.svg | 4 - .../static/images/common/smallGreyInfo.svg | 4 - .../static/images/common/successCheck.svg | 5 - .../account/billing/HistoryDropdown.spec.ts | 44 -- .../HistoryDropdown.spec.ts.snap | 13 - .../paymentMethods/AddCardForm.spec.ts | 32 - .../paymentMethods/AddStorjForm.spec.ts | 14 - .../__snapshots__/AddCardForm.spec.ts.snap | 14 - .../__snapshots__/AddStorjForm.spec.ts.snap | 7 - .../billing/coupons/CouponArea.spec.ts | 48 -- .../DetailedHistory.spec.ts | 78 -- .../PaymentsHistoryItemDate.spec.ts | 88 --- .../PaymentsItem.spec.ts | 48 -- .../PeriodSelection.spec.ts | 109 --- .../SmallDepositHistory.spec.ts | 63 -- .../SortingHeader.spec.ts | 18 - .../EstimatedCostsAndCredits.spec.ts | 102 --- .../UsageAndChargesItem.spec.ts | 64 -- .../paymentMethods/PaymentMethods.spec.ts | 113 --- 113 files changed, 107 insertions(+), 6924 deletions(-) delete mode 100644 web/satellite/src/components/accessGrants/CreateAccessModal.vue rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/CreateAccessGrantFlow.vue (95%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/components/ButtonsContainer.vue (100%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/components/ContainerWithIcon.vue (100%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/components/EndDatePicker.vue (100%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/components/EndDateSelection.vue (100%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/components/LinkButton.vue (100%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/components/Radio.vue (100%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/components/Toggle.vue (100%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/components/ValueWithBlur.vue (100%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/steps/AccessCreatedStep.vue (94%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/steps/AccessEncryptionStep.vue (96%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/steps/CLIAccessCreatedStep.vue (93%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/steps/ChoosePermissionStep.vue (96%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/steps/ConfirmDetailsStep.vue (93%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/steps/CreateNewAccessStep.vue (94%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/steps/EncryptionInfoStep.vue (94%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/steps/EnterPassphraseStep.vue (94%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/steps/PassphraseGeneratedStep.vue (94%) rename web/satellite/src/components/accessGrants/{newCreateFlow => createFlow}/steps/S3CredentialsCreatedStep.vue (94%) delete mode 100644 web/satellite/src/components/accessGrants/modals/CreateForm.vue delete mode 100644 web/satellite/src/components/accessGrants/modals/EncryptForm.vue delete mode 100644 web/satellite/src/components/accessGrants/modals/EncryptionInfoForm.vue delete mode 100644 web/satellite/src/components/accessGrants/modals/GrantCreatedForm.vue delete mode 100644 web/satellite/src/components/account/billing/HistoryDropdown.vue rename web/satellite/src/components/account/billing/{depositAndBillingHistory/SortingHeader2.vue => billingTabs/SortingHeader.vue} (100%) rename web/satellite/src/components/account/billing/{estimatedCostsAndCredits/UsageAndChargesItem2.vue => billingTabs/UsageAndChargesItem.vue} (100%) delete mode 100644 web/satellite/src/components/account/billing/coupons/CouponArea.vue delete mode 100644 web/satellite/src/components/account/billing/depositAndBillingHistory/DetailedHistory.vue delete mode 100644 web/satellite/src/components/account/billing/depositAndBillingHistory/PaymentsHistoryItemDate.vue delete mode 100644 web/satellite/src/components/account/billing/depositAndBillingHistory/PaymentsItem.vue delete mode 100644 web/satellite/src/components/account/billing/depositAndBillingHistory/PeriodSelection.vue delete mode 100644 web/satellite/src/components/account/billing/depositAndBillingHistory/SmallDepositHistory.vue delete mode 100644 web/satellite/src/components/account/billing/depositAndBillingHistory/SortingHeader.vue delete mode 100644 web/satellite/src/components/account/billing/estimatedCostsAndCredits/EstimatedCostsAndCredits.vue delete mode 100644 web/satellite/src/components/account/billing/estimatedCostsAndCredits/UsageAndChargesItem.vue delete mode 100644 web/satellite/src/components/account/billing/paymentMethods/AddCardForm.vue delete mode 100644 web/satellite/src/components/account/billing/paymentMethods/AddStorjForm.vue delete mode 100644 web/satellite/src/components/account/billing/paymentMethods/BalanceTokenCard.vue delete mode 100644 web/satellite/src/components/account/billing/paymentMethods/CardComponent.vue delete mode 100644 web/satellite/src/components/account/billing/paymentMethods/CardDialog.vue delete mode 100644 web/satellite/src/components/account/billing/paymentMethods/PaymentMethods.vue delete mode 100644 web/satellite/src/components/account/billing/paymentMethods/PaymentsBonus.vue delete mode 100644 web/satellite/src/components/account/billing/paymentMethods/TokenDepositSelection.vue rename web/satellite/src/components/{accessGrants => onboardingTour/steps/cliFlow}/permissions/BucketNameBullet.vue (100%) rename web/satellite/src/components/{accessGrants => onboardingTour/steps/cliFlow}/permissions/BucketsDropdown.vue (100%) rename web/satellite/src/components/{accessGrants => onboardingTour/steps/cliFlow}/permissions/BucketsSelection.vue (96%) rename web/satellite/src/components/{accessGrants => onboardingTour/steps/cliFlow}/permissions/DurationPicker.vue (100%) rename web/satellite/src/components/{accessGrants => onboardingTour/steps/cliFlow}/permissions/DurationSelection.vue (97%) delete mode 100644 web/satellite/static/images/account/billing/back.svg delete mode 100644 web/satellite/static/images/account/billing/card.svg delete mode 100644 web/satellite/static/images/account/billing/chargesExpand.svg delete mode 100644 web/satellite/static/images/account/billing/chargesHide.svg delete mode 100644 web/satellite/static/images/account/billing/couponAdd.svg delete mode 100644 web/satellite/static/images/account/billing/couponLarge.svg delete mode 100644 web/satellite/static/images/account/billing/datePicker.svg delete mode 100644 web/satellite/static/images/account/billing/expand.svg delete mode 100644 web/satellite/static/images/account/billing/hide.svg delete mode 100644 web/satellite/static/images/account/billing/loading.gif delete mode 100644 web/satellite/static/images/account/billing/lock.svg delete mode 100644 web/satellite/static/images/account/billing/lowBalance.svg delete mode 100644 web/satellite/static/images/account/billing/negativeBalance.svg delete mode 100644 web/satellite/static/images/account/billing/selected.svg delete mode 100644 web/satellite/static/images/account/billing/success.svg delete mode 100644 web/satellite/static/images/account/billing/update.svg delete mode 100644 web/satellite/static/images/account/deleteAccountPopup/deleteAccount.svg delete mode 100644 web/satellite/static/images/buckets/bucket.png delete mode 100644 web/satellite/static/images/common/BlackArrowHide.svg delete mode 100644 web/satellite/static/images/common/BlueExpand.svg delete mode 100644 web/satellite/static/images/common/BlueHide.svg delete mode 100644 web/satellite/static/images/common/greyInfo.svg delete mode 100644 web/satellite/static/images/common/smallGreyInfo.svg delete mode 100644 web/satellite/static/images/common/successCheck.svg delete mode 100644 web/satellite/tests/unit/account/billing/HistoryDropdown.spec.ts delete mode 100644 web/satellite/tests/unit/account/billing/__snapshots__/HistoryDropdown.spec.ts.snap delete mode 100644 web/satellite/tests/unit/account/billing/paymentMethods/AddCardForm.spec.ts delete mode 100644 web/satellite/tests/unit/account/billing/paymentMethods/AddStorjForm.spec.ts delete mode 100644 web/satellite/tests/unit/account/billing/paymentMethods/__snapshots__/AddCardForm.spec.ts.snap delete mode 100644 web/satellite/tests/unit/account/billing/paymentMethods/__snapshots__/AddStorjForm.spec.ts.snap delete mode 100644 web/satellite/tests/unit/ignore/account/billing/coupons/CouponArea.spec.ts delete mode 100644 web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/DetailedHistory.spec.ts delete mode 100644 web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/PaymentsHistoryItemDate.spec.ts delete mode 100644 web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/PaymentsItem.spec.ts delete mode 100644 web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/PeriodSelection.spec.ts delete mode 100644 web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/SmallDepositHistory.spec.ts delete mode 100644 web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/SortingHeader.spec.ts delete mode 100644 web/satellite/tests/unit/ignore/account/billing/estimatedCostsAndCredits/EstimatedCostsAndCredits.spec.ts delete mode 100644 web/satellite/tests/unit/ignore/account/billing/estimatedCostsAndCredits/UsageAndChargesItem.spec.ts delete mode 100644 web/satellite/tests/unit/ignore/account/billing/paymentMethods/PaymentMethods.spec.ts diff --git a/satellite/console/consoleweb/config.go b/satellite/console/consoleweb/config.go index c8a0a1fb5..7e1cf320a 100644 --- a/satellite/console/consoleweb/config.go +++ b/satellite/console/consoleweb/config.go @@ -34,8 +34,6 @@ type FrontendConfig struct { AllProjectsDashboard bool `json:"allProjectsDashboard"` DefaultPaidStorageLimit memory.Size `json:"defaultPaidStorageLimit"` DefaultPaidBandwidthLimit memory.Size `json:"defaultPaidBandwidthLimit"` - NewBillingScreen bool `json:"newBillingScreen"` - NewAccessGrantFlow bool `json:"newAccessGrantFlow"` InactivityTimerEnabled bool `json:"inactivityTimerEnabled"` InactivityTimerDuration int `json:"inactivityTimerDuration"` InactivityTimerViewerEnabled bool `json:"inactivityTimerViewerEnabled"` diff --git a/satellite/console/consoleweb/server.go b/satellite/console/consoleweb/server.go index 6d5e8eeb2..220175a5f 100644 --- a/satellite/console/consoleweb/server.go +++ b/satellite/console/consoleweb/server.go @@ -92,8 +92,6 @@ type Config struct { LinksharingURL string `help:"url link for linksharing requests" default:"https://link.storjshare.io" devDefault:"http://localhost:8001"` PathwayOverviewEnabled bool `help:"indicates if the overview onboarding step should render with pathways" default:"true"` AllProjectsDashboard bool `help:"indicates if all projects dashboard should be used" default:"false"` - NewBillingScreen bool `help:"indicates if new billing screens should be used" default:"true"` - NewAccessGrantFlow bool `help:"indicates if new access grant flow should be used" default:"true"` GeneratedAPIEnabled bool `help:"indicates if generated console api should be used" default:"false"` OptionalSignupSuccessURL string `help:"optional url to external registration success page" default:""` HomepageURL string `help:"url link to storj.io homepage" default:"https://www.storj.io"` @@ -473,8 +471,6 @@ func (server *Server) appHandler(w http.ResponseWriter, r *http.Request) { AllProjectsDashboard bool DefaultPaidStorageLimit memory.Size DefaultPaidBandwidthLimit memory.Size - NewBillingScreen bool - NewAccessGrantFlow bool InactivityTimerEnabled bool InactivityTimerDuration int InactivityTimerViewerEnabled bool @@ -516,7 +512,6 @@ func (server *Server) appHandler(w http.ResponseWriter, r *http.Request) { data.LoginHcaptchaEnabled = server.config.Captcha.Login.Hcaptcha.Enabled data.LoginHcaptchaSiteKey = server.config.Captcha.Login.Hcaptcha.SiteKey data.AllProjectsDashboard = server.config.AllProjectsDashboard - data.NewBillingScreen = server.config.NewBillingScreen data.InactivityTimerEnabled = server.config.Session.InactivityTimerEnabled data.InactivityTimerDuration = server.config.Session.InactivityTimerDuration data.InactivityTimerViewerEnabled = server.config.Session.InactivityTimerViewerEnabled @@ -526,7 +521,6 @@ func (server *Server) appHandler(w http.ResponseWriter, r *http.Request) { data.PasswordMinimumLength = console.PasswordMinimumLength data.PasswordMaximumLength = console.PasswordMaximumLength data.ABTestingEnabled = server.config.ABTesting.Enabled - data.NewAccessGrantFlow = server.config.NewAccessGrantFlow data.PricingPackagesEnabled = server.config.PricingPackagesEnabled templates, err := server.loadTemplates() @@ -685,7 +679,6 @@ func (server *Server) frontendConfigHandler(w http.ResponseWriter, r *http.Reque DefaultPaidBandwidthLimit: server.config.UsageLimits.Bandwidth.Paid, Captcha: server.config.Captcha, AllProjectsDashboard: server.config.AllProjectsDashboard, - NewBillingScreen: server.config.NewBillingScreen, InactivityTimerEnabled: server.config.Session.InactivityTimerEnabled, InactivityTimerDuration: server.config.Session.InactivityTimerDuration, InactivityTimerViewerEnabled: server.config.Session.InactivityTimerViewerEnabled, @@ -695,7 +688,6 @@ func (server *Server) frontendConfigHandler(w http.ResponseWriter, r *http.Reque PasswordMinimumLength: console.PasswordMinimumLength, PasswordMaximumLength: console.PasswordMaximumLength, ABTestingEnabled: server.config.ABTesting.Enabled, - NewAccessGrantFlow: server.config.NewAccessGrantFlow, } err := json.NewEncoder(w).Encode(&cfg) diff --git a/scripts/testdata/satellite-config.yaml.lock b/scripts/testdata/satellite-config.yaml.lock index aa113c632..db1ae5f30 100755 --- a/scripts/testdata/satellite-config.yaml.lock +++ b/scripts/testdata/satellite-config.yaml.lock @@ -262,12 +262,6 @@ compensation.withheld-percents: 75,75,75,50,50,50,25,25,25,0,0,0,0,0,0 # indicates if storj native token payments system is enabled # console.native-token-payments-enabled: false -# indicates if new access grant flow should be used -# console.new-access-grant-flow: true - -# indicates if new billing screens should be used -# console.new-billing-screen: true - # how long oauth access tokens are issued for # console.oauth-access-token-expiry: 24h0m0s diff --git a/web/satellite/index.html b/web/satellite/index.html index 993715884..4f0137c63 100644 --- a/web/satellite/index.html +++ b/web/satellite/index.html @@ -31,8 +31,6 @@ - - diff --git a/web/satellite/src/App.vue b/web/satellite/src/App.vue index 550cd4fc0..3e56c3e6f 100644 --- a/web/satellite/src/App.vue +++ b/web/satellite/src/App.vue @@ -48,7 +48,6 @@ export default class App extends Vue { const isBetaSatellite = MetaUtils.getMetaContent('is-beta-satellite'); const couponCodeBillingUIEnabled = MetaUtils.getMetaContent('coupon-code-billing-ui-enabled'); const couponCodeSignupUIEnabled = MetaUtils.getMetaContent('coupon-code-signup-ui-enabled'); - const isNewAccessGrantFlow = MetaUtils.getMetaContent('new-access-grant-flow'); if (satelliteName) { this.$store.dispatch(APP_STATE_ACTIONS.SET_SATELLITE_NAME, satelliteName); @@ -77,10 +76,6 @@ export default class App extends Vue { this.$store.dispatch(APP_STATE_ACTIONS.SET_COUPON_CODE_SIGNUP_UI_STATUS, couponCodeSignupUIEnabled === 'true'); } - if (isNewAccessGrantFlow) { - this.$store.commit(APP_STATE_MUTATIONS.SET_ACCESS_GRANT_FLOW_STATUS, isNewAccessGrantFlow === 'true'); - } - this.fixViewportHeight(); } diff --git a/web/satellite/src/components/accessGrants/AccessGrants.vue b/web/satellite/src/components/accessGrants/AccessGrants.vue index 38524763d..7ddfd5941 100644 --- a/web/satellite/src/components/accessGrants/AccessGrants.vue +++ b/web/satellite/src/components/accessGrants/AccessGrants.vue @@ -245,13 +245,6 @@ const emptyStateLabel = computed((): string => { return searchQuery.value ? noSearchResults : noGrants; }); -/** - * Indicates if new access grant flow should be used. - */ -const isNewAccessGrantFlow = computed((): boolean => { - return store.state.appStateModule.isNewAccessGrantFlow; -}); - /** * Fetches access grants page by clicked index. * @param index @@ -311,20 +304,10 @@ async function fetch(searchQuery: string): Promise { */ function accessGrantClick(): void { analytics.eventTriggered(AnalyticsEvent.CREATE_ACCESS_GRANT_CLICKED); - - if (isNewAccessGrantFlow.value) { - trackPageVisit(RouteConfig.AccessGrants.with(RouteConfig.NewCreateAccessModal).path); - router.push({ - name: RouteConfig.NewCreateAccessModal.name, - params: { accessType: AccessType.AccessGrant }, - }); - return; - } - trackPageVisit(RouteConfig.AccessGrants.with(RouteConfig.CreateAccessModal).path); router.push({ - name: RouteConfig.AccessGrants.with(RouteConfig.CreateAccessModal).name, - params: { accessType: 'access' }, + name: RouteConfig.CreateAccessModal.name, + params: { accessType: AccessType.AccessGrant }, }); } @@ -333,20 +316,10 @@ function accessGrantClick(): void { */ function s3Click(): void { analytics.eventTriggered(AnalyticsEvent.CREATE_S3_CREDENTIALS_CLICKED); - - if (isNewAccessGrantFlow.value) { - trackPageVisit(RouteConfig.AccessGrants.with(RouteConfig.NewCreateAccessModal).path); - router.push({ - name: RouteConfig.NewCreateAccessModal.name, - params: { accessType: AccessType.S3 }, - }); - return; - } - trackPageVisit(RouteConfig.AccessGrants.with(RouteConfig.CreateAccessModal).path); router.push({ - name: RouteConfig.AccessGrants.with(RouteConfig.CreateAccessModal).name, - params: { accessType: 's3' }, + name: RouteConfig.CreateAccessModal.name, + params: { accessType: AccessType.S3 }, }); } @@ -355,20 +328,10 @@ function s3Click(): void { */ function cliClick(): void { analytics.eventTriggered(AnalyticsEvent.CREATE_KEYS_FOR_CLI_CLICKED); - - if (isNewAccessGrantFlow.value) { - trackPageVisit(RouteConfig.AccessGrants.with(RouteConfig.NewCreateAccessModal).path); - router.push({ - name: RouteConfig.NewCreateAccessModal.name, - params: { accessType: AccessType.APIKey }, - }); - return; - } - trackPageVisit(RouteConfig.AccessGrants.with(RouteConfig.CreateAccessModal).path); router.push({ - name: RouteConfig.AccessGrants.with(RouteConfig.CreateAccessModal).name, - params: { accessType: 'api' }, + name: RouteConfig.CreateAccessModal.name, + params: { accessType: AccessType.APIKey }, }); } diff --git a/web/satellite/src/components/accessGrants/CreateAccessModal.vue b/web/satellite/src/components/accessGrants/CreateAccessModal.vue deleted file mode 100644 index a18da95bb..000000000 --- a/web/satellite/src/components/accessGrants/CreateAccessModal.vue +++ /dev/null @@ -1,317 +0,0 @@ -// Copyright (C) 2022 Storj Labs, Inc. -// See LICENSE for copying information. - - - - diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/CreateAccessGrantFlow.vue b/web/satellite/src/components/accessGrants/createFlow/CreateAccessGrantFlow.vue similarity index 95% rename from web/satellite/src/components/accessGrants/newCreateFlow/CreateAccessGrantFlow.vue rename to web/satellite/src/components/accessGrants/createFlow/CreateAccessGrantFlow.vue index a3123308c..32555fe58 100644 --- a/web/satellite/src/components/accessGrants/newCreateFlow/CreateAccessGrantFlow.vue +++ b/web/satellite/src/components/accessGrants/createFlow/CreateAccessGrantFlow.vue @@ -130,16 +130,16 @@ import { AnalyticsHttpApi } from '@/api/analytics'; import { OBJECTS_MUTATIONS } from '@/store/modules/objects'; import VModal from '@/components/common/VModal.vue'; -import CreateNewAccessStep from '@/components/accessGrants/newCreateFlow/steps/CreateNewAccessStep.vue'; -import ChoosePermissionStep from '@/components/accessGrants/newCreateFlow/steps/ChoosePermissionStep.vue'; -import AccessEncryptionStep from '@/components/accessGrants/newCreateFlow/steps/AccessEncryptionStep.vue'; -import EnterPassphraseStep from '@/components/accessGrants/newCreateFlow/steps/EnterPassphraseStep.vue'; -import PassphraseGeneratedStep from '@/components/accessGrants/newCreateFlow/steps/PassphraseGeneratedStep.vue'; -import EncryptionInfoStep from '@/components/accessGrants/newCreateFlow/steps/EncryptionInfoStep.vue'; -import AccessCreatedStep from '@/components/accessGrants/newCreateFlow/steps/AccessCreatedStep.vue'; -import CLIAccessCreatedStep from '@/components/accessGrants/newCreateFlow/steps/CLIAccessCreatedStep.vue'; -import S3CredentialsCreatedStep from '@/components/accessGrants/newCreateFlow/steps/S3CredentialsCreatedStep.vue'; -import ConfirmDetailsStep from '@/components/accessGrants/newCreateFlow/steps/ConfirmDetailsStep.vue'; +import CreateNewAccessStep from '@/components/accessGrants/createFlow/steps/CreateNewAccessStep.vue'; +import ChoosePermissionStep from '@/components/accessGrants/createFlow/steps/ChoosePermissionStep.vue'; +import AccessEncryptionStep from '@/components/accessGrants/createFlow/steps/AccessEncryptionStep.vue'; +import EnterPassphraseStep from '@/components/accessGrants/createFlow/steps/EnterPassphraseStep.vue'; +import PassphraseGeneratedStep from '@/components/accessGrants/createFlow/steps/PassphraseGeneratedStep.vue'; +import EncryptionInfoStep from '@/components/accessGrants/createFlow/steps/EncryptionInfoStep.vue'; +import AccessCreatedStep from '@/components/accessGrants/createFlow/steps/AccessCreatedStep.vue'; +import CLIAccessCreatedStep from '@/components/accessGrants/createFlow/steps/CLIAccessCreatedStep.vue'; +import S3CredentialsCreatedStep from '@/components/accessGrants/createFlow/steps/S3CredentialsCreatedStep.vue'; +import ConfirmDetailsStep from '@/components/accessGrants/createFlow/steps/ConfirmDetailsStep.vue'; const router = useRouter(); const route = useRoute(); @@ -167,7 +167,7 @@ const storedPassphrase = computed((): string => { return store.state.objectsModule.passphrase; }); -const worker = ref(); +const worker = ref(null); const isLoading = ref(false); const step = ref(CreateAccessStep.CreateNewAccess); const selectedAccessTypes = ref([]); diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/components/ButtonsContainer.vue b/web/satellite/src/components/accessGrants/createFlow/components/ButtonsContainer.vue similarity index 100% rename from web/satellite/src/components/accessGrants/newCreateFlow/components/ButtonsContainer.vue rename to web/satellite/src/components/accessGrants/createFlow/components/ButtonsContainer.vue diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/components/ContainerWithIcon.vue b/web/satellite/src/components/accessGrants/createFlow/components/ContainerWithIcon.vue similarity index 100% rename from web/satellite/src/components/accessGrants/newCreateFlow/components/ContainerWithIcon.vue rename to web/satellite/src/components/accessGrants/createFlow/components/ContainerWithIcon.vue diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/components/EndDatePicker.vue b/web/satellite/src/components/accessGrants/createFlow/components/EndDatePicker.vue similarity index 100% rename from web/satellite/src/components/accessGrants/newCreateFlow/components/EndDatePicker.vue rename to web/satellite/src/components/accessGrants/createFlow/components/EndDatePicker.vue diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/components/EndDateSelection.vue b/web/satellite/src/components/accessGrants/createFlow/components/EndDateSelection.vue similarity index 100% rename from web/satellite/src/components/accessGrants/newCreateFlow/components/EndDateSelection.vue rename to web/satellite/src/components/accessGrants/createFlow/components/EndDateSelection.vue diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/components/LinkButton.vue b/web/satellite/src/components/accessGrants/createFlow/components/LinkButton.vue similarity index 100% rename from web/satellite/src/components/accessGrants/newCreateFlow/components/LinkButton.vue rename to web/satellite/src/components/accessGrants/createFlow/components/LinkButton.vue diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/components/Radio.vue b/web/satellite/src/components/accessGrants/createFlow/components/Radio.vue similarity index 100% rename from web/satellite/src/components/accessGrants/newCreateFlow/components/Radio.vue rename to web/satellite/src/components/accessGrants/createFlow/components/Radio.vue diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/components/Toggle.vue b/web/satellite/src/components/accessGrants/createFlow/components/Toggle.vue similarity index 100% rename from web/satellite/src/components/accessGrants/newCreateFlow/components/Toggle.vue rename to web/satellite/src/components/accessGrants/createFlow/components/Toggle.vue diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/components/ValueWithBlur.vue b/web/satellite/src/components/accessGrants/createFlow/components/ValueWithBlur.vue similarity index 100% rename from web/satellite/src/components/accessGrants/newCreateFlow/components/ValueWithBlur.vue rename to web/satellite/src/components/accessGrants/createFlow/components/ValueWithBlur.vue diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/steps/AccessCreatedStep.vue b/web/satellite/src/components/accessGrants/createFlow/steps/AccessCreatedStep.vue similarity index 94% rename from web/satellite/src/components/accessGrants/newCreateFlow/steps/AccessCreatedStep.vue rename to web/satellite/src/components/accessGrants/createFlow/steps/AccessCreatedStep.vue index 47b176a05..01710af31 100644 --- a/web/satellite/src/components/accessGrants/newCreateFlow/steps/AccessCreatedStep.vue +++ b/web/satellite/src/components/accessGrants/createFlow/steps/AccessCreatedStep.vue @@ -72,9 +72,9 @@ import { AccessType } from '@/types/createAccessGrant'; import { RouteConfig } from '@/router'; import VButton from '@/components/common/VButton.vue'; -import ButtonsContainer from '@/components/accessGrants/newCreateFlow/components/ButtonsContainer.vue'; -import ValueWithBlur from '@/components/accessGrants/newCreateFlow/components/ValueWithBlur.vue'; -import LinkButton from '@/components/accessGrants/newCreateFlow/components/LinkButton.vue'; +import ButtonsContainer from '@/components/accessGrants/createFlow/components/ButtonsContainer.vue'; +import ValueWithBlur from '@/components/accessGrants/createFlow/components/ValueWithBlur.vue'; +import LinkButton from '@/components/accessGrants/createFlow/components/LinkButton.vue'; const props = defineProps<{ accessTypes: AccessType[]; diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/steps/AccessEncryptionStep.vue b/web/satellite/src/components/accessGrants/createFlow/steps/AccessEncryptionStep.vue similarity index 96% rename from web/satellite/src/components/accessGrants/newCreateFlow/steps/AccessEncryptionStep.vue rename to web/satellite/src/components/accessGrants/createFlow/steps/AccessEncryptionStep.vue index 9d3290b58..050e3adee 100644 --- a/web/satellite/src/components/accessGrants/newCreateFlow/steps/AccessEncryptionStep.vue +++ b/web/satellite/src/components/accessGrants/createFlow/steps/AccessEncryptionStep.vue @@ -102,9 +102,9 @@ import { } from '@/types/createAccessGrant'; import { useStore } from '@/utils/hooks'; -import ContainerWithIcon from '@/components/accessGrants/newCreateFlow/components/ContainerWithIcon.vue'; -import ButtonsContainer from '@/components/accessGrants/newCreateFlow/components/ButtonsContainer.vue'; -import Radio from '@/components/accessGrants/newCreateFlow/components/Radio.vue'; +import ContainerWithIcon from '@/components/accessGrants/createFlow/components/ContainerWithIcon.vue'; +import ButtonsContainer from '@/components/accessGrants/createFlow/components/ButtonsContainer.vue'; +import Radio from '@/components/accessGrants/createFlow/components/Radio.vue'; import VButton from '@/components/common/VButton.vue'; import ChevronIcon from '@/../static/images/accessGrants/newCreateFlow/chevron.svg'; diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/steps/CLIAccessCreatedStep.vue b/web/satellite/src/components/accessGrants/createFlow/steps/CLIAccessCreatedStep.vue similarity index 93% rename from web/satellite/src/components/accessGrants/newCreateFlow/steps/CLIAccessCreatedStep.vue rename to web/satellite/src/components/accessGrants/createFlow/steps/CLIAccessCreatedStep.vue index 7712475d0..ac2122562 100644 --- a/web/satellite/src/components/accessGrants/newCreateFlow/steps/CLIAccessCreatedStep.vue +++ b/web/satellite/src/components/accessGrants/createFlow/steps/CLIAccessCreatedStep.vue @@ -78,9 +78,9 @@ import { RouteConfig } from '@/router'; import { MetaUtils } from '@/utils/meta'; import VButton from '@/components/common/VButton.vue'; -import ButtonsContainer from '@/components/accessGrants/newCreateFlow/components/ButtonsContainer.vue'; -import ValueWithBlur from '@/components/accessGrants/newCreateFlow/components/ValueWithBlur.vue'; -import LinkButton from '@/components/accessGrants/newCreateFlow/components/LinkButton.vue'; +import ButtonsContainer from '@/components/accessGrants/createFlow/components/ButtonsContainer.vue'; +import ValueWithBlur from '@/components/accessGrants/createFlow/components/ValueWithBlur.vue'; +import LinkButton from '@/components/accessGrants/createFlow/components/LinkButton.vue'; const props = defineProps<{ name: string; diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/steps/ChoosePermissionStep.vue b/web/satellite/src/components/accessGrants/createFlow/steps/ChoosePermissionStep.vue similarity index 96% rename from web/satellite/src/components/accessGrants/newCreateFlow/steps/ChoosePermissionStep.vue rename to web/satellite/src/components/accessGrants/createFlow/steps/ChoosePermissionStep.vue index 6df3566ad..b29a1f19c 100644 --- a/web/satellite/src/components/accessGrants/newCreateFlow/steps/ChoosePermissionStep.vue +++ b/web/satellite/src/components/accessGrants/createFlow/steps/ChoosePermissionStep.vue @@ -138,10 +138,10 @@ import { import { useNotify, useStore } from '@/utils/hooks'; import { AnalyticsErrorEventSource } from '@/utils/constants/analyticsEventNames'; -import ContainerWithIcon from '@/components/accessGrants/newCreateFlow/components/ContainerWithIcon.vue'; -import ButtonsContainer from '@/components/accessGrants/newCreateFlow/components/ButtonsContainer.vue'; -import EndDateSelection from '@/components/accessGrants/newCreateFlow/components/EndDateSelection.vue'; -import Toggle from '@/components/accessGrants/newCreateFlow/components/Toggle.vue'; +import ContainerWithIcon from '@/components/accessGrants/createFlow/components/ContainerWithIcon.vue'; +import ButtonsContainer from '@/components/accessGrants/createFlow/components/ButtonsContainer.vue'; +import EndDateSelection from '@/components/accessGrants/createFlow/components/EndDateSelection.vue'; +import Toggle from '@/components/accessGrants/createFlow/components/Toggle.vue'; import VButton from '@/components/common/VButton.vue'; import SearchIcon from '@/../static/images/accessGrants/newCreateFlow/search.svg'; diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/steps/ConfirmDetailsStep.vue b/web/satellite/src/components/accessGrants/createFlow/steps/ConfirmDetailsStep.vue similarity index 93% rename from web/satellite/src/components/accessGrants/newCreateFlow/steps/ConfirmDetailsStep.vue rename to web/satellite/src/components/accessGrants/createFlow/steps/ConfirmDetailsStep.vue index aa23e0f74..cf9bf8ba5 100644 --- a/web/satellite/src/components/accessGrants/newCreateFlow/steps/ConfirmDetailsStep.vue +++ b/web/satellite/src/components/accessGrants/createFlow/steps/ConfirmDetailsStep.vue @@ -62,8 +62,8 @@ import { Permission, } from '@/types/createAccessGrant'; -import ContainerWithIcon from '@/components/accessGrants/newCreateFlow/components/ContainerWithIcon.vue'; -import ButtonsContainer from '@/components/accessGrants/newCreateFlow/components/ButtonsContainer.vue'; +import ContainerWithIcon from '@/components/accessGrants/createFlow/components/ContainerWithIcon.vue'; +import ButtonsContainer from '@/components/accessGrants/createFlow/components/ButtonsContainer.vue'; import VButton from '@/components/common/VButton.vue'; const props = defineProps<{ diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/steps/CreateNewAccessStep.vue b/web/satellite/src/components/accessGrants/createFlow/steps/CreateNewAccessStep.vue similarity index 94% rename from web/satellite/src/components/accessGrants/newCreateFlow/steps/CreateNewAccessStep.vue rename to web/satellite/src/components/accessGrants/createFlow/steps/CreateNewAccessStep.vue index 14aab696c..de064391e 100644 --- a/web/satellite/src/components/accessGrants/newCreateFlow/steps/CreateNewAccessStep.vue +++ b/web/satellite/src/components/accessGrants/createFlow/steps/CreateNewAccessStep.vue @@ -104,10 +104,10 @@ import { computed } from 'vue'; import { AccessType, FUNCTIONAL_CONTAINER_ICON_AND_TITLE, FunctionalContainer } from '@/types/createAccessGrant'; import { AnalyticsHttpApi } from '@/api/analytics'; -import ContainerWithIcon from '@/components/accessGrants/newCreateFlow/components/ContainerWithIcon.vue'; -import ButtonsContainer from '@/components/accessGrants/newCreateFlow/components/ButtonsContainer.vue'; -import LinkButton from '@/components/accessGrants/newCreateFlow/components/LinkButton.vue'; -import Toggle from '@/components/accessGrants/newCreateFlow/components/Toggle.vue'; +import ContainerWithIcon from '@/components/accessGrants/createFlow/components/ContainerWithIcon.vue'; +import ButtonsContainer from '@/components/accessGrants/createFlow/components/ButtonsContainer.vue'; +import LinkButton from '@/components/accessGrants/createFlow/components/LinkButton.vue'; +import Toggle from '@/components/accessGrants/createFlow/components/Toggle.vue'; import VInput from '@/components/common/VInput.vue'; import VButton from '@/components/common/VButton.vue'; diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/steps/EncryptionInfoStep.vue b/web/satellite/src/components/accessGrants/createFlow/steps/EncryptionInfoStep.vue similarity index 94% rename from web/satellite/src/components/accessGrants/newCreateFlow/steps/EncryptionInfoStep.vue rename to web/satellite/src/components/accessGrants/createFlow/steps/EncryptionInfoStep.vue index bf406da98..6a7498bf6 100644 --- a/web/satellite/src/components/accessGrants/newCreateFlow/steps/EncryptionInfoStep.vue +++ b/web/satellite/src/components/accessGrants/createFlow/steps/EncryptionInfoStep.vue @@ -49,8 +49,8 @@ import { useStore } from '@/utils/hooks'; import { LocalData } from '@/utils/localData'; import { AnalyticsHttpApi } from '@/api/analytics'; -import ButtonsContainer from '@/components/accessGrants/newCreateFlow/components/ButtonsContainer.vue'; -import Toggle from '@/components/accessGrants/newCreateFlow/components/Toggle.vue'; +import ButtonsContainer from '@/components/accessGrants/createFlow/components/ButtonsContainer.vue'; +import Toggle from '@/components/accessGrants/createFlow/components/Toggle.vue'; import VButton from '@/components/common/VButton.vue'; const props = defineProps<{ diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/steps/EnterPassphraseStep.vue b/web/satellite/src/components/accessGrants/createFlow/steps/EnterPassphraseStep.vue similarity index 94% rename from web/satellite/src/components/accessGrants/newCreateFlow/steps/EnterPassphraseStep.vue rename to web/satellite/src/components/accessGrants/createFlow/steps/EnterPassphraseStep.vue index 4921a43fb..e1b960e78 100644 --- a/web/satellite/src/components/accessGrants/newCreateFlow/steps/EnterPassphraseStep.vue +++ b/web/satellite/src/components/accessGrants/createFlow/steps/EnterPassphraseStep.vue @@ -50,8 +50,8 @@ import { computed, ref } from 'vue'; import { useStore } from '@/utils/hooks'; -import ButtonsContainer from '@/components/accessGrants/newCreateFlow/components/ButtonsContainer.vue'; -import Toggle from '@/components/accessGrants/newCreateFlow/components/Toggle.vue'; +import ButtonsContainer from '@/components/accessGrants/createFlow/components/ButtonsContainer.vue'; +import Toggle from '@/components/accessGrants/createFlow/components/Toggle.vue'; import VButton from '@/components/common/VButton.vue'; import VInput from '@/components/common/VInput.vue'; diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/steps/PassphraseGeneratedStep.vue b/web/satellite/src/components/accessGrants/createFlow/steps/PassphraseGeneratedStep.vue similarity index 94% rename from web/satellite/src/components/accessGrants/newCreateFlow/steps/PassphraseGeneratedStep.vue rename to web/satellite/src/components/accessGrants/createFlow/steps/PassphraseGeneratedStep.vue index 2aa8c5e3a..2893f7754 100644 --- a/web/satellite/src/components/accessGrants/newCreateFlow/steps/PassphraseGeneratedStep.vue +++ b/web/satellite/src/components/accessGrants/createFlow/steps/PassphraseGeneratedStep.vue @@ -80,9 +80,9 @@ import { Download } from '@/utils/download'; import { AnalyticsEvent } from '@/utils/constants/analyticsEventNames'; import { AnalyticsHttpApi } from '@/api/analytics'; -import ButtonsContainer from '@/components/accessGrants/newCreateFlow/components/ButtonsContainer.vue'; -import ValueWithBlur from '@/components/accessGrants/newCreateFlow/components/ValueWithBlur.vue'; -import Toggle from '@/components/accessGrants/newCreateFlow/components/Toggle.vue'; +import ButtonsContainer from '@/components/accessGrants/createFlow/components/ButtonsContainer.vue'; +import ValueWithBlur from '@/components/accessGrants/createFlow/components/ValueWithBlur.vue'; +import Toggle from '@/components/accessGrants/createFlow/components/Toggle.vue'; import VButton from '@/components/common/VButton.vue'; const props = defineProps<{ diff --git a/web/satellite/src/components/accessGrants/newCreateFlow/steps/S3CredentialsCreatedStep.vue b/web/satellite/src/components/accessGrants/createFlow/steps/S3CredentialsCreatedStep.vue similarity index 94% rename from web/satellite/src/components/accessGrants/newCreateFlow/steps/S3CredentialsCreatedStep.vue rename to web/satellite/src/components/accessGrants/createFlow/steps/S3CredentialsCreatedStep.vue index f7871f3fa..bfb410016 100644 --- a/web/satellite/src/components/accessGrants/newCreateFlow/steps/S3CredentialsCreatedStep.vue +++ b/web/satellite/src/components/accessGrants/createFlow/steps/S3CredentialsCreatedStep.vue @@ -85,9 +85,9 @@ import { RouteConfig } from '@/router'; import { EdgeCredentials } from '@/types/accessGrants'; import VButton from '@/components/common/VButton.vue'; -import ButtonsContainer from '@/components/accessGrants/newCreateFlow/components/ButtonsContainer.vue'; -import ValueWithBlur from '@/components/accessGrants/newCreateFlow/components/ValueWithBlur.vue'; -import LinkButton from '@/components/accessGrants/newCreateFlow/components/LinkButton.vue'; +import ButtonsContainer from '@/components/accessGrants/createFlow/components/ButtonsContainer.vue'; +import ValueWithBlur from '@/components/accessGrants/createFlow/components/ValueWithBlur.vue'; +import LinkButton from '@/components/accessGrants/createFlow/components/LinkButton.vue'; const props = defineProps<{ name: string; diff --git a/web/satellite/src/components/accessGrants/modals/CreateForm.vue b/web/satellite/src/components/accessGrants/modals/CreateForm.vue deleted file mode 100644 index 3dcb87122..000000000 --- a/web/satellite/src/components/accessGrants/modals/CreateForm.vue +++ /dev/null @@ -1,702 +0,0 @@ -// Copyright (C) 2022 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/accessGrants/modals/EncryptForm.vue b/web/satellite/src/components/accessGrants/modals/EncryptForm.vue deleted file mode 100644 index 667e0d828..000000000 --- a/web/satellite/src/components/accessGrants/modals/EncryptForm.vue +++ /dev/null @@ -1,403 +0,0 @@ -// Copyright (C) 2022 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/accessGrants/modals/EncryptionInfoForm.vue b/web/satellite/src/components/accessGrants/modals/EncryptionInfoForm.vue deleted file mode 100644 index 9337f031d..000000000 --- a/web/satellite/src/components/accessGrants/modals/EncryptionInfoForm.vue +++ /dev/null @@ -1,136 +0,0 @@ -// Copyright (C) 2022 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/accessGrants/modals/GrantCreatedForm.vue b/web/satellite/src/components/accessGrants/modals/GrantCreatedForm.vue deleted file mode 100644 index f8e9dd3dc..000000000 --- a/web/satellite/src/components/accessGrants/modals/GrantCreatedForm.vue +++ /dev/null @@ -1,538 +0,0 @@ -// Copyright (C) 2022 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/SettingsArea.vue b/web/satellite/src/components/account/SettingsArea.vue index a49224792..c1ab6ac7e 100644 --- a/web/satellite/src/components/account/SettingsArea.vue +++ b/web/satellite/src/components/account/SettingsArea.vue @@ -87,7 +87,6 @@ import { computed, onMounted } from 'vue'; import { USER_ACTIONS } from '@/store/modules/users'; import { User } from '@/types/users'; -import { APP_STATE_ACTIONS } from '@/utils/constants/actionNames'; import { AnalyticsErrorEventSource } from '@/utils/constants/analyticsEventNames'; import { MODALS } from '@/utils/constants/appStatePopUps'; import { useNotify, useStore } from '@/utils/hooks'; diff --git a/web/satellite/src/components/account/billing/BillingArea.vue b/web/satellite/src/components/account/billing/BillingArea.vue index 1d5eb5260..976a79c1a 100644 --- a/web/satellite/src/components/account/billing/BillingArea.vue +++ b/web/satellite/src/components/account/billing/BillingArea.vue @@ -3,7 +3,7 @@ @@ -90,7 +42,6 @@ @@ -389,7 +246,7 @@ export default class BillingArea extends Vue { padding-top: 20px; &__text { - font-family: sans-serif; + font-family: 'font_regular', sans-serif; } } @@ -419,7 +276,7 @@ export default class BillingArea extends Vue { } &__tab { - font-family: sans-serif; + font-family: 'font_regular', sans-serif; color: var(--c-grey-6); font-size: 16px; height: auto; diff --git a/web/satellite/src/components/account/billing/HistoryDropdown.vue b/web/satellite/src/components/account/billing/HistoryDropdown.vue deleted file mode 100644 index d14cf0fa3..000000000 --- a/web/satellite/src/components/account/billing/HistoryDropdown.vue +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright (C) 2020 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/billing/billingTabs/BillingHistory.vue b/web/satellite/src/components/account/billing/billingTabs/BillingHistory.vue index 26cb4473e..3c8875a9c 100644 --- a/web/satellite/src/components/account/billing/billingTabs/BillingHistory.vue +++ b/web/satellite/src/components/account/billing/billingTabs/BillingHistory.vue @@ -61,7 +61,7 @@ onMounted(() => { margin-top: 2rem; &__title { - font-family: sans-serif; + font-family: 'font_regular', sans-serif; font-size: 1.5rem; } diff --git a/web/satellite/src/components/account/billing/billingTabs/CreditCardContainer.vue b/web/satellite/src/components/account/billing/billingTabs/CreditCardContainer.vue index 527f50b98..d8eadcb9e 100644 --- a/web/satellite/src/components/account/billing/billingTabs/CreditCardContainer.vue +++ b/web/satellite/src/components/account/billing/billingTabs/CreditCardContainer.vue @@ -167,6 +167,7 @@ function toggleSelection(): void { grid-template-columns: 4fr 2fr; grid-template-rows: 1fr 0fr 1fr 1fr; height: 100%; + font-family: 'font_regular', sans-serif; &__function-buttons { grid-column: 1; @@ -188,9 +189,7 @@ function toggleSelection(): void { &__card-text { grid-column: 1; grid-row: 2; - font-family: sans-serif; - font-style: normal; - font-weight: 700; + font-family: 'font_bold', sans-serif; font-size: 12px; line-height: 18px; color: var(--c-grey-6); @@ -199,9 +198,7 @@ function toggleSelection(): void { &__expiration-text { grid-column: 2; grid-row: 2; - font-family: sans-serif; - font-style: normal; - font-weight: 700; + font-family: 'font_bold', sans-serif; font-size: 12px; line-height: 18px; color: var(--c-grey-6); @@ -215,9 +212,7 @@ function toggleSelection(): void { &__info-container { grid-row: 3; grid-column: 1; - font-family: sans-serif; - font-style: normal; - font-weight: 700; + font-family: 'font_bold', sans-serif; font-size: 16px; line-height: 24px; color: #000; @@ -230,9 +225,7 @@ function toggleSelection(): void { &__expire-container { grid-row: 3; grid-column: 2; - font-family: sans-serif; - font-style: normal; - font-weight: 700; + font-family: 'font_bold', sans-serif; font-size: 16px; line-height: 24px; color: #000; @@ -252,9 +245,7 @@ function toggleSelection(): void { } &__default-text { - font-family: sans-serif; - font-style: normal; - font-weight: 700; + font-family: 'font_bold', sans-serif; font-size: 12px; line-height: 20px; color: var(--c-blue-4); diff --git a/web/satellite/src/components/account/billing/billingTabs/Overview.vue b/web/satellite/src/components/account/billing/billingTabs/Overview.vue index 6019e4487..6e5cb62c5 100644 --- a/web/satellite/src/components/account/billing/billingTabs/Overview.vue +++ b/web/satellite/src/components/account/billing/billingTabs/Overview.vue @@ -78,7 +78,7 @@ />
- { function routeToBillingHistory(): void { analytics.eventTriggered(AnalyticsEvent.SEE_PAYMENTS_CLICKED); - router.push(RouteConfig.Account.with(RouteConfig.Billing).with(RouteConfig.BillingHistory2).path); + router.push(RouteConfig.Account.with(RouteConfig.Billing).with(RouteConfig.BillingHistory).path); } function routeToPaymentMethods(): void { @@ -194,7 +194,7 @@ onMounted(async () => { diff --git a/web/satellite/src/components/account/billing/depositAndBillingHistory/SortingHeader2.vue b/web/satellite/src/components/account/billing/billingTabs/SortingHeader.vue similarity index 100% rename from web/satellite/src/components/account/billing/depositAndBillingHistory/SortingHeader2.vue rename to web/satellite/src/components/account/billing/billingTabs/SortingHeader.vue diff --git a/web/satellite/src/components/account/billing/estimatedCostsAndCredits/UsageAndChargesItem2.vue b/web/satellite/src/components/account/billing/billingTabs/UsageAndChargesItem.vue similarity index 100% rename from web/satellite/src/components/account/billing/estimatedCostsAndCredits/UsageAndChargesItem2.vue rename to web/satellite/src/components/account/billing/billingTabs/UsageAndChargesItem.vue diff --git a/web/satellite/src/components/account/billing/coupons/CouponArea.vue b/web/satellite/src/components/account/billing/coupons/CouponArea.vue deleted file mode 100644 index 3227cb432..000000000 --- a/web/satellite/src/components/account/billing/coupons/CouponArea.vue +++ /dev/null @@ -1,247 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/billing/depositAndBillingHistory/DetailedHistory.vue b/web/satellite/src/components/account/billing/depositAndBillingHistory/DetailedHistory.vue deleted file mode 100644 index bef1974d3..000000000 --- a/web/satellite/src/components/account/billing/depositAndBillingHistory/DetailedHistory.vue +++ /dev/null @@ -1,177 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/billing/depositAndBillingHistory/PaymentsHistoryItemDate.vue b/web/satellite/src/components/account/billing/depositAndBillingHistory/PaymentsHistoryItemDate.vue deleted file mode 100644 index 67f0ce646..000000000 --- a/web/satellite/src/components/account/billing/depositAndBillingHistory/PaymentsHistoryItemDate.vue +++ /dev/null @@ -1,107 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/billing/depositAndBillingHistory/PaymentsItem.vue b/web/satellite/src/components/account/billing/depositAndBillingHistory/PaymentsItem.vue deleted file mode 100644 index 0bb11f44f..000000000 --- a/web/satellite/src/components/account/billing/depositAndBillingHistory/PaymentsItem.vue +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/billing/depositAndBillingHistory/PeriodSelection.vue b/web/satellite/src/components/account/billing/depositAndBillingHistory/PeriodSelection.vue deleted file mode 100644 index f59d8c411..000000000 --- a/web/satellite/src/components/account/billing/depositAndBillingHistory/PeriodSelection.vue +++ /dev/null @@ -1,229 +0,0 @@ -// Copyright (C) 2020 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/billing/depositAndBillingHistory/SmallDepositHistory.vue b/web/satellite/src/components/account/billing/depositAndBillingHistory/SmallDepositHistory.vue deleted file mode 100644 index 71fb6c51f..000000000 --- a/web/satellite/src/components/account/billing/depositAndBillingHistory/SmallDepositHistory.vue +++ /dev/null @@ -1,97 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/billing/depositAndBillingHistory/SortingHeader.vue b/web/satellite/src/components/account/billing/depositAndBillingHistory/SortingHeader.vue deleted file mode 100644 index 30f25570a..000000000 --- a/web/satellite/src/components/account/billing/depositAndBillingHistory/SortingHeader.vue +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/billing/estimatedCostsAndCredits/EstimatedCostsAndCredits.vue b/web/satellite/src/components/account/billing/estimatedCostsAndCredits/EstimatedCostsAndCredits.vue deleted file mode 100644 index ed6f4c9ab..000000000 --- a/web/satellite/src/components/account/billing/estimatedCostsAndCredits/EstimatedCostsAndCredits.vue +++ /dev/null @@ -1,156 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/billing/estimatedCostsAndCredits/UsageAndChargesItem.vue b/web/satellite/src/components/account/billing/estimatedCostsAndCredits/UsageAndChargesItem.vue deleted file mode 100644 index 856f5bfe6..000000000 --- a/web/satellite/src/components/account/billing/estimatedCostsAndCredits/UsageAndChargesItem.vue +++ /dev/null @@ -1,291 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/billing/paymentMethods/AddCardForm.vue b/web/satellite/src/components/account/billing/paymentMethods/AddCardForm.vue deleted file mode 100644 index 187c317b2..000000000 --- a/web/satellite/src/components/account/billing/paymentMethods/AddCardForm.vue +++ /dev/null @@ -1,138 +0,0 @@ -// Copyright (C) 2020 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/billing/paymentMethods/AddStorjForm.vue b/web/satellite/src/components/account/billing/paymentMethods/AddStorjForm.vue deleted file mode 100644 index 0bbef5d1b..000000000 --- a/web/satellite/src/components/account/billing/paymentMethods/AddStorjForm.vue +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright (C) 2020 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/billing/paymentMethods/BalanceTokenCard.vue b/web/satellite/src/components/account/billing/paymentMethods/BalanceTokenCard.vue deleted file mode 100644 index 19d4140e2..000000000 --- a/web/satellite/src/components/account/billing/paymentMethods/BalanceTokenCard.vue +++ /dev/null @@ -1,321 +0,0 @@ -// Copyright (C) 2022 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/billing/paymentMethods/CardComponent.vue b/web/satellite/src/components/account/billing/paymentMethods/CardComponent.vue deleted file mode 100644 index 5be0b41a4..000000000 --- a/web/satellite/src/components/account/billing/paymentMethods/CardComponent.vue +++ /dev/null @@ -1,214 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/billing/paymentMethods/CardDialog.vue b/web/satellite/src/components/account/billing/paymentMethods/CardDialog.vue deleted file mode 100644 index 3b29883c4..000000000 --- a/web/satellite/src/components/account/billing/paymentMethods/CardDialog.vue +++ /dev/null @@ -1,98 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/billing/paymentMethods/PaymentMethods.vue b/web/satellite/src/components/account/billing/paymentMethods/PaymentMethods.vue deleted file mode 100644 index f80ee3e9e..000000000 --- a/web/satellite/src/components/account/billing/paymentMethods/PaymentMethods.vue +++ /dev/null @@ -1,432 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/billing/paymentMethods/PaymentsBonus.vue b/web/satellite/src/components/account/billing/paymentMethods/PaymentsBonus.vue deleted file mode 100644 index 1d925f5cd..000000000 --- a/web/satellite/src/components/account/billing/paymentMethods/PaymentsBonus.vue +++ /dev/null @@ -1,95 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/account/billing/paymentMethods/TokenDepositSelection.vue b/web/satellite/src/components/account/billing/paymentMethods/TokenDepositSelection.vue deleted file mode 100644 index 7d93832cb..000000000 --- a/web/satellite/src/components/account/billing/paymentMethods/TokenDepositSelection.vue +++ /dev/null @@ -1,487 +0,0 @@ -// Copyright (C) 2022 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/components/browser/BreadCrumbs.vue b/web/satellite/src/components/browser/BreadCrumbs.vue index efbcd9312..ed4cc486b 100644 --- a/web/satellite/src/components/browser/BreadCrumbs.vue +++ b/web/satellite/src/components/browser/BreadCrumbs.vue @@ -124,7 +124,7 @@ function displayDivider(idx: number): boolean { align-items: center; &__text { - font-family: sans-serif; + font-family: 'font_regular', sans-serif; font-size: 14px; color: #232a34; cursor: pointer; diff --git a/web/satellite/src/components/common/RegistrationSuccess.vue b/web/satellite/src/components/common/RegistrationSuccess.vue index f02800635..2e8ee3ef4 100644 --- a/web/satellite/src/components/common/RegistrationSuccess.vue +++ b/web/satellite/src/components/common/RegistrationSuccess.vue @@ -62,7 +62,7 @@ import MailIcon from '@/../static/images/register/mail.svg'; const props = withDefaults(defineProps<{ email: string; - showManualActivationMsg: boolean; + showManualActivationMsg?: boolean; }>(), { email: '', showManualActivationMsg: true, diff --git a/web/satellite/src/components/navigation/AccountArea.vue b/web/satellite/src/components/navigation/AccountArea.vue index a08242365..94622fe33 100644 --- a/web/satellite/src/components/navigation/AccountArea.vue +++ b/web/satellite/src/components/navigation/AccountArea.vue @@ -61,7 +61,6 @@ import { BUCKET_ACTIONS } from '@/store/modules/buckets'; import { OBJECTS_ACTIONS } from '@/store/modules/objects'; import { AnalyticsHttpApi } from '@/api/analytics'; import { AnalyticsErrorEventSource, AnalyticsEvent } from '@/utils/constants/analyticsEventNames'; -import { MetaUtils } from '@/utils/meta'; import { PAYMENTS_ACTIONS } from '@/store/modules/payments'; import { APP_STATE_DROPDOWNS } from '@/utils/constants/appStatePopUps'; import { APP_STATE_MUTATIONS } from '@/store/mutationConstants'; @@ -89,14 +88,6 @@ const dropdownYPos = ref(0); const dropdownXPos = ref(0); const accountArea = ref(); -/** - * Indicates if tabs options are hidden. - */ -const isNewBillingScreen = computed((): boolean => { - const isNewBillingScreen = MetaUtils.getMetaContent('new-billing-screen'); - return isNewBillingScreen === 'true'; -}); - /** * Returns bottom and left position of dropdown. */ @@ -133,14 +124,8 @@ function navigateToBilling(): void { if (router.currentRoute.path.includes(RouteConfig.Billing.path)) return; - if (isNewBillingScreen.value) { - router.push(RouteConfig.Account.with(RouteConfig.Billing).with(RouteConfig.BillingOverview).path); - analytics.pageVisit(RouteConfig.Account.with(RouteConfig.Billing).with(RouteConfig.BillingOverview).path); - return; - } - - router.push(RouteConfig.Account.with(RouteConfig.Billing).path); - analytics.pageVisit(RouteConfig.Account.with(RouteConfig.Billing).path); + router.push(RouteConfig.Account.with(RouteConfig.Billing).with(RouteConfig.BillingOverview).path); + analytics.pageVisit(RouteConfig.Account.with(RouteConfig.Billing).with(RouteConfig.BillingOverview).path); } /** diff --git a/web/satellite/src/components/navigation/NavigationArea.vue b/web/satellite/src/components/navigation/NavigationArea.vue index 7bfb278d6..20647d457 100644 --- a/web/satellite/src/components/navigation/NavigationArea.vue +++ b/web/satellite/src/components/navigation/NavigationArea.vue @@ -82,7 +82,6 @@ diff --git a/web/satellite/src/components/navigation/QuickStartLinks.vue b/web/satellite/src/components/navigation/QuickStartLinks.vue index 5e5d58535..a4de9e71b 100644 --- a/web/satellite/src/components/navigation/QuickStartLinks.vue +++ b/web/satellite/src/components/navigation/QuickStartLinks.vue @@ -81,19 +81,10 @@ export default class QuickStartLinks extends Vue { this.analytics.eventTriggered(AnalyticsEvent.CREATE_AN_ACCESS_GRANT_CLICKED); this.closeDropdowns(); - if (this.isNewAccessGrantFlow) { - this.analytics.pageVisit(RouteConfig.AccessGrants.with(RouteConfig.NewCreateAccessModal).path); - this.$router.push({ - name: RouteConfig.NewCreateAccessModal.name, - params: { accessType: AccessType.AccessGrant }, - }).catch(() => {return;}); - return; - } - this.analytics.pageVisit(RouteConfig.AccessGrants.with(RouteConfig.CreateAccessModal).path); this.$router.push({ - name: RouteConfig.AccessGrants.with(RouteConfig.CreateAccessModal).name, - params: { accessType: 'access' }, + name: RouteConfig.CreateAccessModal.name, + params: { accessType: AccessType.AccessGrant }, }).catch(() => {return;}); } @@ -104,19 +95,10 @@ export default class QuickStartLinks extends Vue { this.analytics.eventTriggered(AnalyticsEvent.CREATE_S3_CREDENTIALS_CLICKED); this.closeDropdowns(); - if (this.isNewAccessGrantFlow) { - this.analytics.pageVisit(RouteConfig.AccessGrants.with(RouteConfig.NewCreateAccessModal).path); - this.$router.push({ - name: RouteConfig.NewCreateAccessModal.name, - params: { accessType: AccessType.S3 }, - }).catch(() => {return;}); - return; - } - this.analytics.pageVisit(RouteConfig.AccessGrants.with(RouteConfig.CreateAccessModal).path); this.$router.push({ - name: RouteConfig.AccessGrants.with(RouteConfig.CreateAccessModal).name, - params: { accessType: 's3' }, + name: RouteConfig.CreateAccessModal.name, + params: { accessType: AccessType.S3 }, }).catch(() => {return;}); } @@ -161,13 +143,6 @@ export default class QuickStartLinks extends Vue { this.closeDropdowns(); } - - /** - * Indicates if new access grant flow should be used. - */ - private get isNewAccessGrantFlow(): boolean { - return this.$store.state.appStateModule.isNewAccessGrantFlow; - } } diff --git a/web/satellite/src/components/notifications/BillingNotification.vue b/web/satellite/src/components/notifications/BillingNotification.vue index 6bd9a8ab6..1a9dc21bf 100644 --- a/web/satellite/src/components/notifications/BillingNotification.vue +++ b/web/satellite/src/components/notifications/BillingNotification.vue @@ -21,7 +21,6 @@ import { Component, Vue } from 'vue-property-decorator'; import { RouteConfig } from '@/router'; import { APP_STATE_MUTATIONS } from '@/store/mutationConstants'; -import { MetaUtils } from '@/utils/meta'; import { NavigationLink } from '@/types/navigation'; import InfoIcon from '@/../static/images/notifications/info.svg'; @@ -46,18 +45,10 @@ export default class BillingNotification extends Vue { return RouteConfig.Account; } - /** - * Indicates if tabs options are hidden. - */ - public get isNewBillingScreen(): boolean { - const isNewBillingScreen = MetaUtils.getMetaContent('new-billing-screen'); - return isNewBillingScreen === 'true'; - } - public get billingPath(): string { const billing = this.baseAccountRoute.with(RouteConfig.Billing); - return this.isNewBillingScreen ? billing.with(RouteConfig.BillingOverview).path : billing.path; + return billing.with(RouteConfig.BillingOverview).path; } /** diff --git a/web/satellite/src/components/onboardingTour/steps/cliFlow/AGPermissions.vue b/web/satellite/src/components/onboardingTour/steps/cliFlow/AGPermissions.vue index 3f0e8dbcc..c2ea52487 100644 --- a/web/satellite/src/components/onboardingTour/steps/cliFlow/AGPermissions.vue +++ b/web/satellite/src/components/onboardingTour/steps/cliFlow/AGPermissions.vue @@ -49,10 +49,10 @@ import { AnalyticsHttpApi } from '@/api/analytics'; import CLIFlowContainer from '@/components/onboardingTour/steps/common/CLIFlowContainer.vue'; import PermissionsSelect from '@/components/onboardingTour/steps/cliFlow/PermissionsSelect.vue'; -import BucketNameBullet from '@/components/accessGrants/permissions/BucketNameBullet.vue'; -import BucketsSelection from '@/components/accessGrants/permissions/BucketsSelection.vue'; +import BucketNameBullet from '@/components/onboardingTour/steps/cliFlow/permissions/BucketNameBullet.vue'; +import BucketsSelection from '@/components/onboardingTour/steps/cliFlow/permissions/BucketsSelection.vue'; import VLoader from '@/components/common/VLoader.vue'; -import DurationSelection from '@/components/accessGrants/permissions/DurationSelection.vue'; +import DurationSelection from '@/components/onboardingTour/steps/cliFlow/permissions/DurationSelection.vue'; import Icon from '@/../static/images/onboardingTour/accessGrant.svg'; diff --git a/web/satellite/src/components/accessGrants/permissions/BucketNameBullet.vue b/web/satellite/src/components/onboardingTour/steps/cliFlow/permissions/BucketNameBullet.vue similarity index 100% rename from web/satellite/src/components/accessGrants/permissions/BucketNameBullet.vue rename to web/satellite/src/components/onboardingTour/steps/cliFlow/permissions/BucketNameBullet.vue diff --git a/web/satellite/src/components/accessGrants/permissions/BucketsDropdown.vue b/web/satellite/src/components/onboardingTour/steps/cliFlow/permissions/BucketsDropdown.vue similarity index 100% rename from web/satellite/src/components/accessGrants/permissions/BucketsDropdown.vue rename to web/satellite/src/components/onboardingTour/steps/cliFlow/permissions/BucketsDropdown.vue diff --git a/web/satellite/src/components/accessGrants/permissions/BucketsSelection.vue b/web/satellite/src/components/onboardingTour/steps/cliFlow/permissions/BucketsSelection.vue similarity index 96% rename from web/satellite/src/components/accessGrants/permissions/BucketsSelection.vue rename to web/satellite/src/components/onboardingTour/steps/cliFlow/permissions/BucketsSelection.vue index a6f2dd767..02737706d 100644 --- a/web/satellite/src/components/accessGrants/permissions/BucketsSelection.vue +++ b/web/satellite/src/components/onboardingTour/steps/cliFlow/permissions/BucketsSelection.vue @@ -26,7 +26,7 @@ import { Component, Vue, Prop } from 'vue-property-decorator'; import { APP_STATE_ACTIONS } from '@/utils/constants/actionNames'; import { APP_STATE_DROPDOWNS } from '@/utils/constants/appStatePopUps'; -import BucketsDropdown from '@/components/accessGrants/permissions/BucketsDropdown.vue'; +import BucketsDropdown from '@/components/onboardingTour/steps/cliFlow/permissions/BucketsDropdown.vue'; import ExpandIcon from '@/../static/images/common/BlackArrowExpand.svg'; diff --git a/web/satellite/src/components/accessGrants/permissions/DurationPicker.vue b/web/satellite/src/components/onboardingTour/steps/cliFlow/permissions/DurationPicker.vue similarity index 100% rename from web/satellite/src/components/accessGrants/permissions/DurationPicker.vue rename to web/satellite/src/components/onboardingTour/steps/cliFlow/permissions/DurationPicker.vue diff --git a/web/satellite/src/components/accessGrants/permissions/DurationSelection.vue b/web/satellite/src/components/onboardingTour/steps/cliFlow/permissions/DurationSelection.vue similarity index 97% rename from web/satellite/src/components/accessGrants/permissions/DurationSelection.vue rename to web/satellite/src/components/onboardingTour/steps/cliFlow/permissions/DurationSelection.vue index 373cb03b3..47830e37f 100644 --- a/web/satellite/src/components/accessGrants/permissions/DurationSelection.vue +++ b/web/satellite/src/components/onboardingTour/steps/cliFlow/permissions/DurationSelection.vue @@ -28,7 +28,7 @@ import { Component, Vue, Prop } from 'vue-property-decorator'; import { APP_STATE_ACTIONS } from '@/utils/constants/actionNames'; import { APP_STATE_DROPDOWNS } from '@/utils/constants/appStatePopUps'; -import DurationPicker from '@/components/accessGrants/permissions/DurationPicker.vue'; +import DurationPicker from '@/components/onboardingTour/steps/cliFlow/permissions/DurationPicker.vue'; import ExpandIcon from '@/../static/images/common/BlackArrowExpand.svg'; diff --git a/web/satellite/src/router/index.ts b/web/satellite/src/router/index.ts index d4607d1d2..47a17f596 100644 --- a/web/satellite/src/router/index.ts +++ b/web/satellite/src/router/index.ts @@ -10,16 +10,13 @@ import AllDashboardArea from '@/views/all-dashboard/AllDashboardArea.vue'; import MyProjects from '@/views/all-dashboard/components/MyProjects.vue'; import AccessGrants from '@/components/accessGrants/AccessGrants.vue'; -import CreateAccessModal from '@/components/accessGrants/CreateAccessModal.vue'; -import CreateAccessGrantFlow from '@/components/accessGrants/newCreateFlow/CreateAccessGrantFlow.vue'; +import CreateAccessGrantFlow from '@/components/accessGrants/createFlow/CreateAccessGrantFlow.vue'; import AccountArea from '@/components/account/AccountArea.vue'; import AccountBilling from '@/components/account/billing/BillingArea.vue'; import BillingOverview from '@/components/account/billing/billingTabs/Overview.vue'; import BillingPaymentMethods from '@/components/account/billing/billingTabs/PaymentMethods.vue'; -import BillingHistory2 from '@/components/account/billing/billingTabs/BillingHistory.vue'; +import BillingHistory from '@/components/account/billing/billingTabs/BillingHistory.vue'; import BillingCoupons from '@/components/account/billing/billingTabs/Coupons.vue'; -import DetailedHistory from '@/components/account/billing/depositAndBillingHistory/DetailedHistory.vue'; -import CreditsHistory from '@/components/account/billing/coupons/CouponArea.vue'; import SettingsArea from '@/components/account/SettingsArea.vue'; import Page404 from '@/components/errors/Page404.vue'; import BucketsView from '@/components/objects/BucketsView.vue'; @@ -89,27 +86,20 @@ export abstract class RouteConfig { public static Settings2 = new NavigationLink('settings', 'Settings 2'); public static Billing = new NavigationLink('billing', 'Billing'); public static Billing2 = new NavigationLink('billing', 'Account Billing'); - public static BillingHistory = new NavigationLink('billing-history', 'Billing History'); - public static BillingHistory4 = new NavigationLink('billing-history', 'Billing History 4'); public static BillingOverview = new NavigationLink('overview', 'Overview'); // this duplicates the path of BillingOverview so that they can be used interchangeably in BillingArea.vue public static BillingOverview2 = new NavigationLink('overview', 'Billing Overview'); public static BillingPaymentMethods = new NavigationLink('payment-methods', 'Payment Methods'); // this duplicates the path of BillingPaymentMethods so that they can be used interchangeably in BillingArea.vue public static BillingPaymentMethods2 = new NavigationLink('payment-methods', 'Payment Methods 2'); + public static BillingHistory = new NavigationLink('billing-history', 'Billing History'); + // this duplicates the path of BillingHistory so that they can be used interchangeably in BillingArea.vue public static BillingHistory2 = new NavigationLink('billing-history2', 'Billing History 2'); - // this duplicates the path of BillingHistory2 so that they can be used interchangeably in BillingArea.vue - public static BillingHistory3 = new NavigationLink('billing-history2', 'Billing History 3'); public static BillingCoupons = new NavigationLink('coupons', 'Coupons'); public static BillingCoupons2 = new NavigationLink('coupons', 'Billing Coupons'); - public static DepositHistory = new NavigationLink('deposit-history', 'Deposit History'); - public static DepositHistory2 = new NavigationLink('deposit-history', 'Deposit History 2'); - public static CreditsHistory = new NavigationLink('credits-history', 'Credits History'); - public static CreditsHistory2 = new NavigationLink('credits-history', 'Credits History 2'); // access grant child paths public static CreateAccessModal = new NavigationLink('create-access-modal', 'Create Access Modal'); - public static NewCreateAccessModal = new NavigationLink('new-create-access-modal', 'New Create Access Modal'); // onboarding tour child paths public static PricingPlanStep = new NavigationLink('pricing', 'Pricing Plan'); @@ -149,13 +139,10 @@ export const notProjectRelatedRoutes = [ RouteConfig.ResetPassword.name, RouteConfig.Authorize.name, RouteConfig.Billing.name, - RouteConfig.BillingHistory.name, RouteConfig.BillingOverview.name, RouteConfig.BillingPaymentMethods.name, - RouteConfig.BillingHistory2.name, + RouteConfig.BillingHistory.name, RouteConfig.BillingCoupons.name, - RouteConfig.DepositHistory.name, - RouteConfig.CreditsHistory.name, RouteConfig.Settings.name, ]; @@ -235,9 +222,9 @@ export const router = new Router({ component: BillingPaymentMethods, }, { - path: RouteConfig.BillingHistory2.path, - name: RouteConfig.BillingHistory2.name, - component: BillingHistory2, + path: RouteConfig.BillingHistory.path, + name: RouteConfig.BillingHistory.name, + component: BillingHistory, }, { path: RouteConfig.BillingCoupons.path, @@ -246,21 +233,6 @@ export const router = new Router({ }, ], }, - { - path: RouteConfig.BillingHistory.path, - name: RouteConfig.BillingHistory.name, - component: DetailedHistory, - }, - { - path: RouteConfig.DepositHistory.path, - name: RouteConfig.DepositHistory.name, - component: DetailedHistory, - }, - { - path: RouteConfig.CreditsHistory.path, - name: RouteConfig.CreditsHistory.name, - component: CreditsHistory, - }, ], }, { @@ -370,11 +342,6 @@ export const router = new Router({ { path: RouteConfig.CreateAccessModal.path, name: RouteConfig.CreateAccessModal.name, - component: CreateAccessModal, - }, - { - path: RouteConfig.NewCreateAccessModal.path, - name: RouteConfig.NewCreateAccessModal.name, component: CreateAccessGrantFlow, }, ], @@ -455,9 +422,9 @@ export const router = new Router({ component: BillingPaymentMethods, }, { - path: RouteConfig.BillingHistory3.path, - name: RouteConfig.BillingHistory3.name, - component: BillingHistory2, + path: RouteConfig.BillingHistory2.path, + name: RouteConfig.BillingHistory2.name, + component: BillingHistory, }, { path: RouteConfig.BillingCoupons2.path, @@ -466,21 +433,6 @@ export const router = new Router({ }, ], }, - { - path: RouteConfig.BillingHistory4.path, - name: RouteConfig.BillingHistory4.name, - component: DetailedHistory, - }, - { - path: RouteConfig.DepositHistory2.path, - name: RouteConfig.DepositHistory2.name, - component: DetailedHistory, - }, - { - path: RouteConfig.CreditsHistory2.path, - name: RouteConfig.CreditsHistory2.name, - component: CreditsHistory, - }, ], }, ], diff --git a/web/satellite/src/store/modules/appState.ts b/web/satellite/src/store/modules/appState.ts index fb10b2d81..f926927a9 100644 --- a/web/satellite/src/store/modules/appState.ts +++ b/web/satellite/src/store/modules/appState.ts @@ -41,7 +41,6 @@ export class AppState { public couponCodeBillingUIEnabled = false, public couponCodeSignupUIEnabled = false, public isAllProjectsDashboard = MetaUtils.getMetaContent('all-projects-dashboard') === 'true', - public isNewAccessGrantFlow = false, public config: FrontendConfig = new FrontendConfig(), ) {} } @@ -90,9 +89,6 @@ export function makeAppStateModule(configApi: FrontendConfigApi): StoreModule { return store.getters.user; }); -/** - * Indicates if new billing screen should be used. - */ -const isNewBillingScreen = computed((): boolean => { - return MetaUtils.getMetaContent('new-billing-screen') === 'true'; -}); - /** * Toggles account dropdown visibility. */ @@ -205,7 +197,7 @@ function navigateToBilling(): void { return; } - const routeConf = isNewBillingScreen ? billing.with(RouteConfig.BillingOverview2).path : billing.path; + const routeConf = billing.with(RouteConfig.BillingOverview2).path; router.push(routeConf); analytics.pageVisit(routeConf); } diff --git a/web/satellite/src/views/all-dashboard/components/MyAccountButton.vue b/web/satellite/src/views/all-dashboard/components/MyAccountButton.vue index 119500c64..4a8914aaa 100644 --- a/web/satellite/src/views/all-dashboard/components/MyAccountButton.vue +++ b/web/satellite/src/views/all-dashboard/components/MyAccountButton.vue @@ -68,7 +68,6 @@ import { AnalyticsErrorEventSource, AnalyticsEvent, } from '@/utils/constants/analyticsEventNames'; -import { MetaUtils } from '@/utils/meta'; import { AnalyticsHttpApi } from '@/api/analytics'; import { AuthHttpApi } from '@/api/auth'; import { APP_STATE_DROPDOWNS } from '@/utils/constants/appStatePopUps'; @@ -99,13 +98,6 @@ const isDropdownOpen = computed((): boolean => { return store.state.appStateModule.viewsState.activeDropdown === APP_STATE_DROPDOWNS.ALL_DASH_ACCOUNT; }); -/** - * Indicates if new billing screen should be used. - */ -const isNewBillingScreen = computed((): boolean => { - return MetaUtils.getMetaContent('new-billing-screen') === 'true'; -}); - /** * Returns satellite name from store. */ @@ -132,7 +124,7 @@ function navigateToBilling(): void { return; } - const routeConf = isNewBillingScreen ? billing.with(RouteConfig.BillingOverview2).path : billing.path; + const routeConf = billing.with(RouteConfig.BillingOverview2).path; router.push(routeConf); analytics.pageVisit(routeConf); } diff --git a/web/satellite/static/images/account/billing/back.svg b/web/satellite/static/images/account/billing/back.svg deleted file mode 100644 index f662e5750..000000000 --- a/web/satellite/static/images/account/billing/back.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/web/satellite/static/images/account/billing/card.svg b/web/satellite/static/images/account/billing/card.svg deleted file mode 100644 index 3cd240c52..000000000 --- a/web/satellite/static/images/account/billing/card.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/web/satellite/static/images/account/billing/chargesExpand.svg b/web/satellite/static/images/account/billing/chargesExpand.svg deleted file mode 100644 index 1fbd7ab3c..000000000 --- a/web/satellite/static/images/account/billing/chargesExpand.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/web/satellite/static/images/account/billing/chargesHide.svg b/web/satellite/static/images/account/billing/chargesHide.svg deleted file mode 100644 index f21025ebc..000000000 --- a/web/satellite/static/images/account/billing/chargesHide.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/web/satellite/static/images/account/billing/couponAdd.svg b/web/satellite/static/images/account/billing/couponAdd.svg deleted file mode 100644 index 79c3e0854..000000000 --- a/web/satellite/static/images/account/billing/couponAdd.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/web/satellite/static/images/account/billing/couponLarge.svg b/web/satellite/static/images/account/billing/couponLarge.svg deleted file mode 100644 index e96669e84..000000000 --- a/web/satellite/static/images/account/billing/couponLarge.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/web/satellite/static/images/account/billing/datePicker.svg b/web/satellite/static/images/account/billing/datePicker.svg deleted file mode 100644 index c29149f66..000000000 --- a/web/satellite/static/images/account/billing/datePicker.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/web/satellite/static/images/account/billing/expand.svg b/web/satellite/static/images/account/billing/expand.svg deleted file mode 100644 index 15189bddd..000000000 --- a/web/satellite/static/images/account/billing/expand.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/web/satellite/static/images/account/billing/hide.svg b/web/satellite/static/images/account/billing/hide.svg deleted file mode 100644 index a09149c36..000000000 --- a/web/satellite/static/images/account/billing/hide.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/web/satellite/static/images/account/billing/loading.gif b/web/satellite/static/images/account/billing/loading.gif deleted file mode 100644 index 642d76cffb63560e9c086f3b8813e480005516da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3485 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 - - - diff --git a/web/satellite/static/images/account/billing/lowBalance.svg b/web/satellite/static/images/account/billing/lowBalance.svg deleted file mode 100644 index 26fce1878..000000000 --- a/web/satellite/static/images/account/billing/lowBalance.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/web/satellite/static/images/account/billing/negativeBalance.svg b/web/satellite/static/images/account/billing/negativeBalance.svg deleted file mode 100644 index 46d3b1138..000000000 --- a/web/satellite/static/images/account/billing/negativeBalance.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/web/satellite/static/images/account/billing/selected.svg b/web/satellite/static/images/account/billing/selected.svg deleted file mode 100644 index 4ab9d4c7e..000000000 --- a/web/satellite/static/images/account/billing/selected.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/web/satellite/static/images/account/billing/success.svg b/web/satellite/static/images/account/billing/success.svg deleted file mode 100644 index 9aef85ab7..000000000 --- a/web/satellite/static/images/account/billing/success.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/web/satellite/static/images/account/billing/update.svg b/web/satellite/static/images/account/billing/update.svg deleted file mode 100644 index 2ad096dd1..000000000 --- a/web/satellite/static/images/account/billing/update.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/web/satellite/static/images/account/deleteAccountPopup/deleteAccount.svg b/web/satellite/static/images/account/deleteAccountPopup/deleteAccount.svg deleted file mode 100644 index ca20c3cce..000000000 --- a/web/satellite/static/images/account/deleteAccountPopup/deleteAccount.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/web/satellite/static/images/buckets/bucket.png b/web/satellite/static/images/buckets/bucket.png deleted file mode 100644 index 8dd2bf389a0c783d7ce8a3280324cb72547d092c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4180 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 - - diff --git a/web/satellite/static/images/common/BlueExpand.svg b/web/satellite/static/images/common/BlueExpand.svg deleted file mode 100644 index 4eb6022d4..000000000 --- a/web/satellite/static/images/common/BlueExpand.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/web/satellite/static/images/common/BlueHide.svg b/web/satellite/static/images/common/BlueHide.svg deleted file mode 100644 index 132b4e935..000000000 --- a/web/satellite/static/images/common/BlueHide.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/web/satellite/static/images/common/greyInfo.svg b/web/satellite/static/images/common/greyInfo.svg deleted file mode 100644 index c588e1cca..000000000 --- a/web/satellite/static/images/common/greyInfo.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/web/satellite/static/images/common/smallGreyInfo.svg b/web/satellite/static/images/common/smallGreyInfo.svg deleted file mode 100644 index d3e8b80c6..000000000 --- a/web/satellite/static/images/common/smallGreyInfo.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/web/satellite/static/images/common/successCheck.svg b/web/satellite/static/images/common/successCheck.svg deleted file mode 100644 index 26f0461c0..000000000 --- a/web/satellite/static/images/common/successCheck.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/web/satellite/tests/unit/account/billing/HistoryDropdown.spec.ts b/web/satellite/tests/unit/account/billing/HistoryDropdown.spec.ts deleted file mode 100644 index bf5ef23d1..000000000 --- a/web/satellite/tests/unit/account/billing/HistoryDropdown.spec.ts +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (C) 2020 Storj Labs, Inc. -// See LICENSE for copying information. - -import { createLocalVue, mount } from '@vue/test-utils'; - -import { RouteConfig } from '@/router'; - -import HistoryDropdown from '@/components/account/billing/HistoryDropdown.vue'; - -const localVue = createLocalVue(); - -describe('HistoryDropdown', (): void => { - it('renders correctly if credit history', (): void => { - const creditsHistory: string = RouteConfig.Account.with(RouteConfig.CreditsHistory).path; - const wrapper = mount(HistoryDropdown, { - localVue, - propsData: { - label: 'Credits History', - route: creditsHistory, - }, - directives: { - clickOutside: {}, - }, - }); - - expect(wrapper).toMatchSnapshot(); - }); - - it('renders correctly if balance history', (): void => { - const balanceHistory: string = RouteConfig.Account.with(RouteConfig.DepositHistory).path; - const wrapper = mount(HistoryDropdown, { - localVue, - propsData: { - label: 'Balance History', - route: balanceHistory, - }, - directives: { - clickOutside: {}, - }, - }); - - expect(wrapper).toMatchSnapshot(); - }); -}); diff --git a/web/satellite/tests/unit/account/billing/__snapshots__/HistoryDropdown.spec.ts.snap b/web/satellite/tests/unit/account/billing/__snapshots__/HistoryDropdown.spec.ts.snap deleted file mode 100644 index 1f802229c..000000000 --- a/web/satellite/tests/unit/account/billing/__snapshots__/HistoryDropdown.spec.ts.snap +++ /dev/null @@ -1,13 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`HistoryDropdown renders correctly if balance history 1`] = ` -
-
Balance History
-
-`; - -exports[`HistoryDropdown renders correctly if credit history 1`] = ` -
-
Credits History
-
-`; diff --git a/web/satellite/tests/unit/account/billing/paymentMethods/AddCardForm.spec.ts b/web/satellite/tests/unit/account/billing/paymentMethods/AddCardForm.spec.ts deleted file mode 100644 index 9ddae7973..000000000 --- a/web/satellite/tests/unit/account/billing/paymentMethods/AddCardForm.spec.ts +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (C) 2020 Storj Labs, Inc. -// See LICENSE for copying information. - -import { createLocalVue, mount } from '@vue/test-utils'; -import Vuex from 'vuex'; - -import { FrontendConfigApiMock } from '../../../mock/api/config'; - -import { NotificatorPlugin } from '@/utils/plugins/notificator'; -import { makeNotificationsModule } from '@/store/modules/notifications'; -import { makeAppStateModule } from '@/store/modules/appState'; - -import AddCardForm from '@/components/account/billing/paymentMethods/AddCardForm.vue'; - -const localVue = createLocalVue(); -localVue.use(Vuex); - -const appStateModule = makeAppStateModule(new FrontendConfigApiMock()); -const notificationsModule = makeNotificationsModule(); -const store = new Vuex.Store({ modules: { appStateModule, notificationsModule } }); - -localVue.use(new NotificatorPlugin(store)); - -describe('AddCardForm', () => { - it('renders correctly', () => { - const wrapper = mount(AddCardForm, { - localVue, - }); - - expect(wrapper).toMatchSnapshot(); - }); -}); diff --git a/web/satellite/tests/unit/account/billing/paymentMethods/AddStorjForm.spec.ts b/web/satellite/tests/unit/account/billing/paymentMethods/AddStorjForm.spec.ts deleted file mode 100644 index 9cf7b1031..000000000 --- a/web/satellite/tests/unit/account/billing/paymentMethods/AddStorjForm.spec.ts +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (C) 2020 Storj Labs, Inc. -// See LICENSE for copying information. - -import { mount } from '@vue/test-utils'; - -import AddStorjForm from '@/components/account/billing/paymentMethods/AddStorjForm.vue'; - -describe('AddStorjForm', () => { - it('renders correctly', () => { - const wrapper = mount(AddStorjForm); - - expect(wrapper).toMatchSnapshot(); - }); -}); diff --git a/web/satellite/tests/unit/account/billing/paymentMethods/__snapshots__/AddCardForm.spec.ts.snap b/web/satellite/tests/unit/account/billing/paymentMethods/__snapshots__/AddCardForm.spec.ts.snap deleted file mode 100644 index 314bb49f6..000000000 --- a/web/satellite/tests/unit/account/billing/paymentMethods/__snapshots__/AddCardForm.spec.ts.snap +++ /dev/null @@ -1,14 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`AddCardForm renders correctly 1`] = ` -
-

Add Credit or Debit Card

-
-
-
- -
-
-
-
-`; diff --git a/web/satellite/tests/unit/account/billing/paymentMethods/__snapshots__/AddStorjForm.spec.ts.snap b/web/satellite/tests/unit/account/billing/paymentMethods/__snapshots__/AddStorjForm.spec.ts.snap deleted file mode 100644 index 980350a3e..000000000 --- a/web/satellite/tests/unit/account/billing/paymentMethods/__snapshots__/AddStorjForm.spec.ts.snap +++ /dev/null @@ -1,7 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`AddStorjForm renders correctly 1`] = ` -
-

To deposit STORJ token and request higher limits, please contact Support

-
-`; diff --git a/web/satellite/tests/unit/ignore/account/billing/coupons/CouponArea.spec.ts b/web/satellite/tests/unit/ignore/account/billing/coupons/CouponArea.spec.ts deleted file mode 100644 index 1ba4f362b..000000000 --- a/web/satellite/tests/unit/ignore/account/billing/coupons/CouponArea.spec.ts +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (C) 2021 Storj Labs, Inc. -// See LICENSE for copying information. - -import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; - -import { PaymentsMock } from '../../../../mock/api/payments'; -import { FrontendConfigApiMock } from '../../../../mock/api/config'; - -import { makeAppStateModule } from '@/store/modules/appState'; -import { makePaymentsModule } from '@/store/modules/payments'; -import { Coupon, CouponDuration } from '@/types/payments'; -import { APP_STATE_MUTATIONS } from '@/store/mutationConstants'; - -import CouponArea from '@/components/account/billing/coupons/CouponArea.vue'; - -const localVue = createLocalVue(); -localVue.use(Vuex); - -const appStateModule = makeAppStateModule(new FrontendConfigApiMock()); -const paymentsApi = new PaymentsMock(); -const paymentsModule = makePaymentsModule(paymentsApi); -paymentsApi.setMockCoupon(new Coupon( - '', - 'PROMO_CODE', - 'Coupon Name', - 123, - 0, - new Date(2021, 9, 1), - new Date(2021, 11, 1), - CouponDuration.Repeating, -)); - -const store = new Vuex.Store({ modules: { paymentsModule, appStateModule } }); -store.commit(APP_STATE_MUTATIONS.SET_COUPON_CODE_BILLING_UI_STATUS, true); - -describe('CouponArea', (): void => { - it('renders correctly', async (): Promise => { - const wrapper = shallowMount(CouponArea, { - localVue, - store, - }); - - await wrapper.setData({ isCouponFetching: false }); - - expect(wrapper).toMatchSnapshot(); - }); -}); diff --git a/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/DetailedHistory.spec.ts b/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/DetailedHistory.spec.ts deleted file mode 100644 index e0a954b00..000000000 --- a/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/DetailedHistory.spec.ts +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (C) 2020 Storj Labs, Inc. -// See LICENSE for copying information. - -import Vuex from 'vuex'; -import { createLocalVue, mount, shallowMount } from '@vue/test-utils'; - -import { ProjectsApiMock } from '../../../../mock/api/projects'; - -import { PaymentsHttpApi } from '@/api/payments'; -import { router } from '@/router'; -import { makeNotificationsModule } from '@/store/modules/notifications'; -import { makePaymentsModule, PAYMENTS_MUTATIONS } from '@/store/modules/payments'; -import { makeProjectsModule, PROJECTS_MUTATIONS } from '@/store/modules/projects'; -import { PaymentsHistoryItem, PaymentsHistoryItemStatus, PaymentsHistoryItemType } from '@/types/payments'; -import { Project } from '@/types/projects'; -import { NotificatorPlugin } from '@/utils/plugins/notificator'; - -import DetailedHistory from '@/components/account/billing/depositAndBillingHistory/DetailedHistory.vue'; - -const localVue = createLocalVue(); -const projectsApi = new ProjectsApiMock(); -const projectsModule = makeProjectsModule(projectsApi); -const paymentsApi = new PaymentsHttpApi(); -const paymentsModule = makePaymentsModule(paymentsApi); -const notificationsModule = makeNotificationsModule(); -const itemInvoice = new PaymentsHistoryItem('testId', 'Invoice', 500, 500, PaymentsHistoryItemStatus.Paid, 'test', new Date(1), new Date(1), PaymentsHistoryItemType.Invoice); -const itemCharge = new PaymentsHistoryItem('testId1', 'Charge', 500, 500, PaymentsHistoryItemStatus.Paid, 'test', new Date(1), new Date(1), PaymentsHistoryItemType.Charge); -const itemTransaction = new PaymentsHistoryItem('testId2', 'Transaction', 500, 500, PaymentsHistoryItemStatus.Paid, 'test', new Date(1), new Date(1), PaymentsHistoryItemType.Transaction); -const itemTransaction1 = new PaymentsHistoryItem('testId3', 'Transaction', 500, 500, PaymentsHistoryItemStatus.Paid, 'test', new Date(1), new Date(1), PaymentsHistoryItemType.Transaction); -const project = new Project('id', 'projectName', 'projectDescription', 'test', 'testOwnerId', false); - -localVue.use(Vuex); - -const store = new Vuex.Store({ modules: { paymentsModule, projectsModule, notificationsModule } }); -store.commit(PROJECTS_MUTATIONS.SET_PROJECTS, [project]); -store.commit(PROJECTS_MUTATIONS.SELECT_PROJECT, project.id); - -localVue.use(new NotificatorPlugin(store)); - -describe('DetailedHistory', (): void => { - it('renders correctly without items', async (): Promise => { - const wrapper = shallowMount(DetailedHistory, { - localVue, - store, - router, - }); - - await wrapper.setData({ isDataFetching: false }); - - expect(wrapper).toMatchSnapshot(); - }); - - it('renders correctly with deposit items', async (): Promise => { - await store.commit(PAYMENTS_MUTATIONS.SET_PAYMENTS_HISTORY, [itemTransaction, itemTransaction1, itemInvoice, itemCharge]); - - const wrapper = shallowMount(DetailedHistory, { - localVue, - store, - router, - }); - - await wrapper.setData({ isDataFetching: false }); - - expect(wrapper).toMatchSnapshot(); - }); - - it('click on back works correctly', async (): Promise => { - const clickSpy = jest.spyOn(router, 'push'); - const wrapper = mount(DetailedHistory, { - localVue, - store, - router, - }); - - await wrapper.find('.history-area__back-area').trigger('click'); - expect(clickSpy).toHaveBeenCalled(); - }); -}); diff --git a/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/PaymentsHistoryItemDate.spec.ts b/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/PaymentsHistoryItemDate.spec.ts deleted file mode 100644 index 6453e58a5..000000000 --- a/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/PaymentsHistoryItemDate.spec.ts +++ /dev/null @@ -1,88 +0,0 @@ -// Copyright (C) 2020 Storj Labs, Inc. -// See LICENSE for copying information. - -import { createLocalVue, mount } from '@vue/test-utils'; - -import { PaymentsHistoryItemStatus, PaymentsHistoryItemType } from '@/types/payments'; - -import PaymentsHistoryItemDate from '@/components/account/billing/depositAndBillingHistory/PaymentsHistoryItemDate.vue'; - -const localVue = createLocalVue(); - -describe('PaymentsHistoryItemDate', (): void => { - it('renders correctly if invoice', (): void => { - const startDate = new Date(2019, 1, 1, 1, 1, 1, 1); - const expirationDate = new Date(0, 1, 1, 1, 1, 1, 1); - - jest.useFakeTimers('modern'); - jest.setSystemTime(startDate); - - const wrapper = mount(PaymentsHistoryItemDate, { - localVue, - propsData: { - expiration: expirationDate, - start: startDate, - type: PaymentsHistoryItemType.Invoice, - }, - }); - - expect(wrapper).toMatchSnapshot(); - }); - - it('renders correctly if charge', (): void => { - const startDate = new Date(2019, 5, 5, 5, 5, 5, 5); - const expirationDate = new Date(0, 1, 1, 1, 1, 1, 1); - - jest.useFakeTimers('modern'); - jest.setSystemTime(startDate); - - const wrapper = mount(PaymentsHistoryItemDate, { - localVue, - propsData: { - expiration: expirationDate, - start: startDate, - type: PaymentsHistoryItemType.Charge, - }, - }); - - expect(wrapper).toMatchSnapshot(); - }); - - it('renders correctly if transaction is not expired', (): void => { - const startDate = new Date(2019, 5, 5, 5, 5, 5, 5); - const expirationDate = new Date(2019, 5, 5, 6, 5, 5, 5); - const testTimeNow = expirationDate.getTime(); - - jest.useFakeTimers('modern'); - jest.setSystemTime(testTimeNow); - - const wrapper = mount(PaymentsHistoryItemDate, { - localVue, - propsData: { - expiration: expirationDate, - start: startDate, - type: PaymentsHistoryItemType.Transaction, - status: PaymentsHistoryItemStatus.Pending, - }, - }); - - expect(wrapper).toMatchSnapshot(); - }); - - it('renders correctly if transaction expired', (): void => { - const startDate = new Date(2019, 5, 6, 5, 5, 5, 5); - const expirationDate = new Date(2019, 5, 6, 6, 5, 5, 5); - - const wrapper = mount(PaymentsHistoryItemDate, { - localVue, - propsData: { - expiration: expirationDate, - start: startDate, - type: PaymentsHistoryItemType.Transaction, - status: PaymentsHistoryItemStatus.Completed, - }, - }); - - expect(wrapper).toMatchSnapshot(); - }); -}); diff --git a/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/PaymentsItem.spec.ts b/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/PaymentsItem.spec.ts deleted file mode 100644 index d84e5eb86..000000000 --- a/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/PaymentsItem.spec.ts +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (C) 2020 Storj Labs, Inc. -// See LICENSE for copying information. - -import { createLocalVue, mount } from '@vue/test-utils'; - -import { PaymentsHistoryItem, PaymentsHistoryItemStatus, PaymentsHistoryItemType } from '@/types/payments'; - -import PaymentsItem from '@/components/account/billing/depositAndBillingHistory/PaymentsItem.vue'; - -const localVue = createLocalVue(); -const itemInvoice = new PaymentsHistoryItem('testId', 'Invoice', 500, 500, PaymentsHistoryItemStatus.Paid, 'test', new Date(1), new Date(1), PaymentsHistoryItemType.Invoice); -const itemCharge = new PaymentsHistoryItem('testId', 'Charge', 500, 500, PaymentsHistoryItemStatus.Paid, 'test', new Date(1), new Date(1), PaymentsHistoryItemType.Charge); -const itemTransaction = new PaymentsHistoryItem('testId', 'Transaction', 500, 500, PaymentsHistoryItemStatus.Paid, 'test', new Date(1), new Date(1), PaymentsHistoryItemType.Transaction); - -describe('PaymentsItem', (): void => { - it('renders correctly if invoice', (): void => { - const wrapper = mount(PaymentsItem, { - localVue, - propsData: { - billingItem: itemInvoice, - }, - }); - - expect(wrapper).toMatchSnapshot(); - }); - - it('renders correctly if charge', (): void => { - const wrapper = mount(PaymentsItem, { - localVue, - propsData: { - billingItem: itemCharge, - }, - }); - - expect(wrapper).toMatchSnapshot(); - }); - - it('renders correctly if transaction', (): void => { - const wrapper = mount(PaymentsItem, { - localVue, - propsData: { - billingItem: itemTransaction, - }, - }); - - expect(wrapper).toMatchSnapshot(); - }); -}); diff --git a/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/PeriodSelection.spec.ts b/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/PeriodSelection.spec.ts deleted file mode 100644 index 3b706b346..000000000 --- a/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/PeriodSelection.spec.ts +++ /dev/null @@ -1,109 +0,0 @@ -// Copyright (C) 2020 Storj Labs, Inc. -// See LICENSE for copying information. - -import { VNode } from 'vue'; -import { DirectiveBinding } from 'vue/types/options'; -import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; - -import { ProjectsApiMock } from '../../../../mock/api/projects'; -import { PaymentsMock } from '../../../../mock/api/payments'; -import { FrontendConfigApiMock } from '../../../../mock/api/config'; - -import { makeAppStateModule } from '@/store/modules/appState'; -import { makeProjectsModule, PROJECTS_MUTATIONS } from '@/store/modules/projects'; -import { Project } from '@/types/projects'; -import { makePaymentsModule } from '@/store/modules/payments'; - -import PeriodSelection from '@/components/account/billing/depositAndBillingHistory/PeriodSelection.vue'; - -const localVue = createLocalVue(); -const appStateModule = makeAppStateModule(new FrontendConfigApiMock()); -const projectsApi = new ProjectsApiMock(); -const projectsModule = makeProjectsModule(projectsApi); -const paymentsApi = new PaymentsMock(); -const paymentsModule = makePaymentsModule(paymentsApi); -const project = new Project('id', 'projectName', 'projectDescription', 'test', 'testOwnerId', false); - -let clickOutsideEvent: EventListener; - -localVue.directive('click-outside', { - bind: function (el: HTMLElement, binding: DirectiveBinding, vnode: VNode) { - clickOutsideEvent = function(event: Event): void { - if (el === event.target) { - return; - } - - if (vnode.context && binding.expression) { - vnode.context[binding.expression](event); - } - }; - - document.body.addEventListener('click', clickOutsideEvent); - }, - unbind: function(): void { - document.body.removeEventListener('click', clickOutsideEvent); - }, -}); - -localVue.use(Vuex); - -const store = new Vuex.Store({ modules: { - projectsModule, - appStateModule, - paymentsModule, -} }); -store.commit(PROJECTS_MUTATIONS.SET_PROJECTS, [project]); -store.commit(PROJECTS_MUTATIONS.SELECT_PROJECT, project.id); - -describe('PeriodSelection', (): void => { - it('renders correctly', (): void => { - const wrapper = shallowMount(PeriodSelection, { - localVue, - store, - }); - - expect(wrapper).toMatchSnapshot(); - }); - - it('renders correctly with dropdown', async (): Promise => { - const wrapper = shallowMount(PeriodSelection, { - localVue, - store, - }); - - await wrapper.find('.period-selection').trigger('click'); - - expect(wrapper).toMatchSnapshot(); - }); - - it('clicks work correctly', async (): Promise => { - const currentClickSpy = jest.fn(); - const previousClickSpy = jest.fn(); - const historyClickSpy = jest.fn(); - - const wrapper = shallowMount(PeriodSelection, { - localVue, - store, - }); - - wrapper.vm.onCurrentPeriodClick = currentClickSpy; - wrapper.vm.onPreviousPeriodClick = previousClickSpy; - wrapper.vm.redirect = historyClickSpy; - - await wrapper.find('.period-selection').trigger('click'); - await wrapper.findAll('.period-selection__dropdown__item').at(0).trigger('click'); - - expect(currentClickSpy).toHaveBeenCalledTimes(1); - - await wrapper.find('.period-selection').trigger('click'); - await wrapper.findAll('.period-selection__dropdown__item').at(1).trigger('click'); - - expect(previousClickSpy).toHaveBeenCalledTimes(1); - - await wrapper.find('.period-selection').trigger('click'); - await wrapper.find('.period-selection__dropdown__link-container').trigger('click'); - - expect(historyClickSpy).toHaveBeenCalledTimes(1); - }); -}); diff --git a/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/SmallDepositHistory.spec.ts b/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/SmallDepositHistory.spec.ts deleted file mode 100644 index 90c545d83..000000000 --- a/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/SmallDepositHistory.spec.ts +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright (C) 2020 Storj Labs, Inc. -// See LICENSE for copying information. - -import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; - -import { router } from '@/router'; -import { PaymentsHttpApi } from '@/api/payments'; -import { makePaymentsModule, PAYMENTS_MUTATIONS } from '@/store/modules/payments'; -import { PaymentsHistoryItem, PaymentsHistoryItemStatus, PaymentsHistoryItemType } from '@/types/payments'; - -import SmallDepositHistory from '@/components/account/billing/depositAndBillingHistory/SmallDepositHistory.vue'; - -const localVue = createLocalVue(); -localVue.use(Vuex); - -const paymentsApi = new PaymentsHttpApi(); -const paymentsModule = makePaymentsModule(paymentsApi); -const itemInvoice = new PaymentsHistoryItem('testId', 'Invoice', 500, 500, PaymentsHistoryItemStatus.Paid, 'test', new Date(1), new Date(1), PaymentsHistoryItemType.Invoice); -const itemCharge = new PaymentsHistoryItem('testId1', 'Charge', 500, 500, PaymentsHistoryItemStatus.Paid, 'test', new Date(1), new Date(1), PaymentsHistoryItemType.Charge); -const itemTransaction = new PaymentsHistoryItem('testId2', 'Transaction', 500, 500, PaymentsHistoryItemStatus.Paid, 'test', new Date(1), new Date(1), PaymentsHistoryItemType.Transaction); -const itemTransaction1 = new PaymentsHistoryItem('testId3', 'Transaction', 500, 500, PaymentsHistoryItemStatus.Paid, 'test', new Date(1), new Date(1), PaymentsHistoryItemType.Transaction); -const itemTransaction2 = new PaymentsHistoryItem('testId4', 'Transaction', 500, 500, PaymentsHistoryItemStatus.Paid, 'test', new Date(1), new Date(1), PaymentsHistoryItemType.Transaction); -const itemTransaction3 = new PaymentsHistoryItem('testId5', 'Transaction', 500, 500, PaymentsHistoryItemStatus.Paid, 'test', new Date(1), new Date(1), PaymentsHistoryItemType.Transaction); - -const store = new Vuex.Store({ modules: { paymentsModule } }); - -describe('SmallDepositHistory', (): void => { - it('renders correctly without items', (): void => { - const wrapper = shallowMount(SmallDepositHistory, { - localVue, - store, - router, - }); - - expect(wrapper).toMatchSnapshot(); - }); - - it('renders correctly with items', (): void => { - store.commit(PAYMENTS_MUTATIONS.SET_PAYMENTS_HISTORY, [itemCharge, itemInvoice, itemTransaction, itemTransaction1, itemTransaction2, itemTransaction3]); - - const wrapper = shallowMount(SmallDepositHistory, { - localVue, - store, - router, - }); - - expect(wrapper).toMatchSnapshot(); - }); - - it('click on view all works correctly', async (): Promise => { - const spyPush = jest.spyOn(router, 'push'); - - const wrapper = shallowMount(SmallDepositHistory, { - localVue, - store, - router, - }); - - await wrapper.find('.deposit-area__header__button').trigger('click'); - expect(spyPush).toHaveBeenCalled(); - }); -}); diff --git a/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/SortingHeader.spec.ts b/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/SortingHeader.spec.ts deleted file mode 100644 index 75b0f8a6d..000000000 --- a/web/satellite/tests/unit/ignore/account/billing/depositAndBillingHistory/SortingHeader.spec.ts +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (C) 2020 Storj Labs, Inc. -// See LICENSE for copying information. - -import { createLocalVue, mount } from '@vue/test-utils'; - -import SortingHeader from '@/components/account/billing/depositAndBillingHistory/SortingHeader.vue'; - -const localVue = createLocalVue(); - -describe('SortingHeader', (): void => { - it('renders correctly', (): void => { - const wrapper = mount(SortingHeader, { - localVue, - }); - - expect(wrapper).toMatchSnapshot(); - }); -}); diff --git a/web/satellite/tests/unit/ignore/account/billing/estimatedCostsAndCredits/EstimatedCostsAndCredits.spec.ts b/web/satellite/tests/unit/ignore/account/billing/estimatedCostsAndCredits/EstimatedCostsAndCredits.spec.ts deleted file mode 100644 index 31ddcec0c..000000000 --- a/web/satellite/tests/unit/ignore/account/billing/estimatedCostsAndCredits/EstimatedCostsAndCredits.spec.ts +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright (C) 2020 Storj Labs, Inc. -// See LICENSE for copying information. - -import Vuex from 'vuex'; -import { createLocalVue, mount } from '@vue/test-utils'; - -import { UsersApiMock } from '../../../../mock/api/users'; -import { ProjectsApiMock } from '../../../../mock/api/projects'; -import { PaymentsMock } from '../../../../mock/api/payments'; - -import { makePaymentsModule, PAYMENTS_MUTATIONS } from '@/store/modules/payments'; -import { makeProjectsModule, PROJECTS_MUTATIONS } from '@/store/modules/projects'; -import { makeUsersModule, USER_MUTATIONS } from '@/store/modules/users'; -import { ProjectUsageAndCharges } from '@/types/payments'; -import { Project } from '@/types/projects'; -import { User } from '@/types/users'; - -import EstimatedCostsAndCredits from '@/components/account/billing/estimatedCostsAndCredits/EstimatedCostsAndCredits.vue'; - -const localVue = createLocalVue(); -localVue.filter('centsToDollars', (cents: number): string => { - return `USD $${(cents / 100).toFixed(2)}`; -}); -localVue.use(Vuex); - -const usersApi = new UsersApiMock(); -const usersModule = makeUsersModule(usersApi); -const projectsApi = new ProjectsApiMock(); -const projectsModule = makeProjectsModule(projectsApi); -const paymentsApi = new PaymentsMock(); -const paymentsModule = makePaymentsModule(paymentsApi); -const store = new Vuex.Store({ modules: { usersModule, projectsModule, paymentsModule } }); - -const now = new Date(2020, 4, 1, 12 /* avoid timezone issues */, 1, 1, 1); -paymentsModule.state.startDate = now; // TODO: we shouldn't need to do this -paymentsModule.state.endDate = now; - -const project = new Project('id', 'projectName', 'projectDescription', 'test', 'testOwnerId', true); -const project1 = new Project('id1', 'projectName1', 'projectDescription1', 'test', 'testOwnerId1', false); -const user = new User('testOwnerId'); -const date = new Date(1970, 1, 1); -const projectCharge = new ProjectUsageAndCharges(date, date, 100, 100, 100, 'id', 100, 100, 100); -const projectCharge1 = new ProjectUsageAndCharges(date, date, 100, 100, 100, 'id1', 100, 100, 100); -const { - SET_PROJECT_USAGE_AND_CHARGES, - SET_PRICE_SUMMARY, -} = PAYMENTS_MUTATIONS; - -describe('EstimatedCostsAndCredits', (): void => { - beforeEach(() => { - jest.useFakeTimers('modern'); - jest.setSystemTime(now); - }); - afterAll(() => { - jest.useRealTimers(); - }); - - it('renders correctly with project and no project usage and charges', async (): Promise => { - await store.commit(USER_MUTATIONS.SET_USER, user); - await store.commit(PROJECTS_MUTATIONS.ADD, project); - - const wrapper = mount(EstimatedCostsAndCredits, { - store, - localVue, - }); - - await wrapper.setData({ isDataFetching: false }); - - expect(wrapper).toMatchSnapshot(); - }); - - it('renders correctly with project and project usage and charges', async (): Promise => { - await store.commit(PROJECTS_MUTATIONS.ADD, project); - await store.commit(SET_PROJECT_USAGE_AND_CHARGES, [projectCharge]); - await store.commit(SET_PRICE_SUMMARY, [projectCharge]); - - const wrapper = mount(EstimatedCostsAndCredits, { - store, - localVue, - }); - - await wrapper.setData({ isDataFetching: false }); - - expect(wrapper).toMatchSnapshot(); - }); - - it('renders correctly with 2 projects and project usage and charges', async (): Promise => { - await store.commit(PROJECTS_MUTATIONS.ADD, project); - await store.commit(PROJECTS_MUTATIONS.ADD, project1); - await store.commit(SET_PROJECT_USAGE_AND_CHARGES, [projectCharge, projectCharge1]); - await store.commit(SET_PRICE_SUMMARY, [projectCharge, projectCharge1]); - - const wrapper = mount(EstimatedCostsAndCredits, { - store, - localVue, - }); - - await wrapper.setData({ isDataFetching: false }); - - expect(wrapper).toMatchSnapshot(); - }); -}); diff --git a/web/satellite/tests/unit/ignore/account/billing/estimatedCostsAndCredits/UsageAndChargesItem.spec.ts b/web/satellite/tests/unit/ignore/account/billing/estimatedCostsAndCredits/UsageAndChargesItem.spec.ts deleted file mode 100644 index 3d9795fc5..000000000 --- a/web/satellite/tests/unit/ignore/account/billing/estimatedCostsAndCredits/UsageAndChargesItem.spec.ts +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (C) 2020 Storj Labs, Inc. -// See LICENSE for copying information. - -import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; - -import { PaymentsMock } from '../../../../mock/api/payments'; -import { ProjectsApiMock } from '../../../../mock/api/projects'; - -import { makePaymentsModule, PAYMENTS_ACTIONS } from '@/store/modules/payments'; -import { makeProjectsModule } from '@/store/modules/projects'; -import { ProjectUsageAndCharges } from '@/types/payments'; -import { Project } from '@/types/projects'; - -import UsageAndChargesItem from '@/components/account/billing/estimatedCostsAndCredits/UsageAndChargesItem.vue'; - -const localVue = createLocalVue(); -localVue.filter('centsToDollars', (cents: number): string => { - return `USD $${(cents / 100).toFixed(2)}`; -}); -localVue.use(Vuex); - -const projectsApi = new ProjectsApiMock(); -const projectsModule = makeProjectsModule(projectsApi); -const paymentsApi = new PaymentsMock(); -const paymentsModule = makePaymentsModule(paymentsApi); -const store = new Vuex.Store({ modules: { projectsModule, paymentsModule } }); - -jest.mock('@/utils/meta'); - -describe('UsageAndChargesItem', (): void => { - const project = new Project('id', 'projectName', 'projectDescription', 'test', 'testOwnerId', true); - projectsApi.setMockProjects([project]); - const date = new Date(Date.UTC(1970, 1, 1)); - const projectCharge = new ProjectUsageAndCharges(date, date, 100, 100, 100, 'id', 100, 100, 100); - store.dispatch(PAYMENTS_ACTIONS.GET_PROJECT_USAGE_PRICE_MODEL); - - it('renders correctly', (): void => { - const wrapper = shallowMount(UsageAndChargesItem, { - store, - localVue, - }); - - expect(wrapper).toMatchSnapshot(); - }); - - it('toggling dropdown works correctly', async (): Promise => { - const wrapper = shallowMount(UsageAndChargesItem, { - store, - localVue, - propsData: { - item: projectCharge, - }, - }); - - await wrapper.find('.usage-charges-item-container__summary').trigger('click'); - - expect(wrapper).toMatchSnapshot(); - - await wrapper.find('.usage-charges-item-container__summary').trigger('click'); - - expect(wrapper).toMatchSnapshot(); - }); -}); diff --git a/web/satellite/tests/unit/ignore/account/billing/paymentMethods/PaymentMethods.spec.ts b/web/satellite/tests/unit/ignore/account/billing/paymentMethods/PaymentMethods.spec.ts deleted file mode 100644 index b83ac47fa..000000000 --- a/web/satellite/tests/unit/ignore/account/billing/paymentMethods/PaymentMethods.spec.ts +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright (C) 2020 Storj Labs, Inc. -// See LICENSE for copying information. - -import Vuex from 'vuex'; -import { createLocalVue, mount, shallowMount } from '@vue/test-utils'; - -import { PaymentsMock } from '../../../../mock/api/payments'; -import { ProjectsApiMock } from '../../../../mock/api/projects'; -import { UsersApiMock } from '../../../../mock/api/users'; -import { FrontendConfigApiMock } from '../../../../mock/api/config'; - -import { makeAppStateModule } from '@/store/modules/appState'; -import { makeNotificationsModule } from '@/store/modules/notifications'; -import { makePaymentsModule, PAYMENTS_MUTATIONS } from '@/store/modules/payments'; -import { makeProjectsModule } from '@/store/modules/projects'; -import { makeUsersModule, USER_MUTATIONS } from '@/store/modules/users'; -import { CreditCard } from '@/types/payments'; -import { User } from '@/types/users'; -import { NotificatorPlugin } from '@/utils/plugins/notificator'; - -import PaymentMethods from '@/components/account/billing/paymentMethods/PaymentMethods.vue'; - -const localVue = createLocalVue(); - -localVue.use(Vuex); - -const appStateModule = makeAppStateModule(new FrontendConfigApiMock()); -const paymentsApi = new PaymentsMock(); -const paymentsModule = makePaymentsModule(paymentsApi); -const usersApi = new UsersApiMock(); -const usersModule = makeUsersModule(usersApi); -const projectsApi = new ProjectsApiMock(); -const projectsModule = makeProjectsModule(projectsApi); -const notificationsModule = makeNotificationsModule(); -const store = new Vuex.Store({ modules: { usersModule, paymentsModule, projectsModule, appStateModule, notificationsModule } }); -store.commit(USER_MUTATIONS.SET_USER, new User('id', 'name', 'short', 'test@test.test', 'partner', 'pass')); - -localVue.use(new NotificatorPlugin(store)); - -const ANIMATION_COMPLETE_TIME = 600; - -describe('PaymentMethods', () => { - it('renders correctly without card', async (): Promise => { - const wrapper = shallowMount(PaymentMethods, { - store, - localVue, - }); - - await wrapper.setData({ areCardsFetching: false }); - - expect(wrapper).toMatchSnapshot(); - }); - - it('renders correctly after add card and cancel click', async () => { - const wrapper = shallowMount(PaymentMethods, { - store, - localVue, - }); - - await wrapper.setData({ areCardsFetching: false }); - - await wrapper.find('.add-card-button').trigger('click'); - - await new Promise(resolve => { - setTimeout(() => { - expect(wrapper).toMatchSnapshot(); - wrapper.find('.payment-methods-area__functional-area__button-area__cancel').trigger('click'); - - setTimeout(() => { - expect(wrapper).toMatchSnapshot(); - resolve(); - }, ANIMATION_COMPLETE_TIME); - }, ANIMATION_COMPLETE_TIME); - }); - }); - - it('renders correctly after add STORJ and cancel click', async () => { - const wrapper = mount(PaymentMethods, { - store, - localVue, - }); - - await wrapper.setData({ areCardsFetching: false }); - - await wrapper.find('.add-storj-button').trigger('click'); - - await new Promise(resolve => { - setTimeout(() => { - expect(wrapper).toMatchSnapshot(); - wrapper.find('.payment-methods-area__functional-area__button-area__cancel').trigger('click'); - - setTimeout(() => { - expect(wrapper).toMatchSnapshot(); - resolve(); - }, ANIMATION_COMPLETE_TIME); - }, ANIMATION_COMPLETE_TIME); - }); - }); - - it('renders correctly with card', async (): Promise => { - const card = new CreditCard('cardId', 12, 2100, 'test', '0000', true); - store.commit(PAYMENTS_MUTATIONS.SET_CREDIT_CARDS, [card]); - - const wrapper = shallowMount(PaymentMethods, { - store, - localVue, - }); - - await wrapper.setData({ areCardsFetching: false }); - - expect(wrapper).toMatchSnapshot(); - }); -});