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 Legal Name changes #575

Merged
merged 10 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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-dy4loprnwa-nn.a.run.app"
#VUE_APP_LEGAL_API_URL="https://legal-api-dev.apps.silver.devops.gov.bc.ca"
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This will need to be updated when merging to main branch.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@argush3 ^^

... Whatever we end up doing for the new Legal (Name) API URL ...

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
20 changes: 11 additions & 9 deletions devops/vaults.env
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="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"
# for Legal Name feature branch only:
VUE_APP_LEGAL_API_URL="op://API/$APP_ENV/legal-api/LEGAL_NAME_API_URL"
#VUE_APP_LEGAL_API_URL="op://API/$APP_ENV/legal-api/LEGAL_API_URL"
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This will need to be updated when merging to main branch.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@argush3 ^^

... Whatever we end up doing for the new Legal (Name) API URL ...

VUE_APP_LEGAL_API_VERSION_2="op://API/$APP_ENV/legal-api/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"
Expand All @@ -26,22 +28,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;"
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This will need to be updated when merging to main branch.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@argush3 ^^

(Need to remove connect-src *.run.app.)

},
{ "key": "Cache-Control", "value": "no-cache, no-store, must-revalidate"},
{ "key": "Pragma", "value": "no-cache"},
Expand Down
66 changes: 0 additions & 66 deletions nginx.conf
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved

This file was deleted.

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "business-create-ui",
"version": "5.5.5",
"version": "5.6.0",
"private": true,
"appName": "Create UI",
"sbcName": "SBC Common Components",
Expand Down
22 changes: 14 additions & 8 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
@Action(useStore) setLastAnnualReportDate!: (x: string) => void
@Action(useStore) setLastDirectorChangeDate!: (x: string) => void
@Action(useStore) setNameRequest!: (x: NameRequestIF) => void
@Action(useStore) setOperatingName!: (x: string) => void
@Action(useStore) setParties!: (x: Array<PartyIF>) => void
@Action(useStore) setResources!: (x: ResourceIF) => void
@Action(useStore) setUserAddress!: (x: AddressIF) => void
Expand Down Expand Up @@ -361,7 +362,7 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
readonly window = window

/** The Update Current JS Date timer id. */
private updateCurrentJsDateId = 0
private updateCurrentJsDateId = null as any // NodeJS.Timeout
Copy link
Collaborator Author

@severinbeauvais severinbeauvais Oct 4, 2023

Choose a reason for hiding this comment

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

Node complains that this variable is not a number (though I think it is a number in the browser) so I just typed it as any.

In browser:
image


/** The route breadcrumbs list. */
get breadcrumbs (): Array<BreadcrumbIF> {
Expand Down Expand Up @@ -810,7 +811,7 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
// NB: will throw if API error
let draftFiling = await LegalServices.fetchFirstTask(businessId)

this.setFilingType(draftFiling.header.name)
this.setFilingType(draftFiling.header.name as FilingTypes)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fixed warning because name is a string.


// check if filing is in a valid state to be edited
this.invalidFilingDialog = !this.hasValidFilingState(draftFiling)
Expand Down Expand Up @@ -866,7 +867,7 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
// NB: will throw if API error
let draftFiling = await LegalServices.fetchFirstOrOnlyFiling(tempId)

this.setFilingType(draftFiling.header.name)
this.setFilingType(draftFiling.header.name as FilingTypes)

// check if filing is in a valid state to be edited
this.invalidFilingDialog = !this.hasValidFilingState(draftFiling)
Expand Down Expand Up @@ -1158,16 +1159,21 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi

// FUTURE: change this to a single setter/object?
this.setAdminFreeze(business.adminFreeze)
this.setLegalName(business.legalName)
this.setEntityState(business.state)
{
// store operating name if it exists (only used for firms atm)
const alternateName = business.alternateNames?.find(x => x.identifier === business.identifier)
if (alternateName) this.setOperatingName(alternateName.operatingName)
}
this.setBusinessNumber(business.taxId || null) // may be empty
this.setBusinessStartDate(business.startDate)
this.setEntityState(business.state)
this.setGoodStanding(business.goodStanding)
this.setIdentifier(business.identifier)
this.setLastAnnualReportDate(business.lastAnnualReportDate) // may be empty
this.setLastAddressChangeDate(business.lastAddressChangeDate) // may be empty
this.setLastAnnualReportDate(business.lastAnnualReportDate) // may be empty
this.setLastDirectorChangeDate(business.lastDirectorChangeDate) // may be empty
this.setLegalName(business.legalName)
this.setWarnings(Array.isArray(business.warnings) ? business.warnings : [])
this.setGoodStanding(business.goodStanding)
this.setBusinessStartDate(business.startDate)
}

/** Fetches authorizations and verifies roles. */
Expand Down
17 changes: 11 additions & 6 deletions src/components/Dissolution/AssociationDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
sm="3"
class="pr-4"
>
<label>{{ entityLabel }}</label>
<label id="entity-label">{{ entityLabel }}</label>
</v-col>

