Skip to content

Commit

Permalink
Commercial Lie Reg + Nuxt Sync + Address Complete Update (#2109)
Browse files Browse the repository at this point in the history
* Bug fix fold in, Address Complete Fix, CLA Registration

* version bump

* Clean Up
  • Loading branch information
cameron-eyds authored Feb 18, 2025
1 parent dfb4890 commit ac19722
Show file tree
Hide file tree
Showing 19 changed files with 163 additions and 120 deletions.
26 changes: 18 additions & 8 deletions ppr-ui/nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,23 +64,33 @@ export default defineNuxtConfig({
head: {
title: 'Assets UI',
htmlAttrs: { dir: 'ltr' },
link: [{ rel: 'icon', type: 'image/png', href: './src/assets/favicon.png' }]
link: [
{
rel: 'icon',
type: 'image/png',
href: './src/assets/favicon.png' },
{
rel: 'stylesheet',
type: 'text/css',
href: 'https://ws1.postescanada-canadapost.ca/css/addresscomplete-2.30.min.css?key=tr28-mh11-ud79-br91' }
],
script: [
{
src: `https://ws1.postescanada-canadapost.ca/js/addresscomplete-2.30.js?key=tr28-mh11-ud79-br91&app=
14466&culture=en`,
type: 'text/javascript'
}
]
}
},
build: {
transpile: ['vuetify'],
},
colorMode: {
preference: 'light'
},
srcDir: 'src/',
alias: {
'@': path.resolve(__dirname, './src'),
'@sbc': path.resolve(__dirname, './node_modules/sbc-common-components/src')
},
resolve: {
extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue', '.scss', '.css']
},
ui: {
icons: ['mdi']
},
Expand Down Expand Up @@ -165,4 +175,4 @@ export default defineNuxtConfig({
appNameDisplay: 'assets-ui'
}
}
})
})
2 changes: 1 addition & 1 deletion ppr-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ppr-ui",
"version": "4.0.1",
"version": "4.0.2",
"private": true,
"appName": "Assets UI",
"sbcName": "SBC Common Components",
Expand Down
16 changes: 8 additions & 8 deletions ppr-ui/src/components/collateral/general/GenColSummary.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<v-container class="px-2">
<v-row
v-if="showConfirm"
noGutters
no-gutters
class="pb-4"
>
<v-col cols="10">
Expand All @@ -13,7 +13,7 @@
</v-row>
<v-row
v-if="showAmendLink"
noGutters
no-gutters
class="px-0"
>
<v-col cols="10">
Expand Down Expand Up @@ -105,7 +105,7 @@
class="badge-delete"
variant="elevated"
color="greyLighten"
xSmall
x-small
>
<b>DELETED</b>
</v-chip>
Expand All @@ -123,7 +123,7 @@
<v-chip
color="primary"
variant="elevated"
xSmall
x-small
>
<b>ADDED</b>
</v-chip>
Expand Down Expand Up @@ -160,7 +160,7 @@
<v-row
v-for="(item, index) in generalCollateral"
:key="index"
noGutters
no-gutters
>
<v-col
v-if="item.addedDateTime"
Expand All @@ -178,7 +178,7 @@
class="badge-delete"
color="greyLighten"
variant="elevated"
xSmall
x-small
>
<b>DELETED</b>
</v-chip>
Expand All @@ -196,7 +196,7 @@
<v-chip
color="primary"
variant="elevated"
xSmall
x-small
>
<b>ADDED</b>
</v-chip>
Expand Down Expand Up @@ -259,7 +259,7 @@ import {
} from 'vue'
import { useStore } from '@/store/store'
import { RegistrationFlowType } from '@/enums'
import { GeneralCollateralIF } from '@/interfaces'
import type { GeneralCollateralIF } from '@/interfaces'
import { pacificDate } from '@/utils'
import { cloneDeep } from 'lodash'
import { storeToRefs } from 'pinia'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
<template>
<div class="pa-0 ma-0">
<GenColSummary
:set-show-history="false"
:set-show-amend-link="!amendMode"
@init-gen-col-amend="amendMode = $event"
/>
<v-container
v-if="registrationFlowType === RegistrationFlowType.AMENDMENT && amendMode"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { APIRegistrationTypes } from '@/enums'
export const useGeneralCollateral = () => {
const hasGeneralCollateral = (registrationType: APIRegistrationTypes): boolean => {
const ghArray = [
APIRegistrationTypes.COMMERCIAL_LIEN,
APIRegistrationTypes.SECURITY_AGREEMENT,
APIRegistrationTypes.SECURITY_ACT_NOTICE,
APIRegistrationTypes.SALE_OF_GOODS,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { reactive, toRefs, computed } from 'vue'
import { VehicleTypes, VehicleTypesNoMH } from '@/resources'
import { VehicleCollateralIF } from '@/interfaces'
import type { VehicleCollateralIF } from '@/interfaces'
import { useStore } from '@/store/store'
import { ActionTypes, APIRegistrationTypes, RegistrationFlowType } from '@/enums'
import { cloneDeep, isEqual } from 'lodash'
Expand Down Expand Up @@ -119,6 +119,7 @@ export const useVehicle = (props, context) => {
const vhArray = [
APIRegistrationTypes.SECURITY_AGREEMENT,
APIRegistrationTypes.REPAIRERS_LIEN,
APIRegistrationTypes.COMMERCIAL_LIEN,
APIRegistrationTypes.MARRIAGE_MH,
APIRegistrationTypes.LAND_TAX_LIEN,
APIRegistrationTypes.MANUFACTURED_HOME_LIEN,
Expand Down
1 change: 0 additions & 1 deletion ppr-ui/src/components/parties/party/PartySearch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@ export default defineComponent({

<style lang="scss" module>
@import '@/assets/styles/theme.scss';
.close-btn-row {
height: 1rem;
}
Expand Down
22 changes: 12 additions & 10 deletions ppr-ui/src/components/registration/RegistrationBarTypeAheadList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
<v-autocomplete
v-model="selected"
class="registrationTypeAhead rounded-top"
hideDetails
itemTitle="text"
hide-details
item-title="text"
variant="filled"
returnObject
return-object
density="compact"
color="primary"
:class="{ 'reg-filter': isClearable, 'bg-white': isLightBackGround }"
:items="displayItems"
:label="dropdownLabel"
:clearable="isClearable"
:clearIcon="'mdi-close'"
persistentClear
:clear-icon="'mdi-close'"
persistent-clear
@update:search="showAllGroups"
@update:menu="hideAllGroups"
>
Expand All @@ -32,7 +32,7 @@
<v-list-item
:id="`reg-type-drop-${item.raw.group}`"
class="registration-list-item"
noGutters
no-gutters
@click="toggleGroup(item.raw.group)"
>
<v-row
Expand Down Expand Up @@ -73,10 +73,11 @@
import { computed, defineComponent, reactive, toRefs, watch } from 'vue'
import { RegistrationOtherDialog } from '@/components/dialogs'
import { APIRegistrationTypes } from '@/enums'
import { RegistrationTypeIF } from '@/interfaces'
import type { RegistrationTypeIF } from '@/interfaces'
import { RegistrationTypes } from '@/resources'
import { registrationOtherDialog } from '@/resources/dialogOptions'
import { usePprRegistration } from '@/composables'
import { getFeatureFlag } from '@/utils'
export default defineComponent({
name: 'RegistrationBarTypeAheadList',
Expand Down Expand Up @@ -123,9 +124,10 @@ export default defineComponent({
return !props.isLightBackGround ? 'filled' : 'plain'
}),
displayItems: computed(() => {
const registrationTypes = !isSecurityActNoticeEnabled.value
? RegistrationTypes.filter(item => item?.registrationTypeAPI !== APIRegistrationTypes.SECURITY_ACT_NOTICE)
: RegistrationTypes
// Filter out the repairers lien registration type if the feature flag is enabled
const registrationTypes = getFeatureFlag('cla-enabled')
? RegistrationTypes.filter(item => item?.registrationTypeAPI !== APIRegistrationTypes.REPAIRERS_LIEN)
: RegistrationTypes.filter(item => item?.registrationTypeAPI !== APIRegistrationTypes.COMMERCIAL_LIEN)
return filterListByGroupStatus(registrationTypes, localState.displayGroup)
})
})
Expand Down
Loading

0 comments on commit ac19722

Please sign in to comment.