From 3900b6fe1a0656441218864f727e9a9cee1a0700 Mon Sep 17 00:00:00 2001 From: mengdong19 Date: Tue, 19 May 2020 10:13:38 -0700 Subject: [PATCH] Bug bix - #3709 (#699) (#703) * Bug bix - #3709 Safff user redirect to staff dashboard. * bug fix - #3705 Redirect user to create account when current account is null. --- auth-web/package-lock.json | 20 +++++++++---------- .../src/components/auth/EntityManagement.vue | 3 +++ auth-web/src/util/constants.ts | 3 ++- auth-web/src/views/auth/HomeView.vue | 5 +++++ 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/auth-web/package-lock.json b/auth-web/package-lock.json index c78c6abd43..a1ec356ab3 100644 --- a/auth-web/package-lock.json +++ b/auth-web/package-lock.json @@ -9571,18 +9571,18 @@ } }, "launchdarkly-js-client-sdk": { - "version": "2.17.4", - "resolved": "https://registry.npmjs.org/launchdarkly-js-client-sdk/-/launchdarkly-js-client-sdk-2.17.4.tgz", - "integrity": "sha512-HAdIsdDpSz+wQL5ZZ8pHrMLSJq7dqyIWYB4IOEDlB6kuxuo4QvWxU2X5hP3COIsH5KwoqhpvTOz0Hua0X+Iipw==", + "version": "2.17.5", + "resolved": "https://registry.npmjs.org/launchdarkly-js-client-sdk/-/launchdarkly-js-client-sdk-2.17.5.tgz", + "integrity": "sha512-ca6Dud0uD63GOh3ghIFzWi9IkRtAKsI29GWJNvL6TSrWH0Ez/IddAu6GqVK/6SSPOpNCOl+LjVxFIYtoDv4pLA==", "requires": { "escape-string-regexp": "^1.0.5", - "launchdarkly-js-sdk-common": "3.2.7" + "launchdarkly-js-sdk-common": "3.2.8" } }, "launchdarkly-js-sdk-common": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/launchdarkly-js-sdk-common/-/launchdarkly-js-sdk-common-3.2.7.tgz", - "integrity": "sha512-G6eGIPA/dEq5SaOzHx1Lg+utP6foPAlJxTlMuOl5toPyJLV88N1KY0/HiAHSp+bubPtJmqO7Th29srDBPzTNfw==", + "version": "3.2.8", + "resolved": "https://registry.npmjs.org/launchdarkly-js-sdk-common/-/launchdarkly-js-sdk-common-3.2.8.tgz", + "integrity": "sha512-inZVhqRPJcs9jIOeEHFb5LmNbemWMRx2jJY0VIQajKAaDymseGxx2XVfeZukTrNKyB5JBNVMYpTRvnawWuLJQw==", "requires": { "base64-js": "^1.3.0", "fast-deep-equal": "^2.0.1", @@ -13208,9 +13208,9 @@ } }, "sbc-common-components": { - "version": "2.1.27", - "resolved": "https://registry.npmjs.org/sbc-common-components/-/sbc-common-components-2.1.27.tgz", - "integrity": "sha512-8C8nhGNG7zXUbVBh6RDkee8yqlViVKsMhZPOfULhGgycbWAXUqaxNuz9wVvbGobbeBTRao68GR4+vWg1KkRD9w==", + "version": "2.1.28", + "resolved": "https://registry.npmjs.org/sbc-common-components/-/sbc-common-components-2.1.28.tgz", + "integrity": "sha512-h/h1En5vp0R0f+pZVCFd6OOu98RO7BeuHpdfjSWUacnYR/g3k2AfPYlp2qUVnGpsdVwQaZ4BpKPqiBcFGPpyOQ==", "requires": { "@mdi/font": "^4.5.95", "axios": "^0.18.0", diff --git a/auth-web/src/components/auth/EntityManagement.vue b/auth-web/src/components/auth/EntityManagement.vue index cd1a9225e2..fd4fa1f450 100644 --- a/auth-web/src/components/auth/EntityManagement.vue +++ b/auth-web/src/components/auth/EntityManagement.vue @@ -138,6 +138,9 @@ export default class EntityManagement extends Mixins(AccountChangeMixin, NextPag } private async mounted () { + if (this.currentMembership === undefined) { + this.$router.push(`/${Pages.CREATE_ACCOUNT}`) + } // If pending approval on current account, redirect away if (this.currentMembership?.membershipStatus !== MembershipStatus.Active) { this.$router.push(this.getNextPageUrl()) diff --git a/auth-web/src/util/constants.ts b/auth-web/src/util/constants.ts index 96a7e5d08a..2771472834 100644 --- a/auth-web/src/util/constants.ts +++ b/auth-web/src/util/constants.ts @@ -40,7 +40,8 @@ export enum Pages { USER_PROFILE_TERMS = 'userprofileterms', USER_PROFILE_TERMS_DECLINE = 'unauthorizedtermsdecline', HOME = 'home', - EDIT_ACCOUNT_TYPE= '/change-account' + EDIT_ACCOUNT_TYPE= '/change-account', + STAFF_DASHBOARD= 'searchbusiness' } export enum Account { diff --git a/auth-web/src/views/auth/HomeView.vue b/auth-web/src/views/auth/HomeView.vue index 4c0992d525..7f601e616e 100644 --- a/auth-web/src/views/auth/HomeView.vue +++ b/auth-web/src/views/auth/HomeView.vue @@ -261,6 +261,7 @@ export default class HomeView extends Vue { private noPasscodeDialog = false private accountDialog = false private isDirSearchUser: boolean = false + private isStaffUser: boolean = false private readonly resetCurrentOrganisation!: () => void private get showManageBusinessesBtn (): boolean { @@ -286,6 +287,10 @@ export default class HomeView extends Vue { mounted () { this.isDirSearchUser = (this.currentUser?.loginSource === LoginSource.BCROS) + this.isStaffUser = (this.currentUser?.loginSource === LoginSource.IDIR) + if (this.isStaffUser) { + this.$router.push(`/${Pages.STAFF_DASHBOARD}`) + } } }