diff --git a/app/package.json b/app/package.json index 78bb6d391..f6ca427f5 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "name-request", - "version": "5.8.4", + "version": "5.8.5", "private": true, "appName": "Name Request UI", "sbcName": "SBC Common Components", diff --git a/app/src/components/common/applicant-info-2.vue b/app/src/components/common/applicant-info-2.vue index 048a66ba0..da9aec47b 100644 --- a/app/src/components/common/applicant-info-2.vue +++ b/app/src/components/common/applicant-info-2.vue @@ -259,7 +259,7 @@ - Priority name requests are typically reviewed within 1-2 business days. + Priority name requests are typically reviewed within {{ getPriorityWaitTime }} business days. Due to the on-going labour dispute between the government and its employees, @@ -295,6 +295,7 @@ export default class ApplicantInfo2 extends Vue { @Getter(useStore) getNrData!: any @Getter(useStore) getNrState!: NrState @Getter(useStore) getPriorityRequest!: boolean + @Getter(useStore) getPriorityWaitTime!: string | number @Getter(useStore) getShowPriorityRequest!: boolean @Getter(useStore) isMobile!: boolean diff --git a/app/src/components/common/applicant-info-3.vue b/app/src/components/common/applicant-info-3.vue index fcb703be8..f05b66760 100644 --- a/app/src/components/common/applicant-info-3.vue +++ b/app/src/components/common/applicant-info-3.vue @@ -331,7 +331,7 @@ - Priority name requests are typically reviewed within 1-2 business days. + Priority name requests are typically reviewed within {{ getPriorityWaitTime }} business days. Due to the on-going labour dispute between the government and its employees, @@ -369,6 +369,7 @@ export default class ApplicantInfo3 extends Vue { @Getter(useStore) getNrData!: any @Getter(useStore) getNrState!: NrState @Getter(useStore) getPriorityRequest!: boolean + @Getter(useStore) getPriorityWaitTime!: string | number @Getter(useStore) getShowPriorityRequest!: boolean @Getter(useStore) isRoleStaff!: boolean @Getter(useStore) isMobile!: boolean diff --git a/app/src/components/dialogs/upgrade.vue b/app/src/components/dialogs/upgrade.vue index ea1cd8ac7..f91bb8b08 100644 --- a/app/src/components/dialogs/upgrade.vue +++ b/app/src/components/dialogs/upgrade.vue @@ -70,7 +70,7 @@ class="mb-8" > If you need your name reviewed as quickly as possible, upgrade to a Priority - request. Priority name requests are usually reviewed within 1 to 2 business days. + request. Priority name requests are usually reviewed within {{ getPriorityWaitTime }} business days.

- {{ priorityWaitTime }} + {{ getPriorityWaitTime }}
Days @@ -45,7 +45,9 @@
- {{ priorityToolTipText }} + If you need your name reviewed as quickly as possible, + Priority requests are available for a fee ($100.00). + Priority name requests are usually reviewed within {{ getPriorityWaitTime }} business days. @@ -69,7 +71,7 @@ >
- {{ regularWaitTime }} + {{ getRegularWaitTime }}
Days @@ -104,6 +106,8 @@ import NamexServices from '@/services/namex-services' export default class Stats extends Vue { @Getter(useStore) getStats!: StatsI @Getter(useStore) isMobile!: boolean + @Getter(useStore) getRegularWaitTime!: string | number + @Getter(useStore) getPriorityWaitTime!: string | number @Action(useStore) setStats!: ActionBindingIF @@ -132,58 +136,15 @@ export default class Stats extends Vue { return (this.getStats?.auto_approved_count ?? '-') } - /** The regular wait time, in days. */ - get regularWaitTime (): string | number { - const flagVal = GetFeatureFlag('hardcoded_regular_wait_time') - - if (flagVal > 0) return flagVal - if (flagVal < 0) return '-' - - const statVal = this.getStats?.regular_wait_time - if (statVal > 0) { - return statVal - } - - return '-' - } - - /** The priority wait time, in days. */ - get priorityWaitTime (): string | number { - const flagVal = GetFeatureFlag('hardcoded_priority_wait_time') - - if (flagVal > 0) return flagVal - if (flagVal < 0) return '-' - - const statVal = this.getStats?.priority_wait_time - if (statVal > 0) { - return statVal - } - - return '-' - } - get showRegularTooltip (): boolean { - const val = Number(this.regularWaitTime) + const val = Number(this.getRegularWaitTime) return Number.isFinite(val) && val > 0 } get showPriorityTooltip (): boolean { - const val = Number(this.priorityWaitTime) + const val = Number(this.getPriorityWaitTime) return Number.isFinite(val) && val > 0 } - - get priorityToolTipText (): string { - const priorityToolTipText = GetFeatureFlag('priority-wait-time-tooltip-text') - if (priorityToolTipText) { - return priorityToolTipText - } - // Return default text when no priority tooltip text is available from the feature flag - return ` - If you need your name reviewed as quickly as possible, - Priority requests are available for a fee ($100.00). - Priority name requests are usually reviewed within 1 to 2 business days. - `.trim() - } } diff --git a/app/src/store/getters.ts b/app/src/store/getters.ts index 0d631b929..b1c3eb325 100644 --- a/app/src/store/getters.ts +++ b/app/src/store/getters.ts @@ -58,6 +58,7 @@ import { RequestActions, XproMapping } from '@/list-data' +import { GetFeatureFlag } from '@/plugins/launchDarkly' export const isMobile = (state: StateIF): boolean => { // fall back to base window width if no window size changes have occurred @@ -1318,3 +1319,23 @@ export const getSearchRequest = (state: StateIF): RequestActionsI => { export const getBusinessAccountId = (state: StateIF): string => { return state.newRequestModel.businessAccountId } + +export const getPriorityWaitTime = (state: StateIF): string | number => { + const flagVal = GetFeatureFlag('hardcoded_priority_wait_time') + if (flagVal > 0) return flagVal + if (flagVal < 0) return '-' + + const statVal = getStats(state)?.priority_wait_time + if (statVal > 0) return statVal + return '-' +} + +export const getRegularWaitTime = (state: StateIF): string | number => { + const flagVal = GetFeatureFlag('hardcoded_regular_wait_time') + if (flagVal > 0) return flagVal + if (flagVal < 0) return '-' + + const statVal = getStats(state)?.regular_wait_time + if (statVal > 0) return statVal + return '-' +}