Improve selection handling when editing workflows

- Improve the logic behind the selection when workflows are updated, moved or deleted.
zenangst · Jan 11, 2021 · 6d33313 · 6d33313
1 parent 918df8c
commit 6d33313
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/App/Sources/Features/GroupsFeatureController.swift b/App/Sources/Features/GroupsFeatureController.swift
@@ -44,6 +44,11 @@ final class GroupsFeatureController: ActionController,
 
   // MARK: Private methods
 
+  private func setSelectionToWorkflow(_ workflow: Workflow) {
+    workflowSelection = workflow.id
+    workflowSelections = workflowSelection
+  }
+
   private func reload(_ groups: [ModelKit.Group]) {
     groupsController.reloadGroups(groups)
     subject.send(groups)
@@ -130,8 +135,8 @@ final class GroupsFeatureController: ActionController,
     group.workflows.add(workflow)
     try groups.replace(group)
     reload(groups)
-    workflowSelection = group.workflows.last?.id
-    workflowSelections = workflowSelection
+    controller.workflowController.perform(.set(workflow: workflow))
+    setSelectionToWorkflow(workflow)
   }
 
   func workflowsFeatureController(_ controller: WorkflowsFeatureController,
@@ -149,6 +154,13 @@ final class GroupsFeatureController: ActionController,
                                   didDeleteWorkflow workflow: Workflow) throws {
     var group = try findGroup(for: workflow)
     var groups = self.groupsController.groups
+    var newOffset: Int = 0
+
+    if let index = group.workflows.firstIndex(of: workflow),
+       group.workflows.count > 1 {
+      newOffset = max(index - 1, 0)
+    }
+
     try group.workflows.remove(workflow)
     try groups.replace(group)
     reload(groups)
@@ -158,6 +170,12 @@ final class GroupsFeatureController: ActionController,
       array.remove(at: index)
       self.workflowSelections = array.joined(separator: ",")
     }
+
+    if !group.workflows.isEmpty {
+      let workflow = group.workflows[newOffset]
+      controller.workflowController.perform(.set(workflow: workflow))
+      setSelectionToWorkflow(workflow)
+    }
   }
 
   func workflowsFeatureController(_ controller: WorkflowsFeatureController,
@@ -180,9 +198,14 @@ final class GroupsFeatureController: ActionController,
     group.workflows.add(workflow)
     try groups.replace(group)
     reload(groups)
+
+    controller.workflowController.perform(.set(workflow: workflow))
+    setSelectionToWorkflow(workflow)
   }
 
-  func workflowsFeatureController(_ controller: WorkflowsFeatureController, didTransferWorkflowIds workflowIds: Set<String>, toGroup group: ModelKit.Group) throws {
+  func workflowsFeatureController(_ controller: WorkflowsFeatureController,
+                                  didTransferWorkflowIds workflowIds: Set<String>,
+                                  toGroup group: ModelKit.Group) throws {
     var newGroup = group
     guard let groupId = groupSelection,
       var currentGroup = groupsController.groups.first(where: { $0.id == groupId }) else {

diff --git a/project.yml b/project.yml
@@ -44,9 +44,9 @@ targets:
       base:
         ASSETCATALOG_COMPILER_APPICON_NAME: "AppIcon"
         CODE_SIGN_IDENTITY: "-"
-        CURRENT_PROJECT_VERSION: 24
+        CURRENT_PROJECT_VERSION: 25
         INFOPLIST_FILE: "App/Resources/Info.plist"
-        MARKETING_VERSION: 0.7.1
+        MARKETING_VERSION: 0.7.2
         PRODUCT_BUNDLE_IDENTIFIER: "com.zenangst.Keyboard-Cowboy"
         PRODUCT_NAME: "Keyboard Cowboy"
         ENABLE_HARDENED_RUNTIME: true