feat(config): add ability to set layout config per section

dlvhdr · Sep 25, 2022 · dc77cf8 · dc77cf8
1 parent 9f2b33e
commit dc77cf8
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 17 deletions.
diff --git a/config/parser.go b/config/parser.go
@@ -33,6 +33,20 @@ type SectionConfig struct {
 	Limit   *int `yaml:"limit,omitempty"`
 }
 
+type PrsSectionConfig struct {
+	Title   string
+	Filters string
+	Limit   *int            `yaml:"limit,omitempty"`
+	Layout  PrsLayoutConfig `yaml:"layout,omitempty"`
+}
+
+type IssuesSectionConfig struct {
+	Title   string
+	Filters string
+	Limit   *int               `yaml:"limit,omitempty"`
+	Layout  IssuesLayoutConfig `yaml:"layout,omitempty"`
+}
+
 type PreviewConfig struct {
 	Open  bool
 	Width int
@@ -127,13 +141,13 @@ type ThemeConfig struct {
 }
 
 type Config struct {
-	PRSections     []SectionConfig   `yaml:"prSections"`
-	IssuesSections []SectionConfig   `yaml:"issuesSections"`
-	Defaults       Defaults          `yaml:"defaults"`
-	Keybindings    Keybindings       `yaml:"keybindings"`
-	RepoPaths      map[string]string `yaml:"repoPaths"`
-	Theme          *ThemeConfig      `yaml:"theme,omitempty" validate:"omitempty,dive"`
-	Pager          Pager             `yaml:"pager"`
+	PRSections     []PrsSectionConfig    `yaml:"prSections"`
+	IssuesSections []IssuesSectionConfig `yaml:"issuesSections"`
+	Defaults       Defaults              `yaml:"defaults"`
+	Keybindings    Keybindings           `yaml:"keybindings"`
+	RepoPaths      map[string]string     `yaml:"repoPaths"`
+	Theme          *ThemeConfig          `yaml:"theme,omitempty" validate:"omitempty,dive"`
+	Pager          Pager                 `yaml:"pager"`
 }
 
 type configError struct {
@@ -185,7 +199,7 @@ func (parser ConfigParser) getDefaultConfig() Config {
 				},
 			},
 		},
-		PRSections: []SectionConfig{
+		PRSections: []PrsSectionConfig{
 			{
 				Title:   "My Pull Requests",
 				Filters: "is:open author:@me",
@@ -199,7 +213,7 @@ func (parser ConfigParser) getDefaultConfig() Config {
 				Filters: "is:open involves:@me -author:@me",
 			},
 		},
-		IssuesSections: []SectionConfig{
+		IssuesSections: []IssuesSectionConfig{
 			{
 				Title:   "My Issues",
 				Filters: "is:open author:@me",

diff --git a/config/utils.go b/config/utils.go
@@ -26,3 +26,19 @@ func (cfg Config) GetFullScreenDiffPagerEnv() []string {
 
 	return env
 }
+
+func (cfg PrsSectionConfig) ToSectionConfig() SectionConfig {
+	return SectionConfig{
+		Title:   cfg.Title,
+		Filters: cfg.Filters,
+		Limit:   cfg.Limit,
+	}
+}
+
+func (cfg IssuesSectionConfig) ToSectionConfig() SectionConfig {
+	return SectionConfig{
+		Title:   cfg.Title,
+		Filters: cfg.Filters,
+		Limit:   cfg.Limit,
+	}
+}
diff --git a/ui/components/issuessection/issuessection.go b/ui/components/issuessection/issuessection.go
@@ -24,12 +24,12 @@ type Model struct {
 	Issues []data.IssueData
 }
 
-func NewModel(id int, ctx *context.ProgramContext, cfg config.SectionConfig) Model {
+func NewModel(id int, ctx *context.ProgramContext, cfg config.IssuesSectionConfig) Model {
 	m := Model{
 		section.NewModel(
 			id,
 			ctx,
-			cfg,
+			cfg.ToSectionConfig(),
 			SectionType,
 			GetSectionColumns(ctx),
 			"Issue",

diff --git a/ui/components/prssection/prssection.go b/ui/components/prssection/prssection.go
@@ -23,12 +23,12 @@ type Model struct {
 	Prs []data.PullRequestData
 }
 
-func NewModel(id int, ctx *context.ProgramContext, cfg config.SectionConfig) Model {
+func NewModel(id int, ctx *context.ProgramContext, cfg config.PrsSectionConfig) Model {
 	m := Model{
 		section.NewModel(
 			id,
 			ctx,
-			cfg,
+			cfg.ToSectionConfig(),
 			SectionType,
 			GetSectionColumns(ctx),
 			"PR",

diff --git a/ui/context/context.go b/ui/context/context.go
@@ -39,9 +39,13 @@ type ProgramContext struct {
 func (ctx *ProgramContext) GetViewSectionsConfig() []config.SectionConfig {
 	var configs []config.SectionConfig
 	if ctx.View == config.PRsView {
-		configs = ctx.Config.PRSections
+		for _, cfg := range ctx.Config.PRSections {
+			configs = append(configs, cfg.ToSectionConfig())
+		}
 	} else {
-		configs = ctx.Config.IssuesSections
+		for _, cfg := range ctx.Config.IssuesSections {
+			configs = append(configs, cfg.ToSectionConfig())
+		}
 	}
 
 	return append([]config.SectionConfig{{Title: ""}}, configs...)

diff --git a/ui/ui.go b/ui/ui.go
@@ -440,14 +440,20 @@ func (m *Model) setCurrentViewSections(newSections []section.Section) {
 		search := prssection.NewModel(
 			0,
 			&m.ctx,
-			config.SectionConfig{Title: "", Filters: "archived:false"},
+			config.PrsSectionConfig{
+				Title:   "",
+				Filters: "archived:false",
+			},
 		)
 		m.prs = append([]section.Section{&search}, newSections...)
 	} else {
 		search := issuessection.NewModel(
 			0,
 			&m.ctx,
-			config.SectionConfig{Title: "", Filters: ""},
+			config.IssuesSectionConfig{
+				Title:   "",
+				Filters: "",
+			},
 		)
 		m.issues = append([]section.Section{&search}, newSections...)
 	}