feat(deck-picker): make 'empty filtered' undoable

david-allison · Jan 16, 2025 · 3817bc6 · 3817bc6
1 parent 89e0006
commit 3817bc6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
@@ -2662,7 +2662,7 @@ open class DeckPicker :
         changes: OpChanges,
         handler: Any?,
     ) {
-        if (changes.studyQueues && handler !== this) {
+        if (changes.studyQueues && handler !== this && handler !== viewModel) {
             invalidateOptionsMenu()
             if (!activityPaused) {
                 // No need to update while the activity is paused, because `onResume` calls `refreshState` that calls `updateDeckList`.

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/deckpicker/DeckPickerViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/deckpicker/DeckPickerViewModel.kt
@@ -102,12 +102,11 @@ class DeckPickerViewModel : ViewModel() {
         }
 
     // TODO: move withProgress to the ViewModel, so we don't return 'Job'
-    // TODO: undoableOp { } on emptyDyn
     fun emptyFilteredDeck(deckId: DeckId): Job =
         viewModelScope.launch {
             Timber.i("empty filtered deck %s", deckId)
             withCol { decks.select(deckId) }
-            withCol { sched.emptyDyn(decks.selected()) }
+            undoableOp { sched.emptyDyn(decks.selected()) }
             flowOfDeckCountsChanged.emit(Unit)
         }
 }

diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/sched/Scheduler.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/sched/Scheduler.kt
@@ -449,9 +449,7 @@ open class Scheduler(
     /** Remove all cards from a dynamic deck
      * @param did The deck to empty. 0 means current deck.
      */
-    open fun emptyDyn(did: DeckId) {
-        col.backend.emptyFilteredDeck(did)
-    }
+    open fun emptyDyn(did: DeckId) = col.backend.emptyFilteredDeck(did)
 
     fun deckDueTree(): DeckNode = deckTree(true)
 

diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/DeckPickerViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/DeckPickerViewModelTest.kt
@@ -116,6 +116,21 @@ class DeckPickerViewModelTest : RobolectricTest() {
         }
     }
 
+    @Test
+    fun `empty filtered - undoable`() {
+        runTest {
+            val filteredDeckId = moveAllCardsToFilteredDeck()
+
+            // ChangeManager assert
+            ensureOpsExecuted(1) {
+                viewModel.emptyFilteredDeck(filteredDeckId).join()
+            }
+
+            // backend assert
+            assertThat("col undo status", col.undoStatus().undo, equalTo("Empty"))
+        }
+    }
+
     @CheckResult
     private suspend fun createEmptyCards(): List<CardId> {
         addNoteUsingNoteTypeName("Cloze", "{{c1::Hello}} {{c2::World}}", "").apply {