Merge pull request #588 from ArwenQin/16500-Fix-Restoration-Applicati…

…on-Bug

16500 - Fixed Restoration People Section Bug

package.json

@@ -1,6 +1,6 @@
 {
   "name": "business-edit-ui",
-  "version": "4.10.10",
+  "version": "4.10.11",
   "private": true,
   "appName": "Edit UI",
   "sbcName": "SBC Common Components",

src/mixins/filing-template-mixin.ts

@@ -389,12 +389,24 @@ export default class FilingTemplateMixin extends DateMixin {
           identifier: this.getBusinessId,
           legalType: this.getEntityType
         },
-        parties: this.getOrgPeople,
+        parties: null, // applied below
         offices: this.getOfficeAddresses,
         contactPoint: this.getContactPoint
       }
     }
+    // Apply parties to filing
+    {
+      // make a copy so we don't change original array
+      let parties = cloneDeep(this.getOrgPeople)
+
+      // prepare parties
+      parties = isDraft ? parties : this.prepareParties(parties)
+
+      // fix schema issues
+      parties = this.fixPartySchemaIssues(parties)
 
+      filing.restoration.parties = parties
+    }
     // Set relationships object for a full restoration only
     if (this.isLimitedRestorationToFull) {
       filing.restoration.relationships = this.getRestoration.relationships

src/views/LimitedRestorationExtension.vue

@@ -112,7 +112,6 @@
 <script lang="ts">
 import { Component, Emit, Mixins, Prop, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
-import { v4 as uuidv4 } from 'uuid'
 import { cloneDeep } from 'lodash'
 import { GetFeatureFlag } from '@/utils/'
 import RestorationSummary from '@/components/Restoration/RestorationSummary.vue'
@@ -335,10 +334,8 @@ export default class LimitedRestorationExtension extends Mixins(
       throw new Error(`Applicant not found for ${this.getBusinessId}`)
     }
 
-    // make a copy of the original object and assign a new id (for UI use only)
+    // make a copy of the original object
     const copy = cloneDeep(applicant)
-    copy.officer.id = uuidv4()
-
     return copy
   }
 

src/views/LimitedRestorationToFull.vue

@@ -139,7 +139,6 @@
 <script lang="ts">
 import { Component, Emit, Mixins, Prop, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
-import { v4 as uuidv4 } from 'uuid'
 import { cloneDeep } from 'lodash'
 import { GetFeatureFlag } from '@/utils/'
 import RestorationSummary from '@/components/Restoration/RestorationSummary.vue'
@@ -364,10 +363,8 @@ export default class LimitedRestorationToFull extends Mixins(
       throw new Error(`Applicant not found for ${this.getBusinessId}`)
     }
 
-    // make a copy of the original object and assign a new id (for UI use only)
+    // make a copy of the original object
     const copy = cloneDeep(applicant)
-    copy.officer.id = uuidv4()
-
     return copy
   }