Notice/Order Panel Orders and Optional Date Format (#1900)

* Reverse Add Notice Order and Optional Date Format * clean up
bcgov · May 28, 2024 · 9e217a1 · 9e217a1
1 parent 1b8fef6
commit 9e217a1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/ppr-ui/src/components/registration/securities-act-notices/NoticePanel.vue b/ppr-ui/src/components/registration/securities-act-notices/NoticePanel.vue
@@ -392,7 +392,7 @@ const handleAddEditOrder = (order: CourtOrderIF): void => {
     getSecuritiesActNotices.value[props.noticeIndex].securitiesActOrders[editOrderIndex.value] = order
   } else {
     // Set add Court Order
-    getSecuritiesActNotices.value[props.noticeIndex].securitiesActOrders.unshift(order)
+    getSecuritiesActNotices.value[props.noticeIndex].securitiesActOrders.push(order)
   }
   setAndCloseNotice()
   showOrders.value = true

diff --git a/ppr-ui/src/components/registration/securities-act-notices/SecuritiesActNotices.vue b/ppr-ui/src/components/registration/securities-act-notices/SecuritiesActNotices.vue
@@ -76,7 +76,7 @@ const disableAddNotice = ref(false)
 const handleAddNotice = (notice: AddEditSaNoticeIF) => {
   openAddNotice.value = false
   // Set add edit notices
-  setSecuritiesActNotices([notice, ...getSecuritiesActNotices.value])
+  setSecuritiesActNotices([...getSecuritiesActNotices.value, notice])
 }
 </script>
 <style lang="scss" scoped>

diff --git a/ppr-ui/src/utils/registration-helper.ts b/ppr-ui/src/utils/registration-helper.ts
@@ -386,7 +386,9 @@ export async function saveFinancingStatementDraft (stateModel:StateModelIF): Pro
 const formatSecuritiesActNotices = (notices: Array<AddEditSaNoticeIF>): Array<AddEditSaNoticeIF> => {
   return cloneDeep(notices).map(notice => ({
     ...removeEmptyProperties(notice),
-    effectiveDateTime: convertToISO8601LastMinute(notice.effectiveDateTime),
+    ...(!!notice.effectiveDateTime && {
+      effectiveDateTime: convertToISO8601LastMinute(notice.effectiveDateTime)
+    }),
     securitiesActOrders: notice.securitiesActOrders?.map(order => ({
       ...removeEmptyProperties(order),
       orderDate: convertToISO8601LastMinute(order.orderDate)