Merge pull request #36 from Trendyol/fix/35-unintended-mock-deletion

Fix Unintended mock deletion
Trendyol · Nov 25, 2024 · fbc2e12 · fbc2e12
2 parents 1e6b123 + f40169b
commit fbc2e12
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/Features/MockList/Sources/MockList/MockListView.swift b/Features/MockList/Sources/MockList/MockListView.swift
@@ -206,6 +206,10 @@ public struct MockListView: View {
             Button("Delete", role: .destructive) {
                 viewModel.deleteSelectedMocks()
             }
+        } message: {
+            Text("Deleting selected mocks will also delete all associated mock responses. Are you sure you want to do this?") +
+            Text("\n\n") +
+            Text("You will delete ^[\(viewModel.selected.count) \("mock")](inflect: true).")
         }
         .alert("Error", isPresented: $viewModel.shouldShowErrorMessage, actions: {
             Button("Ok", role: .cancel, action: { })

diff --git a/Features/MockList/Sources/MockList/MockListViewModel.swift b/Features/MockList/Sources/MockList/MockListViewModel.swift
@@ -108,6 +108,13 @@ public final class MockListViewModel {
 
             try Task.checkCancellation()
 
+            /// Find selected mocks, remove them if they are not included in the new UI list.
+            selected
+                .filter { id in !filteredMocks.contains(where: { $0.id == id }) }
+                .forEach { selected.remove($0) }
+
+            try Task.checkCancellation()
+
             try await MainActor.run {
                 try Task.checkCancellation()
                 mockListUIModel = filteredMocks.sorted(using: sortOrder)

diff --git a/Features/MockList/Sources/MockList/Resources/Localizable.xcstrings b/Features/MockList/Sources/MockList/Resources/Localizable.xcstrings
@@ -1,6 +1,9 @@
 {
   "sourceLanguage" : "en",
   "strings" : {
+    "\n\n" : {
+
+    },
     "Are you sure?" : {
 
     },
@@ -9,6 +12,9 @@
     },
     "Delete" : {
 
+    },
+    "Deleting selected mocks will also delete all associated mock responses. Are you sure you want to do this?" : {
+
     },
     "Error" : {
 
@@ -63,6 +69,16 @@
     },
     "Unselect All Mocks" : {
 
+    },
+    "You will delete ^[%lld %@](inflect: true)." : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "You will delete ^[%1$lld %2$@](inflect: true)."
+          }
+        }
+      }
     }
   },
   "version" : "1.0"