From 326b95bf8ecf566ceb022db222fed7ef85bc36e7 Mon Sep 17 00:00:00 2001
From: CameronEYDS <53542131+cameron-eyds@users.noreply.github.com>
Date: Thu, 6 Jun 2024 09:33:52 -0700
Subject: [PATCH] UXA Feedback Items (#1917)

---
 ppr-ui/package-lock.json                           |  4 ++--
 ppr-ui/package.json                                |  2 +-
 .../AddEditCommissionOrder.vue                     | 10 +++++++++-
 .../securities-act-notices/AddEditCourtOrder.vue   | 10 +++++++++-
 .../CourtCommissionOrderReview.vue                 | 14 ++++++++------
 .../securities-act-notices/NoticePanel.vue         | 10 ++++------
 .../SecuritiesActNoticesPanels.vue                 |  3 ++-
 .../composables/fees/factories/useFeeSummary.ts    |  3 ++-
 ppr-ui/src/utils/date-helper.ts                    |  2 +-
 ppr-ui/src/utils/registration-helper.ts            | 14 +++++++++-----
 10 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/ppr-ui/package-lock.json b/ppr-ui/package-lock.json
index dbf5e035f..22c5d7d7a 100644
--- a/ppr-ui/package-lock.json
+++ b/ppr-ui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ppr-ui",
-  "version": "3.2.10",
+  "version": "3.2.11",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ppr-ui",
-      "version": "3.2.10",
+      "version": "3.2.11",
       "dependencies": {
         "@bcrs-shared-components/input-field-date-picker": "^1.0.0",
         "@lemoncode/fonk": "^1.5.1",
diff --git a/ppr-ui/package.json b/ppr-ui/package.json
index 62684c827..073328cbf 100644
--- a/ppr-ui/package.json
+++ b/ppr-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ppr-ui",
-  "version": "3.2.10",
+  "version": "3.2.11",
   "private": true,
   "appName": "Assets UI",
   "sbcName": "SBC Common Components",
diff --git a/ppr-ui/src/components/registration/securities-act-notices/AddEditCommissionOrder.vue b/ppr-ui/src/components/registration/securities-act-notices/AddEditCommissionOrder.vue
index 5343adcfc..a3e27bfcd 100644
--- a/ppr-ui/src/components/registration/securities-act-notices/AddEditCommissionOrder.vue
+++ b/ppr-ui/src/components/registration/securities-act-notices/AddEditCommissionOrder.vue
@@ -56,7 +56,7 @@
               label="Effect of Order (Optional)"
               counter="512"
               persistentCounter
-              :rules="maxLength(512)"
+              :rules="effectOfOrderRules"
             >
               <template #counter="{ counter }">
                 <span>Characters: {{ counter }}</span>
@@ -140,6 +140,14 @@ const fileNumberRules = customRules(
   minLength(5),
   maxLength(20)
 )
+const effectOfOrderRules = computed(() => {
+  return !!commissionOrderData.value.effectOfOrder
+    ? customRules(
+      minLength(5),
+      maxLength(512)
+    )
+    : []
+})
 
 /** Local Functions **/
 const submitAddEditCommissionOrder = async () => {
diff --git a/ppr-ui/src/components/registration/securities-act-notices/AddEditCourtOrder.vue b/ppr-ui/src/components/registration/securities-act-notices/AddEditCourtOrder.vue
index 42e00221b..75d9a062d 100644
--- a/ppr-ui/src/components/registration/securities-act-notices/AddEditCourtOrder.vue
+++ b/ppr-ui/src/components/registration/securities-act-notices/AddEditCourtOrder.vue
@@ -98,7 +98,7 @@
               label="Effect of Order (Optional)"
               counter="512"
               persistentCounter
-              :rules="maxLength(512)"
+              :rules="effectOfOrderRules"
             >
               <template #counter="{ counter }">
                 <span>Characters: {{ counter }}</span>
@@ -193,6 +193,14 @@ const fileNumberRules = customRules(
   minLength(5),
   maxLength(20)
 )
+const effectOfOrderRules = computed(() => {
+  return !!courtOrderData.value.effectOfOrder
+    ? customRules(
+      minLength(5),
+      maxLength(512)
+    )
+    : []
+})
 
 /** Local Functions **/
 const submitAddEditCourtOrder = async () => {
diff --git a/ppr-ui/src/components/registration/securities-act-notices/CourtCommissionOrderReview.vue b/ppr-ui/src/components/registration/securities-act-notices/CourtCommissionOrderReview.vue
index 2db25241f..ca10777d9 100644
--- a/ppr-ui/src/components/registration/securities-act-notices/CourtCommissionOrderReview.vue
+++ b/ppr-ui/src/components/registration/securities-act-notices/CourtCommissionOrderReview.vue
@@ -14,8 +14,8 @@
       </h4>
       <span>
         <InfoChip
-          v-if="isAmendment"
-          class="ml-2 py-1"
+          v-if="isAmendment && !hasAddedParentNotice"
+          class="ml-4 py-1"
           :action="order.action"
         />
       </span>
@@ -56,7 +56,7 @@
       cols="3"
       class="pt-1 pb-0 mb-0"
     >
-      <h4>{{ courtCommisionNumberLabel }} Number</h4>
+      <h4>{{ courtCommissionNumberLabel }} Number</h4>
     </v-col>
     <v-col
       cols="9"
@@ -104,16 +104,18 @@ import { ActionTypes } from '@/enums'
 const props = withDefaults(defineProps<{
   order: CourtOrderIF,
   isAmendment?: boolean,
-  hasRemovedOrders?: boolean
+  hasRemovedOrders?: boolean,
+  hasAddedParentNotice?: boolean
 }>(), {
   order: null,
   isAmendment: false,
-  hasRemovedOrders: false
+  hasRemovedOrders: false,
+  hasAddedParentNotice: false
 })
 
 /** Local Properties **/
 const courtCommissionLabel = computed(() => props.order?.courtOrder ? 'Court' : 'Securities Commission')
-const courtCommisionNumberLabel = computed(() => props.order?.courtOrder ? 'Court File' : 'Commission Order')
+const courtCommissionNumberLabel = computed(() => props.order?.courtOrder ? 'Court File' : 'Commission Order')
 
 
 </script>
diff --git a/ppr-ui/src/components/registration/securities-act-notices/NoticePanel.vue b/ppr-ui/src/components/registration/securities-act-notices/NoticePanel.vue
index dba757c76..cc3d4c8a0 100644
--- a/ppr-ui/src/components/registration/securities-act-notices/NoticePanel.vue
+++ b/ppr-ui/src/components/registration/securities-act-notices/NoticePanel.vue
@@ -48,7 +48,8 @@
             <span>
               <InfoChip
                 v-if="isAmendment"
-                class="mt-3 ml-2 py-1"
+                class="mt-3 py-1"
+                :class="{ 'ml-4': !notice.securitiesActOrders?.length }"
                 :action="notice.action"
               />
             </span>
@@ -245,6 +246,7 @@
               :order="order"
               :isAmendment="isAmendment"
               :hasRemovedOrders="notice.action === ActionTypes.REMOVED"
+              :hasAddedParentNotice="notice.action === ActionTypes.ADDED"
             >
               <template
                 v-if="!isSummary && notice.action !== ActionTypes.REMOVED"
@@ -476,9 +478,6 @@ const removeOrder = (noticeIndex: number, orderIndex: number) => {
       action: ActionTypes.REMOVED
     }
     setSecuritiesActNoticeOrder(noticeIndex, orderIndex, order)
-
-    // Set Parent Notice Action
-    getSecuritiesActNotices.value[noticeIndex].action = ActionTypes.EDITED
   } else {
     // Remove New/Added Orders
     orders.splice(orderIndex, 1)
@@ -530,7 +529,6 @@ const handleAddEditOrder = (order: CourtOrderIF, orderIndex: number = null, isUn
 /** Reset local form state **/
 const resetFormDefaults = () => {
   // Reset form refs
-  showOrders.value = false
   editOrderIndex.value = -1
   editNotice.value = false
   editOrder.value = false
@@ -554,7 +552,7 @@ const setAndCloseNotice = (isUndo = false): void => {
       const originalNotice = getOriginalSecuritiesActNotices.value[index]
       const isAdded = notice.action === ActionTypes.ADDED
       const isRemoved = notice.action === ActionTypes.REMOVED
-      const isEdited = !isAdded && !isEqual(omit(notice, 'action'), omit(originalNotice, 'action'))
+      const isEdited = !isAdded && !isEqual(notice.effectiveDateTime, originalNotice.effectiveDateTime)
 
       if (isEdited) {
         return { ...notice, action: ActionTypes.EDITED }
diff --git a/ppr-ui/src/components/registration/securities-act-notices/SecuritiesActNoticesPanels.vue b/ppr-ui/src/components/registration/securities-act-notices/SecuritiesActNoticesPanels.vue
index 2b43f5256..eea2799dd 100644
--- a/ppr-ui/src/components/registration/securities-act-notices/SecuritiesActNoticesPanels.vue
+++ b/ppr-ui/src/components/registration/securities-act-notices/SecuritiesActNoticesPanels.vue
@@ -73,7 +73,8 @@ const activePanels = ref([])
 const activeOrderPanel = ref(null)
 const displayNotices = computed((): Array<AddEditSaNoticeIF> => {
   return (props.isSummary && props.isAmendment)
-    ? getSecuritiesActNotices.value.filter((notice: AddEditSaNoticeIF) => !!notice.action)
+    ? getSecuritiesActNotices.value.filter((notice: AddEditSaNoticeIF) => !!notice.action ||
+      notice.securitiesActOrders.some(order => !!order?.action))
     : getSecuritiesActNotices.value
 })
 
diff --git a/ppr-ui/src/composables/fees/factories/useFeeSummary.ts b/ppr-ui/src/composables/fees/factories/useFeeSummary.ts
index c85edd485..843920244 100644
--- a/ppr-ui/src/composables/fees/factories/useFeeSummary.ts
+++ b/ppr-ui/src/composables/fees/factories/useFeeSummary.ts
@@ -72,7 +72,8 @@ export const hasNoChargeAmendment = (val: UIRegistrationTypes): boolean => {
     UIRegistrationTypes.CROWN_SOCIAL_SERVICE_TAX,
     UIRegistrationTypes.TRANSITION_TAX_LIEN,
     UIRegistrationTypes.TOBACCO_TAX,
-    UIRegistrationTypes.SPECULATION_VACANCY_TAX
+    UIRegistrationTypes.SPECULATION_VACANCY_TAX,
+    UIRegistrationTypes.SECURITY_ACT_NOTICE
   ]
   // it will not be in the UIRegistrationTypes enum list if 'Other' was selected
   return hfArray.includes(val) || !Object.values(UIRegistrationTypes).includes(val)
diff --git a/ppr-ui/src/utils/date-helper.ts b/ppr-ui/src/utils/date-helper.ts
index 2e4c4c9c4..5722b0067 100644
--- a/ppr-ui/src/utils/date-helper.ts
+++ b/ppr-ui/src/utils/date-helper.ts
@@ -282,7 +282,7 @@ export const isWithinMinutes = (createDateTime: string, minuteDifferential: numb
  */
 export function convertToISO8601LastMinute(dateStr: string): string {
   // Parse the date string to create a Date object
-  const date = new Date(dateStr + 'T00:00:00-08:00')
+  const date = new Date(dateStr + 'T00:00:00-00:00')
 
   // Set the time to the last minute of the day (23:59:59)
   date.setHours(23, 59, 59, 999)
diff --git a/ppr-ui/src/utils/registration-helper.ts b/ppr-ui/src/utils/registration-helper.ts
index 01b1d7813..368f2ffbf 100644
--- a/ppr-ui/src/utils/registration-helper.ts
+++ b/ppr-ui/src/utils/registration-helper.ts
@@ -65,8 +65,11 @@ export function setAmendmentList (baseList:Array<any>, addList:Array<any>, delet
   notices: Array<AddEditSaNoticeIF>, addNotices: Array<AddEditSaNoticeIF>, deleteNotices: Array<AddEditSaNoticeIF>
 ): { addNotices: Array<AddEditSaNoticeIF>; deleteNotices: Array<AddEditSaNoticeIF> } {
   notices?.forEach(notice => {
-    // Include Added/Amended Notices in ADD block
-    if ([ActionTypes.ADDED, ActionTypes.EDITED].includes(notice?.action)) {
+    // Check for child order edits. Any order changes would result in an amendment to the entire notice
+    const hasOrderChange = notice.securitiesActOrders.some(order => !!order.action)
+
+    // Include Added/Amended Notices or Notices that contain Added/Amended Orders into ADD block
+    if ([ActionTypes.ADDED, ActionTypes.EDITED].includes(notice?.action) || hasOrderChange) {
       // Clean and format notice and orders
       const formattedNotice = {
         ...removeEmptyProperties(notice),
@@ -79,11 +82,12 @@ export function setAmendmentList (baseList:Array<any>, addList:Array<any>, delet
           orderDate: convertToISO8601LastMinute(order.orderDate.split('T')[0])
         }))
       } as AddEditSaNoticeIF
-
       addNotices.push(formattedNotice)
     }
-    // Include Removed/Amended Notices in DELETE block
-    if ([ActionTypes.REMOVED, ActionTypes.EDITED].includes(notice?.action)) deleteNotices.push(notice)
+
+    // Include Removed/Amended Notices or Notices that contain Removed/Amended Orders in DELETE block
+    if ([ActionTypes.REMOVED, ActionTypes.EDITED].includes(notice?.action) ||
+      (notice?.action !== ActionTypes.ADDED && hasOrderChange)) deleteNotices.push(notice)
   })
   return { addNotices, deleteNotices }
 }