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

19034 rebase legal name branch #615

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
208d19a
17347 - Move COA and COD corrections for COOPS into the generic corre…
seeker25 Oct 16, 2023
3f71127
17347 - Add in isCoop check for resume button. (#550)
seeker25 Oct 16, 2023
4ba88d2
18027 AGM Location change (#551)
ketaki-deodhar Oct 20, 2023
8cc0025
AGM Location Change First PR (#553)
JazzarKarim Oct 23, 2023
41653b7
AGM Location Change second PR (#554)
JazzarKarim Oct 24, 2023
5ddb97b
AGM Location Change Third PR (#555)
JazzarKarim Oct 25, 2023
dad3a3e
AGM Location Change 4th and final PR (#556)
JazzarKarim Oct 30, 2023
21b927d
AGM Location Change 5th PR for styling issues (#559)
JazzarKarim Nov 2, 2023
f9c0bb9
18024 Incremental AGM extension work (#558)
severinbeauvais Nov 2, 2023
a201be5
Make Certify block non-editable if non-staff user (AGM Filings) (#564)
JazzarKarim Nov 2, 2023
72932ef
feat: digital business card (#566)
amanji Nov 3, 2023
01128ba
18161 Updated in response to UXA notes (#567)
JazzarKarim Nov 3, 2023
b9f2404
16733 undefined placeholder for federal (#569)
jamespaologarcia Nov 7, 2023
802a7b7
18024 Incremental AGM Extension changes (#568)
severinbeauvais Nov 7, 2023
c47cce4
18272 Add unit test for AboutTheBusiness component (#570)
leodube-aot Nov 8, 2023
3fee14a
17917 Added placeholder for null values (#572)
jamespaologarcia Nov 8, 2023
2cb369d
18024 Incremental AGM Extension changes (#571)
severinbeauvais Nov 9, 2023
991add2
feat: digital credentials detailed instructions (#575)
amanji Nov 9, 2023
0b936a4
18513 Fixed jerky expandable help transition (#576)
severinbeauvais Nov 9, 2023
57c5eff
Extension Request Scenario 1 (#577)
JazzarKarim Nov 10, 2023
6cf8c87
18369 agm extension evaluation (#573)
PaulGarewal Nov 14, 2023
898d28c
17159 Update fetchNameRequest (#579)
kzdev420 Nov 14, 2023
039d828
18273 Extension Request Scenario 2 (#580)
leodube-aot Nov 14, 2023
88a37fc
18469 Capitalize AGM in output titles (#581)
severinbeauvais Nov 15, 2023
0c85638
18274 Updated To Do List and Recent Filing History (#584)
severinbeauvais Nov 15, 2023
7a0c7c4
Update FilingHistoryList1.spec.ts
severinbeauvais Nov 16, 2023
812bf56
18369 changed the duration of extension messages in accordance with U…
PaulGarewal Nov 16, 2023
67e6031
18204 disable restore based on ff (#583)
jamespaologarcia Nov 16, 2023
71a04be
chore: update content and images (#586)
amanji Nov 17, 2023
7b929e3
fix: DBC feature should be available for historical companies (#587)
amanji Nov 20, 2023
df647c4
18273+18558 Extension Request Cleanup and Tests (#585)
leodube-aot Nov 22, 2023
7190694
18024 - Fixed AGM Extensions in TODO List (#591)
JazzarKarim Nov 23, 2023
fa82ab9
18273+18558 Update Extension Request component UI (#592)
leodube-aot Nov 24, 2023
fade7ac
18534 Changes to support amalgamation applications (#590)
severinbeauvais Nov 28, 2023
31f390b
18024 Finish AGM Extension UI implementation (#594)
leodube-aot Nov 28, 2023
bd33a82
feat: digital credentials gate (#595)
amanji Nov 29, 2023
d856738
18534 Amalg unit tests + small fixes + more typing (#596)
severinbeauvais Dec 1, 2023
01fd5c0
feat: digital credentials TOU (#597)
amanji Dec 4, 2023
25a623d
18782 fix error in wrong agm due date (#598)
tshyun24 Dec 11, 2023
3276960
17869 - Adding CFS account number BUSINESS-FILINGS-UI (#565)
AbrahamRostampoor Dec 11, 2023
6a982a7
18833 agm ext calc (#599)
jamespaologarcia Dec 15, 2023
f09daf4
18805+18979 Amalgamate Button + Moved to amalgamationApplication + Se…
JazzarKarim Dec 18, 2023
a0a77eb
Create draft amalgamation + redirect + misc. fixes/updates (#601)
JazzarKarim Dec 20, 2023
74afd2c
Updated Amalgamation Selection in response to UXA notes (#602)
JazzarKarim Dec 20, 2023
ccf0188
19005 Implemented historical - amalgamation reason text (#604)
severinbeauvais Jan 4, 2024
d12a12c
16967 Admin Freeze should not show on ledger (#603)
kzdev420 Jan 4, 2024
5f2d2b4
Update filingHistoryListStore.ts
severinbeauvais Jan 5, 2024
e114d81
16967 Set missing `displayLedger` property for draft apps (#605)
severinbeauvais Jan 8, 2024
5091888
19190 Fixed "return to MBR" issues (#607)
severinbeauvais Jan 12, 2024
e069567
19291 Implemented "future effective amalgamation" alert (#608)
severinbeauvais Jan 16, 2024
8caf1da
Added amalgamation FF check (#610)
JazzarKarim Jan 16, 2024
9d6274f
19209 Pre-populate TING business + error handling (#609)
severinbeauvais Jan 17, 2024
a0ffb88
19204 Fixed whitespace between sub-title and body (#612)
severinbeauvais Jan 18, 2024
6bf38e1
Bump vite from 4.3.9 to 4.5.2 (#613)
dependabot[bot] Jan 20, 2024
00872a5
major upgrade to package version
JazzarKarim Jan 27, 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
22 changes: 22 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
{
"name": "Node.js & TypeScript",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/typescript-node:1-20-bullseye"

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "yarn install",

// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
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' https://*.run.app *.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' https://*.run.app *.gov.bc.ca wss://*.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;"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this file, it was different between main and the feature branch. I went ahead and combined both:

"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 wss://*.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;"

https://github.com/bcgov/business-filings-ui/blob/feature-legal-name/firebase.json#L23

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, the legal name branch version includes "https://*.run.app" so it can talk to the legal name Legal API. We'll be able to remove that ultimately.

The main branch version probably included some digital business card stuff?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I don't see anything specific for digital business card. The header now is exactly like main with the addition of https://*.run.app.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, perfect.

},
{ "key": "Cache-Control", "value": "no-cache, no-store, must-revalidate"},
{ "key": "Pragma", "value": "no-cache"},
Expand Down
2,978 changes: 1,033 additions & 1,945 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 11 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "business-filings-ui",
"version": "6.10.0",
"version": "8.0.0",
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
"private": true,
"appName": "Filings UI",
"sbcName": "SBC Common Components",
Expand All @@ -14,20 +14,22 @@
},
"dependencies": {
"@babel/compat-data": "^7.21.5",
"@bcrs-shared-components/base-address": "2.0.7",
"@bcrs-shared-components/base-address": "2.0.9",
"@bcrs-shared-components/breadcrumb": "2.1.11",
"@bcrs-shared-components/confirm-dialog": "1.2.1",
"@bcrs-shared-components/corp-type-module": "1.0.11",
"@bcrs-shared-components/corp-type-module": "1.0.14",
"@bcrs-shared-components/court-order-poa": "2.1.4",
"@bcrs-shared-components/date-picker": "1.2.39",
"@bcrs-shared-components/document-delivery": "1.2.1",
"@bcrs-shared-components/enums": "1.0.50",
"@bcrs-shared-components/expandable-help": "^1.0.0",
"@bcrs-shared-components/enums": "1.1.4",
"@bcrs-shared-components/expandable-help": "1.0.1",
"@bcrs-shared-components/folio-number-input": "1.1.18",
"@bcrs-shared-components/interfaces": "1.0.75",
"@bcrs-shared-components/mixins": "1.1.25",
"@bcrs-shared-components/interfaces": "1.1.2",
"@bcrs-shared-components/mixins": "1.1.30",
"@bcrs-shared-components/staff-comments": "1.3.11",
"@bcrs-shared-components/staff-payment": "2.1.11",
"@mdi/font": "^5.9.55",
"@reactivex/rxjs": "^6.6.7",
"@sentry/integrations": "^7.50.0",
"@sentry/vue": "^7.50.0",
"axios": "^0.27.2",
Expand All @@ -44,6 +46,7 @@
"qrcode.vue": "1.7.0",
"regenerator-runtime": "^0.13.11",
"register-service-worker": "^1.7.2",
"rxjs": "^7.8.1",
"sbc-common-components": "3.0.8",
"vue": "2.7.14",
"vue-affix": "^0.5.2",
Expand Down Expand Up @@ -76,7 +79,7 @@
"sass": "^1.55.0",
"sinon": "^14.0.2",
"typescript": "4.5.5",
"vite": "4.3.9",
"vite": "4.5.2",
"vite-plugin-environment": "^1.1.3",
"vitest": "0.33.0",
"vue-class-component": "^7.2.6",
Expand Down
Loading
Loading