Skip to content

Commit 2bc1659

Browse files
severinbeauvaisSeverin Beauvais
andauthored
30381 cleaned up some env keys and fixed breadcrumbs (#843)
* - deleted obsolete key VUE_APP_BUSINESSES_URL - app = 5.5.46 - fixed Business Registry URL in Affiliation Error Modal - fixed Staff Dashboard breadcrumb * - updated browserslist --------- Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>
1 parent dc7b528 commit 2bc1659

7 files changed

Lines changed: 293 additions & 159 deletions

File tree

app/.env.example

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ VUE_APP_PATH="/"
33
#vaults web-url
44
VUE_APP_REGISTRY_HOME_URL="https://dev.bcregistry.gov.bc.ca/"
55
VUE_APP_AUTH_WEB_URL="https://dev.account.bcregistry.gov.bc.ca/"
6-
VUE_APP_BUSINESSES_URL="https://dev.account.bcregistry.gov.bc.ca/"
76
VUE_APP_CORPORATE_ONLINE_URL="https://www.corporateonline.gov.bc.ca"
87
VUE_APP_BUSINESS_DASH_URL="https://dev.business-dashboard.bcregistry.gov.bc.ca/"
98
VUE_APP_BUSINESS_REGISTRY_URL="https://dev.business-registry-dashboard.bcregistry.gov.bc.ca/"

app/devops/vaults.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ VUE_APP_PATH=/
44
#vaults web-url
55
VUE_APP_REGISTRY_HOME_URL="op://web-url/$APP_ENV/registry/REGISTRY_HOME_URL"
66
VUE_APP_AUTH_WEB_URL="op://web-url/$APP_ENV/auth-web/AUTH_WEB_URL"
7-
VUE_APP_BUSINESSES_URL="op://web-url/$APP_ENV/business/BUSINESSES_URL"
87
VUE_APP_CORPORATE_ONLINE_URL="op://web-url/$APP_ENV/bcregistry/COLIN_URL"
98
VUE_APP_BUSINESS_DASH_URL="op://web-url/$APP_ENV/business-dash/BUSINESS_DASH_URL"
109
VUE_APP_BUSINESS_REGISTRY_URL="op://web-url/$APP_ENV/business-registry-ui/BUSINESS_REGISTRY_URL"

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "name-request",
3-
"version": "5.5.45",
3+
"version": "5.5.46",
44
"private": true,
55
"appName": "Name Request UI",
66
"sbcName": "SBC Common Components",

app/pnpm-lock.yaml

Lines changed: 287 additions & 148 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/components/dialogs/affiliation-error.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ export default class AffiliationErrorDialog extends Vue {
9292
}
9393
9494
get businessRegistryUrl (): string {
95-
const businessesUrl = sessionStorage.getItem('BUSINESSES_URL')
95+
const businessesUrl = sessionStorage.getItem('BUSINESS_REGISTRY_URL')
9696
// NB: fall back is user's default account
9797
const accountId = JSON.parse(sessionStorage.getItem('CURRENT_ACCOUNT')).id || 0
98-
return `${businessesUrl}account/${accountId}/business`
98+
return `${businessesUrl}account/${accountId}`
9999
}
100100
101101
protected hideModal (): void {

app/src/plugins/getConfig.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@ export async function getConfig (): Promise<EnvConfigI> {
66
// get config from environment
77
const windowLocationOrigin = window.location.origin
88

9-
if (!{ appBaseURL } || !windowLocationOrigin) {
9+
if (!appBaseURL || !windowLocationOrigin) {
1010
return Promise.reject(new Error('Missing environment variables'))
1111
}
1212
axios.defaults.baseURL = appBaseURL
1313

1414
const paymentPortalUrl: string = process.env.VUE_APP_PAYMENT_PORTAL_URL
1515
sessionStorage.setItem('PAYMENT_PORTAL_URL', paymentPortalUrl)
1616

17-
const businessesUrl: string = process.env.VUE_APP_BUSINESSES_URL
18-
sessionStorage.setItem('BUSINESSES_URL', businessesUrl)
19-
2017
const corporateOnlineUrl: string = process.env.VUE_APP_CORPORATE_ONLINE_URL
2118
sessionStorage.setItem('CORPORATE_ONLINE_URL', corporateOnlineUrl)
2219

app/src/resources/breadcrumb-resources.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ export function getRegistryHomeBreadcrumb (): BreadcrumbIF {
2323
}
2424

2525
export function getStaffDashboardBreadcrumb (): BreadcrumbIF {
26-
const businessUrl = sessionStorage.getItem('BUSINESSES_URL')
26+
const businessUrl = sessionStorage.getItem('AUTH_WEB_URL')
2727
return {
2828
text: 'Staff Dashboard',
29-
href: `${businessUrl}staff/${getParams()}`
29+
href: `${businessUrl}staff/dashboard/active${getParams()}`
3030
}
3131
}

0 commit comments

Comments
 (0)