From 368b9285225b430666bb7d2513c92baf060a7045 Mon Sep 17 00:00:00 2001
From: mheggelund <maohe@equinor.com>
Date: Tue, 6 Feb 2024 15:34:41 +0100
Subject: [PATCH] fix: Model area select bug. Delete case bug.

---
 src/features/Compute/CaseGroup/CaseGroup.tsx       | 4 ++--
 src/features/Compute/CaseGroup/CaseRow/CaseRow.tsx | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/features/Compute/CaseGroup/CaseGroup.tsx b/src/features/Compute/CaseGroup/CaseGroup.tsx
index c296c91b..025ac9f2 100644
--- a/src/features/Compute/CaseGroup/CaseGroup.tsx
+++ b/src/features/Compute/CaseGroup/CaseGroup.tsx
@@ -375,7 +375,7 @@ export const CaseGroup = ({
               {caseList.concat(localList).map((c, index) => (
                 <CaseRow
                   rowCase={c}
-                  key={index}
+                  key={c.computeCaseId}
                   id={c.computeCaseId}
                   allCasesList={caseList.concat(localList)}
                   caseList={caseList}
@@ -394,7 +394,7 @@ export const CaseGroup = ({
               {caseList.concat(filerLocalList(methodName)).map((c, index) => (
                 <CaseRow
                   rowCase={c}
-                  key={index}
+                  key={c.computeCaseId}
                   id={c.computeCaseId}
                   allCasesList={caseList.concat(localList)}
                   caseList={caseList}
diff --git a/src/features/Compute/CaseGroup/CaseRow/CaseRow.tsx b/src/features/Compute/CaseGroup/CaseRow/CaseRow.tsx
index 63a560be..9b05d6da 100644
--- a/src/features/Compute/CaseGroup/CaseRow/CaseRow.tsx
+++ b/src/features/Compute/CaseGroup/CaseRow/CaseRow.tsx
@@ -279,7 +279,6 @@ export const CaseRow = ({
 
         if (
           row[0] !== undefined &&
-          row[0].modelArea !== null &&
           selectedModelArea &&
           selectedModelArea[0].modelAreaId !== ''
         ) {
@@ -362,7 +361,11 @@ export const CaseRow = ({
       // and if the existing case model area has an empty string as id. Returns the selected area.
       // 4. Returns the set area. If all 3 above checks is fails the default empty area is returned.
 
-      if (rowCase.length > 0 && rowCase[0].modelArea === null) {
+      if (
+        rowCase.length > 0 &&
+        rowCase[0].modelArea === null &&
+        selectedModelArea === undefined
+      ) {
         defaultArea = [
           {
             modelAreaId: '',