From c1fe0f1f2ce3071eecb323dc3203300847fd2173 Mon Sep 17 00:00:00 2001 From: Hrvoje Fekete Date: Tue, 4 Nov 2025 11:16:52 -0800 Subject: [PATCH 1/7] Update `MRAS_MAX_LENGTH` constant to 60 in new-request constants --- app/src/components/new-request/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/components/new-request/constants.ts b/app/src/components/new-request/constants.ts index 3e9787a92..b0ff26820 100644 --- a/app/src/components/new-request/constants.ts +++ b/app/src/components/new-request/constants.ts @@ -1,4 +1,4 @@ export const DFLT_MIN_LENGTH = 3 export const DFLT_MAX_LENGTH = 150 export const MRAS_MIN_LENGTH = 3 -export const MRAS_MAX_LENGTH = 40 +export const MRAS_MAX_LENGTH = 60 From 276f559ccf12610328a4cc138020ce3d0e89952e Mon Sep 17 00:00:00 2001 From: Hrvoje Fekete Date: Tue, 4 Nov 2025 13:18:52 -0800 Subject: [PATCH 2/7] version bump --- app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index a8ee0c168..2b0f4c53b 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "name-request", - "version": "5.8.1", + "version": "5.8.2", "private": true, "appName": "Name Request UI", "sbcName": "SBC Common Components", From bf28cfa3eaab9056b39fc60367d3f736897b011a Mon Sep 17 00:00:00 2001 From: Hrvoje Fekete Date: Fri, 7 Nov 2025 16:10:50 -0800 Subject: [PATCH 3/7] bugfix: Add folio number to RENEW payment when the first payment already had it - bump version to 5.8.3 --- app/package.json | 2 +- app/src/mixins/payment-mixin.ts | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/package.json b/app/package.json index 2b0f4c53b..cddc4a7d7 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "name-request", - "version": "5.8.2", + "version": "5.8.3", "private": true, "appName": "Name Request UI", "sbcName": "SBC Common Components", diff --git a/app/src/mixins/payment-mixin.ts b/app/src/mixins/payment-mixin.ts index 38e74f023..2dc81b248 100644 --- a/app/src/mixins/payment-mixin.ts +++ b/app/src/mixins/payment-mixin.ts @@ -11,6 +11,7 @@ import { StaffPaymentIF, RefundParamsIF, NameRequestI, ErrorI, CreatePaymentPara import NamexServices from '@/services/namex-services' import { PaymentRequiredError } from '@/errors' import { Navigate } from '@/plugins' +import { setFolioNumber } from '@/store/actions' const namexApiUrl = sessionStorage.getItem('NAMEX_API_URL') @@ -22,6 +23,7 @@ export class PaymentMixin extends Mixins(ActionMixin) { @Action(usePaymentStore) setPaymentReceipt!: (receipt: any) => void @Action(usePaymentStore) setPaymentRequest!: (req: any) => void @Action(usePaymentStore) setSbcPayment!: (payment: any) => void + @Action(useStore) setFolioNumber!: (folioNumber: string) => void @Action(useStore) setRefundParams!: (refundParams: RefundParamsIF) => void @Action(useErrorStore) setAppError!: (err: ErrorI) => void @@ -468,13 +470,15 @@ export class PaymentMixin extends Mixins(ActionMixin) { case StaffPaymentOptions.NO_FEE: headers['waiveFees'] = true break - - case StaffPaymentOptions.NONE: // It is not a StaffPayment - headers['folioNumber'] = this.getFolioNumber - break + // + // case StaffPaymentOptions.NONE: // It is not a StaffPayment + // headers['folioNumber'] = this.getFolioNumber + // break } } + headers['folioNumber'] = this.getFolioNumber + const keycloakToken = sessionStorage.getItem(SessionStorageKeys.KeyCloakToken) if (keycloakToken) { headers['Authorization'] = `Bearer ${keycloakToken}` @@ -582,6 +586,10 @@ export class PaymentMixin extends Mixins(ActionMixin) { if (!paymentsResponse) throw new Error('Got error from getNameRequestPayments()') this.setPayments(paymentsResponse) + // set folio number if it exists in the first payment record + if(paymentsResponse[0]?.sbcPayment?.folioNumber) { + this.setFolioNumber(paymentsResponse[0]?.sbcPayment?.folioNumber) + } return true } catch (err) { // don't console.error - getNameRequestPayments() already did that From bd372fc25b20bfa5591d27d354ec0ddc5701aff4 Mon Sep 17 00:00:00 2001 From: Hrvoje Fekete Date: Fri, 7 Nov 2025 16:19:15 -0800 Subject: [PATCH 4/7] chore: Restore folio number assignment for StaffPaymentOptions.NONE --- app/src/mixins/payment-mixin.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/mixins/payment-mixin.ts b/app/src/mixins/payment-mixin.ts index 2dc81b248..ecda347c6 100644 --- a/app/src/mixins/payment-mixin.ts +++ b/app/src/mixins/payment-mixin.ts @@ -470,14 +470,14 @@ export class PaymentMixin extends Mixins(ActionMixin) { case StaffPaymentOptions.NO_FEE: headers['waiveFees'] = true break - // - // case StaffPaymentOptions.NONE: // It is not a StaffPayment - // headers['folioNumber'] = this.getFolioNumber - // break + + case StaffPaymentOptions.NONE: // It is not a StaffPayment + headers['folioNumber'] = this.getFolioNumber + break } } - headers['folioNumber'] = this.getFolioNumber + // headers['folioNumber'] = this.getFolioNumber const keycloakToken = sessionStorage.getItem(SessionStorageKeys.KeyCloakToken) if (keycloakToken) { From 805c46f28e4f623f5ed8f7590fa06a7201f2f31c Mon Sep 17 00:00:00 2001 From: Hrvoje Fekete Date: Mon, 10 Nov 2025 09:42:14 -0800 Subject: [PATCH 5/7] chore: Update folio number assignment logic to use PaymentAction.CREATE filter --- app/src/interfaces/payment-models.ts | 3 ++- app/src/mixins/payment-mixin.ts | 17 +++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/src/interfaces/payment-models.ts b/app/src/interfaces/payment-models.ts index 80f4bb11a..690c15bbc 100644 --- a/app/src/interfaces/payment-models.ts +++ b/app/src/interfaces/payment-models.ts @@ -1,7 +1,8 @@ -import { FilingTypes, Jurisdictions } from '@/enums' +import { FilingTypes, Jurisdictions, PaymentAction } from '@/enums' import { ErrorI } from '@/interfaces' export interface NameRequestPaymentResponse { + action: PaymentAction id: number nrId: string nrNum: string diff --git a/app/src/mixins/payment-mixin.ts b/app/src/mixins/payment-mixin.ts index ecda347c6..382ffa771 100644 --- a/app/src/mixins/payment-mixin.ts +++ b/app/src/mixins/payment-mixin.ts @@ -4,7 +4,7 @@ import { useErrorStore, usePaymentStore, useStore } from '@/store' import { AxiosRequestConfig } from 'axios' import { ACCEPTED, CREATED, NO_CONTENT, OK, PAYMENT_REQUIRED } from 'http-status-codes' import { SessionStorageKeys } from 'sbc-common-components/src/util/constants' -import { PaymentStatus, StaffPaymentOptions, NrState, PaymentMethod, SbcPaymentStatus } from '@/enums' +import { PaymentStatus, StaffPaymentOptions, NrState, PaymentMethod, SbcPaymentStatus, PaymentAction } from '@/enums' import { ActionMixin } from '@/mixins' import { StaffPaymentIF, RefundParamsIF, NameRequestI, ErrorI, CreatePaymentParams, FetchFeesParams, NameRequestPaymentResponse } from '@/interfaces' @@ -477,8 +477,6 @@ export class PaymentMixin extends Mixins(ActionMixin) { } } - // headers['folioNumber'] = this.getFolioNumber - const keycloakToken = sessionStorage.getItem(SessionStorageKeys.KeyCloakToken) if (keycloakToken) { headers['Authorization'] = `Bearer ${keycloakToken}` @@ -586,10 +584,17 @@ export class PaymentMixin extends Mixins(ActionMixin) { if (!paymentsResponse) throw new Error('Got error from getNameRequestPayments()') this.setPayments(paymentsResponse) - // set folio number if it exists in the first payment record - if(paymentsResponse[0]?.sbcPayment?.folioNumber) { - this.setFolioNumber(paymentsResponse[0]?.sbcPayment?.folioNumber) + + // find the first payment in the returned array that has action = CREATE and has sbcPayment.folioNumber set + const paymentWithFolio = paymentsResponse?.find( + payment => + payment?.action === PaymentAction.CREATE && + payment?.sbcPayment?.folioNumber + ) + if (paymentWithFolio?.sbcPayment?.folioNumber) { + this.setFolioNumber(paymentWithFolio.sbcPayment.folioNumber) } + return true } catch (err) { // don't console.error - getNameRequestPayments() already did that From 85287711e1bb76e9983059947c4fc09570855e3c Mon Sep 17 00:00:00 2001 From: Hrvoje Fekete Date: Wed, 12 Nov 2025 15:12:30 -0800 Subject: [PATCH 6/7] chore: Revert `MRAS_MAX_LENGTH` constant to 40 in new-request constants --- app/src/components/new-request/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/components/new-request/constants.ts b/app/src/components/new-request/constants.ts index b0ff26820..3e9787a92 100644 --- a/app/src/components/new-request/constants.ts +++ b/app/src/components/new-request/constants.ts @@ -1,4 +1,4 @@ export const DFLT_MIN_LENGTH = 3 export const DFLT_MAX_LENGTH = 150 export const MRAS_MIN_LENGTH = 3 -export const MRAS_MAX_LENGTH = 60 +export const MRAS_MAX_LENGTH = 40 From 99ffe41f1d312e5d66dee09680e7c5a4b62ba643 Mon Sep 17 00:00:00 2001 From: Hrvoje Fekete Date: Wed, 12 Nov 2025 15:26:12 -0800 Subject: [PATCH 7/7] cleanup --- app/package.json | 2 +- app/src/mixins/payment-mixin.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/package.json b/app/package.json index cddc4a7d7..2b0f4c53b 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "name-request", - "version": "5.8.3", + "version": "5.8.2", "private": true, "appName": "Name Request UI", "sbcName": "SBC Common Components", diff --git a/app/src/mixins/payment-mixin.ts b/app/src/mixins/payment-mixin.ts index 382ffa771..102e62571 100644 --- a/app/src/mixins/payment-mixin.ts +++ b/app/src/mixins/payment-mixin.ts @@ -11,7 +11,6 @@ import { StaffPaymentIF, RefundParamsIF, NameRequestI, ErrorI, CreatePaymentPara import NamexServices from '@/services/namex-services' import { PaymentRequiredError } from '@/errors' import { Navigate } from '@/plugins' -import { setFolioNumber } from '@/store/actions' const namexApiUrl = sessionStorage.getItem('NAMEX_API_URL')