Skip to content

Commit

Permalink
- app version = 5.5.9
Browse files Browse the repository at this point in the history
- added pnpm install instruction to README
- update app title in README
- updated browserslist (caniuse)
- changed "Continue In Now" to "Begin Continuation"
  • Loading branch information
Severin Beauvais committed Oct 16, 2024
1 parent e5d74b9 commit 288a847
Show file tree
Hide file tree
Showing 8 changed files with 364 additions and 138 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Name Request Online Frontend
# Name Request UI

[![img](https://img.shields.io/badge/Lifecycle-Stable-97ca00)](https://github.com/bcgov/repomountie/blob/master/doc/lifecycle-badges.md)

## Project setup
```
npm install -g pnpm
pnpm install
```

Expand Down
32 changes: 16 additions & 16 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "name-request",
"version": "5.5.8",
"version": "5.5.9",
"private": true,
"appName": "Name Request UI",
"sbcName": "SBC Common Components",
Expand All @@ -14,7 +14,7 @@
"build-check": "node --max_old_space_size=8000 node_modules/@vue/cli-service/bin/vue-cli-service.js build"
},
"dependencies": {
"@babel/compat-data": "^7.21.5",
"@babel/compat-data": "^7.24.4",
"@bcrs-shared-components/breadcrumb": "2.1.24",
"@bcrs-shared-components/corp-type-module": "1.0.15",
"@bcrs-shared-components/enums": "1.1.7",
Expand All @@ -23,18 +23,18 @@
"@bcrs-shared-components/interfaces": "1.0.67",
"@bcrs-shared-components/staff-payment": "1.0.29",
"@bcrs-shared-components/web-chat": "2.0.0",
"@mdi/font": "^4.5.95",
"@sentry/browser": "^7.49.0",
"@sentry/integrations": "^7.49.0",
"@mdi/font": "^4.9.95",
"@sentry/browser": "^7.110.1",
"@sentry/integrations": "^7.110.1",
"axios": "^0.27.2",
"babel-plugin-transform-decorators": "^6.24.1",
"core-js": "^3.30.1",
"core-js": "^3.37.0",
"http-status-codes": "^1.4.0",
"launchdarkly-js-client-sdk": "^2.24.2",
"lodash": "^4.17.21",
"qs": "^6.12.1",
"quill": "^2.0.0",
"remove-accents": "^0.4.2",
"remove-accents": "^0.4.4",
"sbc-common-components": "3.0.12",
"style-loader": "^1.3.0",
"tslib": "^2.6.2",
Expand All @@ -43,17 +43,17 @@
"vue-hotjar": "^1.4.0",
"vue-quill-editor": "^3.0.6",
"vue-router": "^3.6.5",
"vuetify": "^2.6.15",
"vuetify": "^2.7.2",
"vuex": "^3.6.2"
},
"devDependencies": {
"@babel/plugin-proposal-private-methods": "^7.18.6",
"@types/jest": "^27.5.2",
"@types/lodash": "^4.14.194",
"@types/lodash": "^4.17.0",
"@types/node": "^20.12.7",
"@types/sinon": "^10.0.14",
"@typescript-eslint/eslint-plugin": "^5.59.2",
"@typescript-eslint/parser": "^5.59.2",
"@types/sinon": "^10.0.20",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"@volar-plugins/vetur": "latest",
"@vue/cli-plugin-babel": "^5.0.8",
"@vue/cli-plugin-eslint": "^5.0.8",
Expand All @@ -64,7 +64,7 @@
"@vue/cli-service": "^5.0.8",
"@vue/eslint-config-standard": "^4.0.0",
"@vue/eslint-config-typescript": "^9.1.0",
"@vue/test-utils": "^1.3.5",
"@vue/test-utils": "^1.3.6",
"@vue/vue2-jest": "^27.0.0",
"cross-env": "^7.0.3",
"eslint": "~7.32.0",
Expand All @@ -73,7 +73,7 @@
"json-server": "^0.15.1",
"postcss-loader": "^8.1.1",
"sass": "~1.32.13",
"sass-loader": "^10.4.1",
"sass-loader": "^10.5.2",
"sinon": "^14.0.2",
"ts-jest": "^27.1.5",
"typescript": "4.5.5",
Expand All @@ -82,10 +82,10 @@
"vue-debounce-decorator": "^1.0.1",
"vue-property-decorator": "^9.1.2",
"vue-template-compiler": "2.7.10",
"vuetify-loader": "^1.6.0",
"vuetify-loader": "^1.9.2",
"vuex-class": "^0.3.2",
"vuex-module-decorators": "^1.2.0",
"webpack": "5.78",
"webpack": "~5.78.0",
"webpack-bundle-analyzer": "^3.9.0"
},
"overrides": {
Expand Down
445 changes: 335 additions & 110 deletions app/pnpm-lock.yaml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions app/src/components/dialogs/create-business-error.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ export default class CreateBusinessErrorDialog extends Vue {
// The title depending on the action that was done.
get title (): string {
if (this.getAmalgamateNowErrorStatus) return 'Unable to Amalgamate Now'
if (this.getContinuationInErrorStatus) return 'Unable to Continue in'
if (this.getContinuationInErrorStatus) return 'Unable to Begin Continuation'
if (this.getIncorporateNowErrorStatus) return 'Unable to Incorporate Now'
return ''
}
// The dialog text depending on the action that was done.
get dialogText (): string {
if (this.getAmalgamateNowErrorStatus) return 'Unable to amalgamate now. Please cancel or try again.'
if (this.getContinuationInErrorStatus) return 'Unable to continue in. Please cancel or try again.'
if (this.getContinuationInErrorStatus) return 'Unable to begin continuation. Please cancel or try again.'
if (this.getIncorporateNowErrorStatus) return 'Unable to incorporate now. Please cancel or try again.'
return ''
}
Expand Down
12 changes: 6 additions & 6 deletions app/src/components/existing-request/nr-approved-gray-box.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
</div>

<div
v-else-if="showContinueInNowButton"
v-else-if="showBeginContinuationButton"
class="d-flex justify-center my-1"
>
<v-btn
Expand All @@ -89,7 +89,7 @@
:disabled="disabled"
@click="$emit('goToCorpOnline')"
>
<strong>Continue In Now</strong>
<strong>Begin Continuation</strong>
&nbsp;
<v-icon small>
mdi-open-in-new
Expand All @@ -102,7 +102,7 @@
:disabled="disabled"
@click="$emit('affiliateYourBusiness')"
>
<strong>Continue In Now</strong>
<strong>Begin Continuation</strong>
</v-btn>
</div>

Expand Down Expand Up @@ -252,8 +252,8 @@ export default class NrApprovedGrayBox extends Mixins(CommonMixin) {
return (this.isAmalgamate && this.isApprovedOrConsentUnRequired)
}
/** True if the Continue In button should be shown. */
get showContinueInNowButton (): boolean {
/** True if the Begin Continuation button should be shown. */
get showBeginContinuationButton (): boolean {
return (this.isContinuationIn && this.isApprovedOrConsentUnRequired)
}
Expand All @@ -264,7 +264,7 @@ export default class NrApprovedGrayBox extends Mixins(CommonMixin) {
get showOpenExternalIcon (): boolean {
if (this.showAmalgamateNowButton && !this.isSupportedAmalgamation(this.getNr.entity_type_cd)) return true
if (this.showAlterNowButton && !this.isSupportedAlteration(this.getNr.requestTypeCd)) return true
if (this.showContinueInNowButton && !this.isSupportedContinuationIn(this.getNr.entity_type_cd)) return true
if (this.showBeginContinuationButton && !this.isSupportedContinuationIn(this.getNr.entity_type_cd)) return true
return false
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/new-request/business-lookup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
id="business-lookup"
>
<v-autocomplete
v-model:search-input="searchField"

Check warning on line 8 in app/src/components/new-request/business-lookup.vue

View workflow job for this annotation

GitHub Actions / namerequest-ci / linting-pnpm (21, 9)

'v-model' directives require no argument

Check warning on line 8 in app/src/components/new-request/business-lookup.vue

View workflow job for this annotation

GitHub Actions / namerequest-ci / verify-build (21, 9)

'v-model' directives require no argument
filled
no-filter
:hide-no-data="state != States.NO_RESULTS"
:items="searchResults"
:loading="state === States.SEARCHING"
:name="Math.random()"
:search-input.sync="searchField"
append-icon="mdi-magnify"
autocomplete="chrome-off"
autofocus
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/new-request/search.vue
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin, Sear
/** Retrieve text based on selected action/flow */
get actionNowButtonText (): string {
if (this.isContinuationIn) return 'Continue In Now'
if (this.isContinuationIn) return 'Begin Continuation'
if (this.isAmalgamation) return 'Amalgamate Now'
if (this.isConversion) return 'Alter Now'
if (this.isRestoration) return 'Restore Now'
Expand Down
2 changes: 1 addition & 1 deletion app/src/mixins/nr-affiliation-mixin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ export class NrAffiliationMixin extends Mixins(CommonMixin) {
throw new Error('Unable to Amalgamate Now = ' + error)
} else if (this.isContinuationIn) {
this.setContinuationInErrorStatus(true)
throw new Error('Unable to Continue In Now = ' + error)
throw new Error('Unable to Begin Continuation = ' + error)
} else if (this.isNewBusiness) {
this.setIncorporateNowErrorStatus(true)
throw new Error('Unable to Incorporate Now = ' + error)
Expand Down

0 comments on commit 288a847

Please sign in to comment.