Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

15601 Merge Legal Name branch into main branch #579

Draft
wants to merge 99 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
4c1dbb5
15601 Legal Name changes (#575)
severinbeauvais Oct 10, 2023
54373b3
Update store.ts
severinbeauvais Oct 10, 2023
3fc7cca
Add new site for legal name.
pwei1018 Nov 2, 2023
207c90e
Update github action.
pwei1018 Nov 2, 2023
a5248f7
19034 Rebasing legal name feature branch (#637)
JazzarKarim Jan 26, 2024
1b025b3
updated env file for legal name gcp (#652)
JazzarKarim Feb 9, 2024
a30d1d5
18102 (#576)
chenhongjing Oct 12, 2023
718e3e4
Fixed Dissolution Date bug (#577)
JazzarKarim Oct 18, 2023
5945ff2
17160 Update fetchNr with phone and email validation (#578)
kzdev420 Nov 3, 2023
a7a7113
18536 Fixed lint warnings before further development (#581)
severinbeauvais Nov 16, 2023
1cf4634
18449 - GP/SP registration modify (#582)
tshyun24 Nov 20, 2023
e269132
- app version = 5.6.2 (#583)
severinbeauvais Nov 21, 2023
37dc844
18625 Fix validate nr func (#584)
kzdev420 Nov 22, 2023
7aeb453
18535 - Add Amalgamating Businesses Part 1 (#585)
JazzarKarim Dec 4, 2023
9a29f58
18640 Amalgamating business table (initial) (#586)
severinbeauvais Dec 4, 2023
f02baac
18640 Amalgamating businesses structure + validations + etc (#587)
severinbeauvais Dec 5, 2023
afa2a0e
18640 More amalgamating business table work (#589)
severinbeauvais Dec 5, 2023
6122a37
18535 Amalgamating Businesses Part 1 Continuation (#588)
JazzarKarim Dec 6, 2023
d949e22
18535 - Save and Resume Draft Amalgamation (#592)
JazzarKarim Dec 7, 2023
21e1113
18538 Resulting Business Name and Type component (WIP) (#591)
jamespaologarcia Dec 7, 2023
9e2fb3d
18640 Incremental amalgamating businesses validations, etc (#590)
severinbeauvais Dec 11, 2023
54186b9
18640 More amalgamating fetch / validations work (#593)
severinbeauvais Dec 12, 2023
ee544d1
18971 Finished some TODOs and incremental work on amalgamating busine…
severinbeauvais Dec 13, 2023
54eb91e
18960 - Re-fetch businesses information when loading draft (#594)
JazzarKarim Dec 13, 2023
349f91d
18722 Add ForeignBusiness component for amalgamating businesses (#595)
leodube-aot Dec 14, 2023
4e40583
18971 Updated TING validations (#597)
severinbeauvais Dec 15, 2023
c595237
18788 Updated amalgamation -> amalgamationApplication + business name…
severinbeauvais Dec 18, 2023
08b1f7c
18546 - add Folio Number to Review and Confirm step (#601)
ketaki-deodhar Dec 19, 2023
f60ee98
18847-update certify text for amalgamations (#603)
ketaki-deodhar Dec 20, 2023
489023b
18722 - Update foreign business validation rules (#602)
leodube-aot Dec 20, 2023
608997a
18848 - add court order / POA component on review page (#604)
ketaki-deodhar Dec 21, 2023
f7fde54
- app version = 5.6.19 (#600)
severinbeauvais Dec 27, 2023
cab33e1
19019 Add extra-pro A TING companies (#605)
JazzarKarim Dec 28, 2023
e7e8c01
- app version = 5.6.21 (#606)
severinbeauvais Jan 2, 2024
1986435
- app version = 5.6.22 (#607)
severinbeauvais Jan 2, 2024
79d2c5e
- app version = 5.6.23 (#610)
severinbeauvais Jan 3, 2024
442831a
- app version = 5.6.24 (#611)
severinbeauvais Jan 3, 2024
e1cbaa6
fix unit test (#612)
kzdev420 Jan 5, 2024
e3d3d29
18749 - add amalgamation statement to review (#609)
tshyun24 Jan 5, 2024
2dbc4cd
Final Framework Changes/Fixes for Regular Amalgamation (#608)
JazzarKarim Jan 8, 2024
3e7c678
18749 - fix bug in reopen draft amalgamation file (#613)
tshyun24 Jan 8, 2024
86fd2d5
- app version = 5.6.28 (#615)
severinbeauvais Jan 8, 2024
be19f39
18689 More Amalgamation fixes/updates (#614)
JazzarKarim Jan 9, 2024
afad241
add account id header (#616)
vysakh-menon-aot Jan 9, 2024
3cac679
Fixed bug with certify if submitting the amalgamation failed (#617)
JazzarKarim Jan 10, 2024
a643e03
18641 More unit tests (#618)
severinbeauvais Jan 10, 2024
9638bc3
- app version = 5.6.33 (#619)
severinbeauvais Jan 10, 2024
98de533
- app version = 5.6.34 (#620)
severinbeauvais Jan 11, 2024
aa5d54d
- app version = 5.6.35 (#621)
severinbeauvais Jan 12, 2024
de5e408
19050 Changed pending dissolution check to pending filing check (#622)
severinbeauvais Jan 12, 2024
0076fae
19201+19275+19216 More Amalgamation Fixes (#623)
JazzarKarim Jan 15, 2024
9590666
Amalgamation stepper fix (#624)
JazzarKarim Jan 16, 2024
a1cae5c
- app version = 5.6.39 (#625)
severinbeauvais Jan 16, 2024
be3e120
19179 Added Amalgamating Businesses unit tests (#626)
severinbeauvais Jan 17, 2024
6412b0f
- app version = 5.6.41 (#627)
severinbeauvais Jan 19, 2024
c3c9a0d
- app version = 5.6.42 (#629)
severinbeauvais Jan 19, 2024
34e838c
Bump vite from 4.3.9 to 4.5.2 (#631)
dependabot[bot] Jan 20, 2024
aca328c
19359 - Amalgamating Businesses Table must have more than 1 (#628)
JazzarKarim Jan 22, 2024
77933d5
19040 Framework for short-form amalgamations (#630)
severinbeauvais Jan 24, 2024
8c352dc
- app version = 5.7.1 (#634)
severinbeauvais Jan 25, 2024
085b659
Implemented the Continuation In Framework (#633)
JazzarKarim Jan 25, 2024
928ec8c
19036 Added "must include" checklist + refactored validation (#635)
severinbeauvais Jan 26, 2024
5419984
- app version = 5.8.2 (#638)
severinbeauvais Jan 26, 2024
0166e64
- app version = 5.8.3 (#639)
severinbeauvais Jan 29, 2024
25ec3ef
Update Information.vue
severinbeauvais Jan 29, 2024
6fca167
19037 Added processing for new holding/primary company (#640)
severinbeauvais Feb 1, 2024
edadfd6
- app version = 5.8.5 (#643)
severinbeauvais Feb 1, 2024
e171c80
19561 corpNumber to identifier in foreign amalgamating business (#644)
vysakh-menon-aot Feb 2, 2024
c2fdc32
19629 Update legal type when adopting a business' name or new NR (#645)
severinbeauvais Feb 2, 2024
bc257cf
Initial commit - Updated to follow uxpin
jamespaologarcia Jan 31, 2024
a6520d2
Updated - Added legal name in draft
jamespaologarcia Feb 1, 2024
091c223
Rebased
jamespaologarcia Feb 2, 2024
21e07d4
Updated code based on recent changes
jamespaologarcia Feb 2, 2024
6272ad1
Updated to set correctamloptions and resulting business name on the i…
jamespaologarcia Feb 5, 2024
8d23945
19041 Finished validations + updated certify statements + updated uni…
severinbeauvais Feb 6, 2024
b442817
19041 Created constants (enum) for resource phrases (#647)
severinbeauvais Feb 6, 2024
1a39467
- app version = 5.8.10 (#649)
severinbeauvais Feb 7, 2024
16c0c9b
- app version = 5.8.11 (#651)
severinbeauvais Feb 8, 2024
6f173ec
19458 - do not show/edit directors (#648)
ketaki-deodhar Feb 9, 2024
f5b2fab
- app version = 5.8.13 (#653)
severinbeauvais Feb 12, 2024
1cb39e5
- app version = 5.8.14 (#654)
severinbeauvais Feb 13, 2024
69c4f4d
19698 Added Account-Id to auth api call + check for null auth info + …
severinbeauvais Feb 13, 2024
9bc087f
- app version = 5.9.1 (#656)
severinbeauvais Feb 14, 2024
1b5b76c
19044 - Amalgamation unit tests (#655)
ketaki-deodhar Feb 14, 2024
8fcab9d
19750 Fixed error handling (#657)
severinbeauvais Feb 15, 2024
06eb5cf
- app version = 5.9.3 (#658)
severinbeauvais Feb 15, 2024
09cdae2
19756 Small change so prepopulated data overrides legal name (#659)
severinbeauvais Feb 16, 2024
2df3050
19874 Changed some snackbar messages to dialogs (#660)
severinbeauvais Feb 20, 2024
363bcc5
- app version = 5.9.6 (#661)
severinbeauvais Feb 20, 2024
eba44ea
- app version = 5.9.7 (#663)
severinbeauvais Feb 21, 2024
a30974e
- app version = 5.9.8 (#664)
severinbeauvais Feb 21, 2024
2073a23
Update main.ts
severinbeauvais Feb 22, 2024
be90f00
Update BreadcrumbResource.ts
severinbeauvais Feb 22, 2024
f2b37a4
Fixed rebase issues part 1
JazzarKarim Feb 23, 2024
b134c6b
fixed rebase issues 2
JazzarKarim Feb 23, 2024
3f10fc3
Merge pull request #665 from JazzarKarim/18123-rebasing-legalname-2
JazzarKarim Feb 26, 2024
0c685fd
20247 Fixed GCP UI Redirection (#667)
JazzarKarim Mar 8, 2024
c6dc782
- updated NAICS URL in example env file (#669)
severinbeauvais Mar 22, 2024
76f829f
20148 Updated to accommodate alternate name changes (#671)
JazzarKarim Apr 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
# Base Path Openshift: /businesses/create Firebase: /
VUE_APP_PATH="/"

#vaults Shared
# vaults Shared
VUE_APP_ADDRESS_COMPLETE_KEY=

#vaults web-url
# vaults web-url
VUE_APP_REGISTRY_HOME_URL="https://dev.bcregistry.gov.bc.ca/"
VUE_APP_AUTH_WEB_URL="https://dev.account.bcregistry.gov.bc.ca/"
VUE_APP_BUSINESSES_URL="https://dev.account.bcregistry.gov.bc.ca/"
VUE_APP_DASHBOARD_URL="https://dev.business.bcregistry.gov.bc.ca/"
VUE_APP_SITEMINDER_LOGOUT_URL="https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi"

#vaults API
# vaults API
VUE_APP_AUTH_API_URL="https://auth-api-dev.apps.silver.devops.gov.bc.ca"
VUE_APP_AUTH_API_VERSION="/api/v1"
VUE_APP_LEGAL_API_URL="https://legal-api-dev.apps.silver.devops.gov.bc.ca"
# for Legal Name feature branch only:
VUE_APP_LEGAL_API_URL="https://business-api-dev-dy4loprnwa-nn.a.run.app"
#VUE_APP_LEGAL_API_URL="https://legal-api-dev.apps.silver.devops.gov.bc.ca"
VUE_APP_LEGAL_API_VERSION_2="/api/v2"
VUE_APP_NAICS_API_URL="https://legal-api-dev.apps.silver.devops.gov.bc.ca"
VUE_APP_NAICS_API_VERSION_2="/api/v2"
Expand All @@ -26,22 +28,22 @@ VUE_APP_REGISTRIES_SEARCH_API_URL="https://bcregistry-dev.apigee.net/registry-se
VUE_APP_REGISTRIES_SEARCH_API_VERSION="/api/v1"
VUE_APP_REGISTRIES_SEARCH_API_KEY=

#vaults launchdarkly
# vaults launchdarkly
VUE_APP_BUSINESS_CREATE_LD_CLIENT_ID="642af8daefad6f134479c602"

#vaults keycloak
# vaults keycloak
VUE_APP_KEYCLOAK_AUTH_URL="https://dev.loginproxy.gov.bc.ca/auth"
VUE_APP_KEYCLOAK_REALM="bcregistry"
VUE_APP_KEYCLOAK_CLIENTID="entity-web"

#vaults sentry
# vaults sentry
VUE_APP_SENTRY_DSN=

#vaults hotjar
# vaults hotjar
VUE_APP_HOTJAR_ID=
VUE_APP_IA_SURVEY_ID=

#vaults webchat
# vaults webchat
VUE_APP_GENESYS_ENV=
VUE_APP_GENESYS_URL=
VUE_APP_GENESYS_ID=
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: BUSINESS CREATE UI CD
name: BUSINESS CREATE UI CD - legal name

on:
push:
branches:
- main
- feature-legal-name
workflow_dispatch:
inputs:
environment:
Expand All @@ -27,6 +27,6 @@ jobs:
environment: ${{ inputs.environment }}
tagname: ${{ inputs.tagname }}
secrets:
APP_NAME: "business-create"
APP_NAME: "business-create-le"
OP_CONNECT_URL: ${{ secrets.OP_CONNECT_URL }}
OP_CONNECT_TOKEN: ${{ secrets.OP_CONNECT_TOKEN }}
20 changes: 10 additions & 10 deletions devops/vaults.env
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# Base Path Openshift: /businesses/create Firebase:
VUE_APP_PATH="/"

#vaults Shared
# vaults Shared
VUE_APP_ADDRESS_COMPLETE_KEY="op://canadapost/$APP_ENV/address-key/ADDRESS_COMPLETE_KEY"

#vaults web-url
# vaults web-url
VUE_APP_REGISTRY_HOME_URL="op://web-url/$APP_ENV/registry/REGISTRY_HOME_URL"
VUE_APP_AUTH_WEB_URL="op://web-url/$APP_ENV/auth-web/AUTH_WEB_URL"
VUE_APP_BUSINESSES_URL="op://web-url/$APP_ENV/business/BUSINESSES_URL"
VUE_APP_DASHBOARD_URL="op://web-url/$APP_ENV/business/DASHBOARD_URL"
VUE_APP_SITEMINDER_LOGOUT_URL="op://web-url/$APP_ENV/siteminder/SITEMINDER_LOGOUT_URL"

#vaults API
# vaults API
VUE_APP_AUTH_API_URL="op://API/$APP_ENV/auth-api/AUTH_API_URL"
VUE_APP_AUTH_API_VERSION="op://API/$APP_ENV/auth-api/AUTH_API_VERSION"
VUE_APP_LEGAL_API_URL="op://API/$APP_ENV/legal-api/LEGAL_API_URL"
VUE_APP_LEGAL_API_VERSION_2="op://API/$APP_ENV/legal-api/LEGAL_API_VERSION_2"
VUE_APP_LEGAL_API_URL="op://API/$APP_ENV/legal-api-le/LEGAL_API_URL"
VUE_APP_LEGAL_API_VERSION_2="op://API/$APP_ENV/legal-api-le/LEGAL_API_VERSION_2"
VUE_APP_NAICS_API_URL="op://API/$APP_ENV/naics-api/NAICS_API_URL"
VUE_APP_NAICS_API_VERSION_2="op://API/$APP_ENV/naics-api/NAICS_API_VERSION"
VUE_APP_STATUS_API_URL="op://API/$APP_ENV/status-api/STATUS_API_URL"
Expand All @@ -26,22 +26,22 @@ VUE_APP_REGISTRIES_SEARCH_API_URL="op://API/$APP_ENV/registries-search-api/REGIS
VUE_APP_REGISTRIES_SEARCH_API_VERSION="op://API/$APP_ENV/registries-search-api/REGISTRIES_SEARCH_API_VERSION"
VUE_APP_REGISTRIES_SEARCH_API_KEY="op://API/$APP_ENV/registries-search-api/REGISTRIES_SEARCH_API_KEY"

#vaults launchdarkly
# vaults launchdarkly
VUE_APP_BUSINESS_CREATE_LD_CLIENT_ID="op://launchdarkly/$APP_ENV/business-create/BUSINESS_CREATE_LD_CLIENT_ID"

#vaults keycloak
# vaults keycloak
VUE_APP_KEYCLOAK_AUTH_URL="op://keycloak/$APP_ENV/base/KEYCLOAK_AUTH_BASE_URL"
VUE_APP_KEYCLOAK_REALM="op://keycloak/$APP_ENV/base/KEYCLOAK_REALMNAME"
VUE_APP_KEYCLOAK_CLIENTID="op://keycloak/$APP_ENV/entity-web/UI_KEYCLOAK_RESOURCE_NAME"

#vaults sentry
# vaults sentry
VUE_APP_SENTRY_DSN="op://sentry/$APP_ENV/entity/SENTRY_DSN"

#vaults hotjar (hotjar id - ready to use)
# vaults hotjar (hotjar id - ready to use)
VUE_APP_HOTJAR_ID=
VUE_APP_IA_SURVEY_ID="op://hotjar/$APP_ENV/shared/IA_SURVEY_ID"

#vaults webchat
# vaults webchat
VUE_APP_GENESYS_ENV="op://webchat/$APP_ENV/base/GENESYS_ENV"
VUE_APP_GENESYS_URL="op://webchat/$APP_ENV/base/GENESYS_URL"
VUE_APP_GENESYS_ID="op://webchat/$APP_ENV/business-create-ui/GENESYS_ID"
Expand Down
2 changes: 1 addition & 1 deletion firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
{ "key" : "X-XSS-Protection", "value" : "1; mode=block" },
{
"key": "Content-Security-Policy",
"value": "default-src 'self'; frame-src 'self' *.gov.bc.ca *.hotjar.com *.googleapis.com https://*.nr-data.net https://*.newrelic.com https://*.cac1.pure.cloud; script-src 'self' 'unsafe-eval' 'unsafe-inline' *.gov.bc.ca *.hotjar.com *.googleapis.com https://*.nr-data.net https://*.newrelic.com https://*.cac1.pure.cloud; style-src 'self' 'unsafe-inline' *.cloudflare.com *.googleapis.com; font-src 'self' *.gov.bc.ca *.hotjar.com *.cloudflare.com *.googleapis.com *.gstatic.com *.jsdelivr.net; img-src 'self' data: *.hotjar.com https://*.cac1.pure.cloud; connect-src 'self' *.gov.bc.ca *.launchdarkly.com *.hotjar.com *.postescanada-canadapost.ca *.sentry.io *.apigee.net wss://*.hotjar.com *.hotjar.io https://*.nr-data.net https://shyrka-prod-cac1.s3.ca-central-1.amazonaws.com https://*.newrelic.com https://*.cac1.pure.cloud wss://*.cac1.pure.cloud; manifest-src 'self'; media-src 'self' https://*.cac1.pure.cloud; object-src 'self' https://*.cac1.pure.cloud; child-src 'self' https://*.cac1.pure.cloud;"
"value": "default-src 'self'; frame-src 'self' *.gov.bc.ca *.hotjar.com *.googleapis.com https://*.nr-data.net https://*.newrelic.com https://*.cac1.pure.cloud; script-src 'self' 'unsafe-eval' 'unsafe-inline' *.gov.bc.ca *.hotjar.com *.googleapis.com https://*.nr-data.net https://*.newrelic.com https://*.cac1.pure.cloud; style-src 'self' 'unsafe-inline' *.cloudflare.com *.googleapis.com; font-src 'self' *.gov.bc.ca *.hotjar.com *.cloudflare.com *.googleapis.com *.gstatic.com *.jsdelivr.net; img-src 'self' data: *.hotjar.com https://*.cac1.pure.cloud; connect-src 'self' *.gov.bc.ca *.run.app *.launchdarkly.com *.hotjar.com *.postescanada-canadapost.ca *.sentry.io *.apigee.net wss://*.hotjar.com *.hotjar.io https://*.nr-data.net https://shyrka-prod-cac1.s3.ca-central-1.amazonaws.com https://*.newrelic.com https://*.cac1.pure.cloud wss://*.cac1.pure.cloud; manifest-src 'self'; media-src 'self' https://*.cac1.pure.cloud; object-src 'self' https://*.cac1.pure.cloud; child-src 'self' https://*.cac1.pure.cloud;"
},
{ "key": "Cache-Control", "value": "no-cache, no-store, must-revalidate"},
{ "key": "Pragma", "value": "no-cache"},
Expand Down
Loading
Loading