Merge pull request #1480 from shaangill025/20999_auto_add_conflict

20999 - Auto Add Fix: Make Initial Conflicts List Immutable
bcgov · Jun 26, 2024 · 7fc1660 · 7fc1660
2 parents 22126b6 + 5af3f9e
commit 7fc1660
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-examination",
-  "version": "1.2.20",
+  "version": "1.2.21",
   "private": true,
   "scripts": {
     "build": "nuxt generate",

diff --git a/app/store/examine/conflicts.ts b/app/store/examine/conflicts.ts
@@ -339,9 +339,12 @@ export const useConflicts = defineStore('conflicts', () => {
   /** Reset selectedConflicts and comparedConflicts and save existing data */
   function disableAutoAdd () {
     if (!autoAdd.value) {
+      const initialRun = (prevSelectedConflicts.value.length === 0 && prevComparedConflicts.value.length === 0)
       for (const conflict of selectedConflicts.value) {
-        prevSelectedConflicts.value.push(conflict)
-        prevComparedConflicts.value.push(conflict)
+        if (initialRun) {
+          prevSelectedConflicts.value.push(conflict)
+          prevComparedConflicts.value.push(conflict)
+        }
         const notConflict = (c: ConflictListItem) =>
           c.nrNumber !== conflict.nrNumber
         selectedConflicts.value = selectedConflicts.value.filter(notConflict)
@@ -355,8 +358,6 @@ export const useConflicts = defineStore('conflicts', () => {
     if (autoAdd.value) {
       selectedConflicts.value = prevSelectedConflicts.value
       comparedConflicts.value = prevComparedConflicts.value
-      prevSelectedConflicts.value = []
-      prevComparedConflicts.value = []
     }
   }