fix: better handling of filtering mode

Cleanup of unused files.
dhth · Mar 12, 2024 · d55733a · d55733a
1 parent 486cb38
commit d55733a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 133 deletions.
diff --git a/ui/LICENSE → LICENSE b/ui/LICENSE → LICENSE
diff --git a/db/db.go b/db/db.go
diff --git a/ui/types.go b/ui/types.go
@@ -20,7 +20,7 @@ func (issue Issue) Description() string {
 	issueType := getIssueTypeStyle(issue.IssueType).Render(Trim(issue.IssueType, 20))
 	return fmt.Sprintf("%s%s", RightPadTrim(issue.IssueKey, listWidth-40), issueType)
 }
-func (issue Issue) FilterValue() string { return issue.IssueKey }
+func (issue Issue) FilterValue() string { return issue.IssueKey + " : " + issue.Summary }
 
 type WorklogEntry struct {
 	Id             int

diff --git a/ui/update.go b/ui/update.go
@@ -95,23 +95,25 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case "s":
 			switch m.activeView {
 			case IssueListView:
-				if m.changesLocked {
-					message := "Changes locked momentarily"
-					m.message = message
-					m.messages = append(m.messages, message)
-					return m, tea.Batch(cmds...)
-				}
-				issue, ok := m.issueList.SelectedItem().(Issue)
-				if !ok {
-					message := "Something went horribly wrong"
-					m.message = message
-					m.messages = append(m.messages, message)
-				} else {
-					if m.lastChange == UpdateChange {
-						m.changesLocked = true
-						cmds = append(cmds, toggleTracking(m.db, issue.IssueKey, ""))
-					} else if m.lastChange == InsertChange {
-						m.activeView = AskForCommentView
+				if m.issueList.FilterState() != list.Filtering {
+					if m.changesLocked {
+						message := "Changes locked momentarily"
+						m.message = message
+						m.messages = append(m.messages, message)
+						return m, tea.Batch(cmds...)
+					}
+					issue, ok := m.issueList.SelectedItem().(Issue)
+					if !ok {
+						message := "Something went horribly wrong"
+						m.message = message
+						m.messages = append(m.messages, message)
+					} else {
+						if m.lastChange == UpdateChange {
+							m.changesLocked = true
+							cmds = append(cmds, toggleTracking(m.db, issue.IssueKey, ""))
+						} else if m.lastChange == InsertChange {
+							m.activeView = AskForCommentView
+						}
 					}
 				}
 			case WorklogView:
@@ -214,6 +216,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case WLAddedOnJIRA:
 		if msg.err != nil {
 			msg.entry.Error = msg.err
+            m.worklogList.SetItem(msg.index, msg.entry)
 			m.messages = append(m.messages, msg.err.Error())
 		} else {
 			msg.entry.Synced = true