diff --git a/web/satellite/src/components/accessGrants/ProgressBar.vue b/web/satellite/src/components/accessGrants/ProgressBar.vue index 5cfec69c5..b1edd62d9 100644 --- a/web/satellite/src/components/accessGrants/ProgressBar.vue +++ b/web/satellite/src/components/accessGrants/ProgressBar.vue @@ -36,28 +36,28 @@ export default class ProgressBar extends Vue { * Indicates if current route is on name step. */ public get isNameStep(): boolean { - return this.$route.name === RouteConfig.NameStep.name; + return this.$route.name === RouteConfig.NameStep.name || this.$route.name === RouteConfig.AccessGrantName.name; } /** * Indicates if current route is on permissions step. */ public get isPermissionsStep(): boolean { - return this.$route.name === RouteConfig.PermissionsStep.name; + return this.$route.name === RouteConfig.PermissionsStep.name || this.$route.name === RouteConfig.AccessGrantPermissions.name; } /** * Indicates if current route is on passphrase step. */ public get isPassphraseStep(): boolean { - return this.$route.name === RouteConfig.CreatePassphraseStep.name || this.$route.name === RouteConfig.EnterPassphraseStep.name; + return this.$route.name === RouteConfig.CreatePassphraseStep.name || this.$route.name === RouteConfig.EnterPassphraseStep.name || this.$route.name === RouteConfig.AccessGrantPassphrase.name; } /** * Indicates if current route is on result step. */ public get isResultStep(): boolean { - return this.$route.name === RouteConfig.ResultStep.name; + return this.$route.name === RouteConfig.ResultStep.name || this.$route.name === RouteConfig.AccessGrantResult.name; } } diff --git a/web/satellite/src/components/accessGrants/permissions/BucketsSelection.vue b/web/satellite/src/components/accessGrants/permissions/BucketsSelection.vue index 8cbc05aa0..0b93c813a 100644 --- a/web/satellite/src/components/accessGrants/permissions/BucketsSelection.vue +++ b/web/satellite/src/components/accessGrants/permissions/BucketsSelection.vue @@ -5,6 +5,7 @@

{{ selectionLabel }}

@@ -27,6 +28,7 @@ import { Component, Vue } from 'vue-property-decorator'; import BucketsDropdown from '@/components/accessGrants/permissions/BucketsDropdown.vue'; import ExpandIcon from '@/../static/images/common/BlackArrowExpand.svg'; +import {RouteConfig} from "@/router"; @Component({ components: { @@ -41,6 +43,8 @@ export default class BucketsSelection extends Vue { * Toggles dropdown visibility. */ public toggleDropdown(): void { + if (this.isOnboardingTour) return; + this.isDropdownShown = !this.isDropdownShown; } @@ -51,6 +55,13 @@ export default class BucketsSelection extends Vue { this.isDropdownShown = false; } + /** + * Indicates if current route is onboarding tour. + */ + public get isOnboardingTour(): boolean { + return this.$route.path.includes(RouteConfig.OnboardingTour.path); + } + /** * Returns selection options (all or items count). */ @@ -101,4 +112,10 @@ export default class BucketsSelection extends Vue { } } } + + .disabled { + pointer-events: none; + background: #f5f6fa; + border: 1px solid rgba(56, 75, 101, 0.4); + } diff --git a/web/satellite/src/components/accessGrants/steps/CreatePassphraseStep.vue b/web/satellite/src/components/accessGrants/steps/CreatePassphraseStep.vue index 2473e814f..437e750d0 100644 --- a/web/satellite/src/components/accessGrants/steps/CreatePassphraseStep.vue +++ b/web/satellite/src/components/accessGrants/steps/CreatePassphraseStep.vue @@ -2,7 +2,7 @@ // See LICENSE for copying information.