RWejlgaard/org
1
0
Fork 0
mirror of https://github.com/RWejlgaard/org.git synced 2026-09-02 01:15:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

consolidate AddState and AddDoneState

Browse source
This commit is contained in:
Taybin Rutkin 2026-07-22 10:39:42 -04:00
parent 58ffd98249
commit 98a55ce534
No known key found for this signature in database
GPG key ID: 605FA2C570B6AC9E
3 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
internal/config/config.go
View file

@ -486,28 +486,17 @@ func (c *Config) GetStateColor(stateName string) string {
return "99" return "99"
} }
// AddState adds a new state to the configuration // AddState adds (or upgrades) a state in the configuration, marking it as a
func (c *Config) AddState(name, color string) { // done state when done is true.
// Check if state already exists func (c *Config) AddState(name, color string, done bool) {
for i, state := range c.States.States {
if state.Name == name {
c.States.States[i].Color = color
return
}
}
c.States.States = append(c.States.States, StateConfig{Name: name, Color: color})
}
// AddDoneState adds (or upgrades) a state and marks it as a done state.
func (c *Config) AddDoneState(name, color string) {
for i := range c.States.States { for i := range c.States.States {
if c.States.States[i].Name == name { if c.States.States[i].Name == name {
c.States.States[i].Color = color c.States.States[i].Color = color
c.States.States[i].Done = true c.States.States[i].Done = done
return return
} }
} }
c.States.States = append(c.States.States, StateConfig{Name: name, Color: color, Done: true}) c.States.States = append(c.States.States, StateConfig{Name: name, Color: color, Done: done})
} }
// RemoveState removes a state from the configuration // RemoveState removes a state from the configuration

6
internal/config/config_test.go
View file

@ -52,7 +52,7 @@ func TestFillDefaultsLeavesExplicitDoneFlagsAlone(t *testing.T) {
func TestAddDoneState(t *testing.T) { func TestAddDoneState(t *testing.T) {
c := &Config{} c := &Config{}
c.AddDoneState("CANCELLED", "240") c.AddState("CANCELLED", "240", true)
if len(c.States.States) != 1 { if len(c.States.States) != 1 {
t.Fatalf("expected 1 state, got %d", len(c.States.States)) t.Fatalf("expected 1 state, got %d", len(c.States.States))
@ -63,8 +63,8 @@ func TestAddDoneState(t *testing.T) {
} }
// Adding an existing name upgrades it to done. // Adding an existing name upgrades it to done.
c.AddState("REVIEW", "99") c.AddState("REVIEW", "99", false)
c.AddDoneState("REVIEW", "99") c.AddState("REVIEW", "99", true)
for _, st := range c.States.States { for _, st := range c.States.States {
if st.Name == "REVIEW" && !st.Done { if st.Name == "REVIEW" && !st.Done {
t.Fatal("expected REVIEW upgraded to done") t.Fatal("expected REVIEW upgraded to done")

6
internal/ui/stateform.go
View file

@ -108,11 +108,7 @@ func (m *uiModel) applyStateForm() bool {
if color == "" { if color == "" {
color = "99" color = "99"
} }
if sf.done { m.config.AddState(name, color, sf.done)
m.config.AddDoneState(name, color)
} else {
m.config.AddState(name, color)
}
m.setStatus(fmt.Sprintf("Added state '%s' (saved)", name)) m.setStatus(fmt.Sprintf("Added state '%s' (saved)", name))
return true return true
} }