<v-col
Expand All @@ -17,10 +17,15 @@
class="mt-n1"
>
<label id="company-name">{{ entityName }}</label>
<div class="my-1">
<div
id="entity-description"
class="my-1"
>
{{ entityDescription }}
</div>
<div>{{ getBusinessId }}</div>
<div id="business-id">
{{ getBusinessId }}
</div>
</v-col>
</v-row>
</article>
Expand All @@ -35,7 +40,7 @@
sm="3"
class="pr-4"
>
<label>{{ addressLabel }}</label>
<label id="address-label">{{ addressLabel }}</label>
</v-col>

<v-col
Expand Down Expand Up @@ -194,12 +199,12 @@ export default class AssociationDetails extends Mixins(CommonMixin, DateMixin) {

/** The entity name. */
get entityName (): string {
return this.getBusinessLegalName || GetCorpNumberedDescription(this.getEntityType)
return this.getBusinessLegalName || GetCorpNumberedDescription(this.getEntityType as any)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

There's a mismatch between CorpTypeCd in GetCorpNumberedDescription() and CorpTypeCd from getEntityType that I couldn't figure out quickly so I just typed it as any.

}

/** The entity description. */
get entityDescription (): string {
return GetCorpFullDescription(this.getEntityType)
return GetCorpFullDescription(this.getEntityType as any)
}

/** The business start date. */
Expand Down
4 changes: 2 additions & 2 deletions src/components/Dissolution/CompleteAffidavit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ export default class CompleteAffidavit extends Mixins(CommonMixin, DocumentMixin

/** The entity name. */
get entityName (): string {
return this.getBusinessLegalName || GetCorpNumberedDescription(this.getEntityType)
return this.getBusinessLegalName || GetCorpNumberedDescription(this.getEntityType as any)
}

get entityTitle (): string {
Expand Down Expand Up @@ -374,7 +374,7 @@ export default class CompleteAffidavit extends Mixins(CommonMixin, DocumentMixin
name: this.uploadAffidavitDoc.name,
lastModified: this.uploadAffidavitDoc.lastModified,
size: this.uploadAffidavitDoc.size
}
} as File
JazzarKarim marked this conversation as resolved.
Show resolved Hide resolved
this.setAffidavit({
...this.getAffidavitStep,
affidavitFile,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Incorporation/UploadRules.vue
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ export default class UploadRules extends Mixins(CommonMixin, DocumentMixin) {
name: this.uploadRulesDoc.name,
lastModified: this.uploadRulesDoc.lastModified,
size: this.uploadRulesDoc.size
}
} as File
this.setRules({
...this.getCreateRulesStep,
rulesFile,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Restoration/BusinessName.vue
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export default class BusinessName extends Mixins(CommonMixin, DateMixin, NameReq
// Global actions
@Action(useStore) setBusinessNameValid!: (x: boolean) => void
@Action(useStore) setCorrectNameOption!: (x: CorrectNameOptions) => void
@Action(useStore) setNameRequest!: (x: string) => void
@Action(useStore) setNameRequest!: (x: NameRequestIF) => void
JazzarKarim marked this conversation as resolved.
Show resolved Hide resolved
@Action(useStore) setNameRequestApprovedName!: (x: string) => void

// Local variable
Expand Down
6 changes: 3 additions & 3 deletions src/components/common/EntityInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export default class EntityInfo extends Mixins(DateMixin) {

/** The entity legal name (old name, new name, or numbered description). */
get entityLegalName (): string {
const numberedDescription = GetCorpNumberedDescription(this.getEntityType)
const numberedDescription = GetCorpNumberedDescription(this.getEntityType as any)

// name comes from different places depending on filing type
switch (this.getFilingType) {
Expand All @@ -142,9 +142,9 @@ export default class EntityInfo extends Mixins(DateMixin) {
return '' // should never happen
}

/** The entity description. */
/** The entity description. */
get entityDescription (): string {
const corpTypeDescription = GetCorpFullDescription(this.getEntityType)
const corpTypeDescription = GetCorpFullDescription(this.getEntityType as any)

if (this.isTypeSoleProp && this.getTempId) {
return `${corpTypeDescription} / Doing Business As (DBA)`
Expand Down
2 changes: 2 additions & 0 deletions src/interfaces/store-interfaces/state-interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export interface StateModelIF {
dissolution: DissolutionStateIF
nameRequest: NameRequestIF
nameRequestApprovedName: string
operatingName: string
correctNameOption: CorrectNameOptions
nameTranslations: NameTranslationIF[]
nameTranslationsValid: boolean
Expand Down Expand Up @@ -76,6 +77,7 @@ export interface StateModelIF {
staffPaymentStep: StaffPaymentStepIF
courtOrderStep: CourtOrderStepIF

// to calculate if this is a mobile screen
windowWidth: number
}

Expand Down
Loading