From eafc05b6459e505128a4c57394f8b2fbe9163c71 Mon Sep 17 00:00:00 2001
From: Toan Do <toando@Toans-MacBook-Pro.local>
Date: Wed, 30 Sep 2020 17:54:48 -0400
Subject: [PATCH 1/3] fixed updateTrackAssignment for edit btn

---
 .../System/containers/Firmware/index.js           | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/containers/System/containers/Firmware/index.js b/app/containers/System/containers/Firmware/index.js
index 2e908a4..0379fec 100644
--- a/app/containers/System/containers/Firmware/index.js
+++ b/app/containers/System/containers/Firmware/index.js
@@ -85,6 +85,21 @@ const Firmware = () => {
     createdTimestamp,
     lastModifiedTimestamp
   ) => {
+    trackAssignmentData.getAllFirmwareTrackAssignment.forEach((element, index) => {
+      if (element.modelId === modelId) {
+        const prevFirmwareVersionRecordId =
+          trackAssignmentData.getAllFirmwareTrackAssignment[index].firmwareVersionRecordId;
+        const prevTrackRecordId =
+          trackAssignmentData.getAllFirmwareTrackAssignment[index].trackRecordId;
+        deleteTrackAssignment({
+          variables: {
+            firmwareTrackId: prevTrackRecordId,
+            firmwareVersionId: prevFirmwareVersionRecordId,
+          },
+        });
+      }
+    });
+
     updateTrackAssignment({
       variables: {
         trackRecordId: firmwareTrackData.getFirmwareTrack.recordId,

From fbfd4895b1b1fbe601674f42b904e1044b2503da Mon Sep 17 00:00:00 2001
From: Toan Do <toando@Toans-MacBook-Pro.local>
Date: Thu, 1 Oct 2020 13:10:55 -0400
Subject: [PATCH 2/3] updated condtion for updateTrackAssignment

---
 app/containers/System/containers/Firmware/index.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/containers/System/containers/Firmware/index.js b/app/containers/System/containers/Firmware/index.js
index 0379fec..cae0a7c 100644
--- a/app/containers/System/containers/Firmware/index.js
+++ b/app/containers/System/containers/Firmware/index.js
@@ -91,12 +91,14 @@ const Firmware = () => {
           trackAssignmentData.getAllFirmwareTrackAssignment[index].firmwareVersionRecordId;
         const prevTrackRecordId =
           trackAssignmentData.getAllFirmwareTrackAssignment[index].trackRecordId;
-        deleteTrackAssignment({
-          variables: {
-            firmwareTrackId: prevTrackRecordId,
-            firmwareVersionId: prevFirmwareVersionRecordId,
-          },
-        });
+        if (prevFirmwareVersionRecordId !== firmwareVersionRecordId) {
+          deleteTrackAssignment({
+            variables: {
+              firmwareTrackId: prevTrackRecordId,
+              firmwareVersionId: prevFirmwareVersionRecordId,
+            },
+          });
+        }
       }
     });
 

From 229d50f1a89f80f49ee9de4993be1acfab68a87b Mon Sep 17 00:00:00 2001
From: Toan Do <toando@Toans-MacBook-Pro.local>
Date: Wed, 7 Oct 2020 14:41:00 -0400
Subject: [PATCH 3/3] Added parameter to handleUpdateTrack

---
 .../System/containers/Firmware/index.js       | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/app/containers/System/containers/Firmware/index.js b/app/containers/System/containers/Firmware/index.js
index cae0a7c..bc92dfa 100644
--- a/app/containers/System/containers/Firmware/index.js
+++ b/app/containers/System/containers/Firmware/index.js
@@ -83,24 +83,17 @@ const Firmware = () => {
     firmwareVersionRecordId,
     modelId,
     createdTimestamp,
-    lastModifiedTimestamp
+    lastModifiedTimestamp,
+    prevFirmwareVersionRecordId
   ) => {
-    trackAssignmentData.getAllFirmwareTrackAssignment.forEach((element, index) => {
-      if (element.modelId === modelId) {
-        const prevFirmwareVersionRecordId =
-          trackAssignmentData.getAllFirmwareTrackAssignment[index].firmwareVersionRecordId;
-        const prevTrackRecordId =
-          trackAssignmentData.getAllFirmwareTrackAssignment[index].trackRecordId;
-        if (prevFirmwareVersionRecordId !== firmwareVersionRecordId) {
-          deleteTrackAssignment({
-            variables: {
-              firmwareTrackId: prevTrackRecordId,
-              firmwareVersionId: prevFirmwareVersionRecordId,
-            },
-          });
-        }
-      }
-    });
+    if (prevFirmwareVersionRecordId !== firmwareVersionRecordId) {
+      deleteTrackAssignment({
+        variables: {
+          firmwareTrackId: firmwareTrackData.getFirmwareTrack.recordId,
+          firmwareVersionId: prevFirmwareVersionRecordId,
+        },
+      });
+    }
 
     updateTrackAssignment({
       variables: {