Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
10 changes: 2 additions & 8 deletions strr-examiner-web/app/pages/dashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ const hostOptions = [
{ label: 'PR Exempt - Strata', value: 'PR_EXEMPT_STRATA_HOTEL' },
{ label: 'PR Exempt - Fractional', value: 'PR_EXEMPT_FRACTIONAL_OWNERSHIP' },
{ label: 'BL', value: 'BL' },
{ label: 'Prohibited', value: 'PROHIBITED' },
{ label: 'No requirements', value: 'NO_REQ' }
]

Expand Down Expand Up @@ -132,7 +131,7 @@ definePageMeta({
})

const getHostPrRequirements = (hostApplication: ApiHostApplication): string => {
const { isBusinessLicenceRequired, isPrincipalResidenceRequired, isStrProhibited } =
const { isBusinessLicenceRequired, isPrincipalResidenceRequired } =
hostApplication?.strRequirements as PropertyRequirements

const { prExemptReason } = hostApplication.unitDetails
Expand All @@ -147,8 +146,7 @@ const getHostPrRequirements = (hostApplication: ApiHostApplication): string => {
strataHotelCategory
? t(`strataHotelCategoryReview.${strataHotelCategory}`)
: '',
isBusinessLicenceRequired ? t('page.dashboardList.requirements.host.bl') : '',
isStrProhibited ? t('page.dashboardList.requirements.host.prohibited') : ''
isBusinessLicenceRequired ? t('page.dashboardList.requirements.host.bl') : ''
].filter(Boolean).join(', ') ||
// default value where there are no requirements
t('page.dashboardList.requirements.host.none')
Expand Down Expand Up @@ -371,17 +369,13 @@ const getConditionsColumnForRegistration = (reg: HousRegistrationResponse) => {
// Fall back to unitDetails for backwards compatibility
const prRequired = hostReg.strRequirements?.isPrincipalResidenceRequired ?? hostReg.unitDetails?.prRequired
const blRequired = hostReg.strRequirements?.isBusinessLicenceRequired ?? hostReg.unitDetails?.blRequired
const isStrProhibited = hostReg.strRequirements?.isStrProhibited

if (prRequired) {
requirements.push(t('page.dashboardList.requirements.host.pr'))
}
if (blRequired) {
requirements.push(t('page.dashboardList.requirements.host.bl'))
}
if (isStrProhibited) {
requirements.push(t('page.dashboardList.requirements.host.prohibited'))
}
if (hostReg.unitDetails?.prExemptReason) {
requirements.push(t(`page.dashboardList.requirements.host.${hostReg.unitDetails.prExemptReason}`))
}
Expand Down
2 changes: 1 addition & 1 deletion strr-examiner-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "strr-examiner-web",
"private": true,
"type": "module",
"version": "0.2.31",
"version": "0.2.32",
"engines": {
"node": ">=24"
},
Expand Down
12 changes: 7 additions & 5 deletions strr-examiner-web/tests/unit/dashboard.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ describe('Examiner Dashboard Page', () => {
}
})

expect(prRequirements2).toBe('BL, Prohibited')
expect(prRequirements2).not.toContain('Prohibited') // Prohibited was excluded in 1187
expect(prRequirements2).toBe('BL')

const prRequirements3 = getPrReq({
...mockApplications[0]?.registration,
Expand All @@ -158,7 +159,8 @@ describe('Examiner Dashboard Page', () => {
}
})

expect(prRequirements3).toBe('PR-ex-farm, BL, Prohibited')
expect(prRequirements3).not.toContain('Prohibited') // Prohibited was excluded in 1187
expect(prRequirements3).toBe('PR-ex-farm, BL')
})

it('renders the Dashboard page and applications table', () => {
Expand Down Expand Up @@ -421,7 +423,7 @@ describe('Examiner Dashboard Page', () => {
expect(result).not.toContain('BL')
})

it('should display "Prohibited" when isStrProhibited is true in strRequirements', () => {
it('should not display "Prohibited" when isStrProhibited is true in strRequirements', () => {
const registration: HostRegistrationResp = {
...mockHostRegistration,
strRequirements: {
Expand All @@ -434,7 +436,7 @@ describe('Examiner Dashboard Page', () => {
}

const result = wrapper.vm.getConditionsColumnForRegistration(registration)
expect(result).toContain('Prohibited')
expect(result).not.toContain('Prohibited')
})

it('should display PR exempt reason from unitDetails', () => {
Expand Down Expand Up @@ -543,7 +545,7 @@ describe('Examiner Dashboard Page', () => {
const result = wrapper.vm.getConditionsColumnForRegistration(registration)
expect(result).toContain('PR')
expect(result).toContain('BL')
expect(result).toContain('Prohibited')
expect(result).not.toContain('Prohibited')
expect(result).toContain('PR-ex-fractional')
})

Expand Down
Loading