Change type fix (Writeopia#409)

leandroBorgesFerreira · Leandro Ferreira · web-flow · commit 4277a7ea63e4 · 2025-04-17T18:41:02.000+02:00
* Fixing redo of type change of multiple stories

* signature for bulk change

* adding bulk changes

---------

Co-authored-by: Leandro Ferreira &lt;email@email.com&gt;
diff --git a/writeopia/src/commonMain/kotlin/io/writeopia/sdk/manager/ContentHandler.kt b/writeopia/src/commonMain/kotlin/io/writeopia/sdk/manager/ContentHandler.kt
@@ -80,12 +80,38 @@ class ContentHandler(
         position: Int,
         commandInfo: CommandInfo?
     ): StoryState {
+        val newMap = changeType(currentStory, typeInfo, position, commandInfo)
+        return StoryState(newMap, LastEdit.Whole, position)
+    }
+
+    fun bulkChangeStoryType(
+        currentStory: Map<Int, StoryStep>,
+        change: Iterable<Pair<Int, TypeInfo>>
+    ): StoryState {
+        val newMap = change.fold(currentStory) { acc, (position, typeInfo) ->
+            changeType(
+                currentStory = acc,
+                typeInfo = typeInfo,
+                position = position,
+                commandInfo = null
+            )
+        }
+
+        return StoryState(newMap, LastEdit.Whole)
+    }
+
+    private fun changeType(
+        currentStory: Map<Int, StoryStep>,
+        typeInfo: TypeInfo,
+        position: Int,
+        commandInfo: CommandInfo?
+    ): Map<Int, StoryStep> {
         val newMap = currentStory.toMutableMap()
         val storyStep = newMap[position]
         val commandTrigger = commandInfo?.commandTrigger
         val commandText = commandInfo?.command?.commandText?.trim() ?: ""
 
-        if (storyStep != null) {
+        return if (storyStep != null) {
             val storyText = storyStep.text
             val newText = if (
                 commandTrigger == CommandTrigger.WRITTEN &&
@@ -116,9 +142,10 @@ class ContentHandler(
             }
 
             newMap[position] = newCheck
+            newMap
+        } else {
+            currentStory
         }
-
-        return StoryState(newMap, LastEdit.Whole, position)
     }
 
     private fun Set<TagInfo>.merge(tagInfo: Set<TagInfo>): Set<TagInfo> =
diff --git a/writeopia/src/commonMain/kotlin/io/writeopia/sdk/manager/WriteopiaManager.kt b/writeopia/src/commonMain/kotlin/io/writeopia/sdk/manager/WriteopiaManager.kt
@@ -136,12 +136,25 @@ class WriteopiaManager(
     fun changeStoryState(
         stateChange: Action.StoryStateChange,
         storyState: StoryState
-    ): StoryState? =
+    ): StoryState =
         contentHandler.changeStoryStepState(
             storyState.stories,
             stateChange.storyStep,
             stateChange.position
-        )
+        ) ?: storyState
+
+    fun bulkChangeStoryState(
+        storyState: StoryState,
+        stateChange: Iterable<Action.StoryStateChange>,
+    ): StoryState {
+        val mutable = storyState.stories.toMutableMap()
+
+        stateChange.forEach { change ->
+            mutable[change.position] = change.storyStep
+        }
+
+        return StoryState(mutable, lastEdit = LastEdit.Whole)
+    }
 
     /**
      * Changes the story type. The type of a messages changes without changing the content of it.
@@ -165,6 +178,11 @@ class WriteopiaManager(
             commandInfo
         )
 
+    fun bulkChangeStoryType(
+        storyState: StoryState,
+        change: Iterable<Pair<Int, TypeInfo>>
+    ): StoryState = contentHandler.bulkChangeStoryType(storyState.stories, change)
+
     /**
      * Removes all tags from a story step
      */
diff --git a/writeopia_ui/src/commonMain/kotlin/io/writeopia/ui/manager/WriteopiaStateManager.kt b/writeopia_ui/src/commonMain/kotlin/io/writeopia/ui/manager/WriteopiaStateManager.kt
@@ -1021,48 +1021,45 @@ class WriteopiaStateManager(
     private fun toggleStateForStories(onEdit: Set<Int>, storyTypes: StoryTypes) {
         val currentStories = currentStory.value.stories
 
-        onEdit.map { position -> position to currentStories[position] }
+        trackState()
+
+        val change = onEdit.map { position -> position to currentStories[position] }
             .filter { (_, story) -> story != null && !permanentTypes.contains(story.type.number) }
-            .forEach { (position, story) ->
-                story!!
-                val newType = if (story.type == storyTypes.type) {
+            .map { (position, story) ->
+                val newType = if (story?.type == storyTypes.type) {
                     StoryTypes.TEXT
                 } else {
                     storyTypes
                 }
 
-                changeStoryState(
-                    Action.StoryStateChange(
-                        storyStep = story.copy(type = newType.type),
-                        position = position,
-                    )
-                )
+                position to TypeInfo(newType.type)
             }
+
+        _currentStory.value =
+            writeopiaManager.bulkChangeStoryType(_currentStory.value, change = change)
     }
 
     private fun toggleTagForStories(
         onEdit: Set<Int>,
         tag: TagInfo,
         currentStories: Map<Int, StoryStep> = currentStory.value.stories
     ) {
-        onEdit.forEach { position ->
-            val story = currentStories[position]
-            if (story != null) {
-                val currentTags = story.tags
+        trackState()
+
+        val change = onEdit.map { position -> position to currentStories[position] }
+            .filter { (_, story) -> story != null && !permanentTypes.contains(story.type.number) }
+            .map { (position, story) ->
+                val currentTags = story!!.tags
                 val newTags = if (currentTags.contains(tag)) {
                     currentTags.filterNot { it.tag == tag.tag }.toSet()
                 } else {
                     currentTags + tag
                 }
 
-                changeStoryState(
-                    Action.StoryStateChange(
-                        storyStep = story.copy(tags = newTags),
-                        position = position,
-                    )
-                )
+                Action.StoryStateChange(story.copy(tags = newTags), position)
             }
-        }
+
+        _currentStory.value = writeopiaManager.bulkChangeStoryState(_currentStory.value, change)
     }
 
     private fun changeCurrentStoryType(storyTypes: StoryTypes) {
diff --git a/writeopia_ui/src/commonTest/kotlin/io/writeopia/ui/manager/WriteopiaStateManagerTest.kt b/writeopia_ui/src/commonTest/kotlin/io/writeopia/ui/manager/WriteopiaStateManagerTest.kt
@@ -523,7 +523,7 @@ class WriteopiaStateManagerTest {
     }
 
     @Test
-    @Ignore("This should be fixed later")
+    @Ignore // This should be fixed later
     fun itShouldBePossibleToRevertMove() = runTest {
         val now = Clock.System.now()
 

Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,7 @@ class WriteopiaStateManagerTest {`
`523`	`523`	`}`
`524`	`524`
`525`	`525`	`@Test`
`526`		`- @Ignore("This should be fixed later")`
	`526`	`+ @Ignore // This should be fixed later`
`527`	`527`	`fun itShouldBePossibleToRevertMove() = runTest {`
`528`	`528`	`val now = Clock.System.now()`
`529`	`529`