Skip to content

Commit

Permalink
renaming & rearrange fields
Browse files Browse the repository at this point in the history
  • Loading branch information
@canack
canack committed Jan 3, 2024
1 parent 6aad89e commit 70d255e
Show file tree
Hide file tree
Showing 6 changed files with 82 additions and 72 deletions.
14 changes: 10 additions & 4 deletions internal/terminal/handler/ghrepository/ghrepository.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,28 @@ import (
)

type ModelGithubRepository struct {
// current handler's properties
syncRepositoriesContext context.Context
cancelSyncRepositories context.CancelFunc
tableReady bool

// shared properties
SelectedRepository *hdltypes.SelectedRepository

// use cases
githubUseCase gu.UseCase

// keymap
Keys keyMap

// models
Help help.Model
Keys keyMap
Viewport *viewport.Model
tableGithubRepository table.Model
modelError hdlerror.ModelError

modelTabOptions tea.Model
actualModelTabOptions *taboptions.Options

SelectedRepository *hdltypes.SelectedRepository
}

var baseStyle = lipgloss.NewStyle().
Expand Down Expand Up @@ -204,6 +210,6 @@ func (m *ModelGithubRepository) View() string {
return lipgloss.JoinVertical(lipgloss.Top, doc.String(), m.actualModelTabOptions.View())
}

func (m *ModelGithubRepository) ViewErrorOrOperation() string {
func (m *ModelGithubRepository) ViewStatus() string {
return m.modelError.View()
}
53 changes: 27 additions & 26 deletions internal/terminal/handler/ghtrigger/ghtrigger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,36 +20,37 @@ import (
)

type ModelGithubTrigger struct {
syncWorkflowContext context.Context
cancelSyncWorkflow context.CancelFunc
tableReady bool
isTriggerable bool

// current handler's properties
syncWorkflowContext context.Context
cancelSyncWorkflow context.CancelFunc
workflowContent *workflow.Pretty
tableReady bool
isTriggerable bool
currentTab *int
forceUpdateWorkflowHistory *bool
optionInit bool
optionCursor int
optionValues []string
currentOption string
selectedWorkflow string
selectedRepositoryName string
triggerFocused bool

// shared properties
SelectedRepository *hdltypes.SelectedRepository

// use cases
githubUseCase gu.UseCase

Help help.Model
Keys keyMap
Viewport *viewport.Model
modelError hdlerror.ModelError
// keymap
Keys keyMap

// models
Help help.Model
Viewport *viewport.Model
modelError hdlerror.ModelError
textInput textinput.Model
tableTrigger table.Model

currentTab *int
forceUpdateWorkflowHistory *bool

optionInit bool
optionCursor int
optionValues []string
currentOption string

triggerFocused bool

workflowContent *workflow.Pretty

selectedWorkflow string
selectedRepositoryName string
SelectedRepository *hdltypes.SelectedRepository
}

func SetupModelGithubTrigger(githubUseCase gu.UseCase, selectedRepository *hdltypes.SelectedRepository, currentTab *int, forceUpdateWorkflowHistory *bool) *ModelGithubTrigger {
Expand Down Expand Up @@ -574,6 +575,6 @@ func (m *ModelGithubTrigger) optionSelector() string {
return windowStyle.Render(doc.String())
}

func (m *ModelGithubTrigger) ViewErrorOrOperation() string {
func (m *ModelGithubTrigger) ViewStatus() string {
return m.modelError.View()
}
16 changes: 11 additions & 5 deletions internal/terminal/handler/ghworkflow/ghworkflow.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,23 @@ import (
)

type ModelGithubWorkflow struct {
// current handler's properties
syncTriggerableWorkflowsContext context.Context
cancelSyncTriggerableWorkflows context.CancelFunc
tableReady bool
lastRepository string

// shared properties
SelectedRepository *hdltypes.SelectedRepository

// use cases
githubUseCase gu.UseCase

// keymap
Keys keyMap

// models
Help help.Model
Keys keyMap
Viewport *viewport.Model
list list.Model
tableTriggerableWorkflow table.Model
Expand All @@ -39,9 +48,6 @@ type ModelGithubWorkflow struct {

modelGithubTrigger tea.Model
actualModelGithubTrigger *ghtrigger.ModelGithubTrigger

lastRepository string
SelectedRepository *hdltypes.SelectedRepository
}

var baseStyle = lipgloss.NewStyle().
Expand Down Expand Up @@ -190,6 +196,6 @@ func (m *ModelGithubWorkflow) handleTableInputs(ctx context.Context) {
m.actualModelTabOptions.SetStatus(taboptions.OptionIdle)
}

func (m *ModelGithubWorkflow) ViewErrorOrOperation() string {
func (m *ModelGithubWorkflow) ViewStatus() string {
return m.modelError.View()
}
35 changes: 19 additions & 16 deletions internal/terminal/handler/ghworkflowhistory/ghworkflowhistory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,31 +19,34 @@ import (
)

type ModelGithubWorkflowHistory struct {
// current handler's properties
tableReady bool
updateRound int
selectedWorkflowID int64
isTableFocused bool
lastRepository string
forceUpdate *bool
syncWorkflowHistoryContext context.Context
cancelSyncWorkflowHistory context.CancelFunc
tableReady bool
githubUseCase gu.UseCase
Workflows []gu.Workflow

// shared properties
SelectedRepository *hdltypes.SelectedRepository

// use cases
githubUseCase gu.UseCase

// keymap
Keys keyMap

// models
Help help.Model
Keys keyMap
Viewport *viewport.Model
tableWorkflowHistory table.Model
modelError hdlerror.ModelError

modelTabOptions tea.Model
actualModelTabOptions *taboptions.Options

SelectedRepository *hdltypes.SelectedRepository
updateRound int

Workflows []gu.Workflow
selectedWorkflowID int64

isTableFocused bool

lastRepository string

forceUpdate *bool
}

var baseStyle = lipgloss.NewStyle().
Expand Down Expand Up @@ -288,6 +291,6 @@ func (m *ModelGithubWorkflowHistory) View() string {
return lipgloss.JoinVertical(lipgloss.Top, doc.String(), m.actualModelTabOptions.View())
}

func (m *ModelGithubWorkflowHistory) ViewErrorOrOperation() string {
func (m *ModelGithubWorkflowHistory) ViewStatus() string {
return m.modelError.View()
}
25 changes: 8 additions & 17 deletions internal/terminal/handler/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ import (
)

type model struct {
// Current Handler's properties
// current handler's properties
TabsWithColor []string
TabContent []string
currentTab *int
isTabActive bool
viewport viewport.Model
terminalSizeReady bool
timer timer.Model

// Shared properties
SelectedRepository *hdltypes.SelectedRepository

// models
viewport viewport.Model
timer timer.Model

modelInfo tea.Model
actualModelInfo *hdlinfo.ModelInfo

Expand All @@ -55,14 +55,6 @@ func SetupTerminal(githubUseCase gu.UseCase) tea.Model {

tabsWithColor := []string{"Info", "Repository", "Workflow History", "Workflow", "Trigger"}

tabContent := []string{
"Information Page",
"Repository Page",
"Workflow History Page",
"Workflow Page",
"Trigger Page",
}

selectedRepository := hdltypes.SelectedRepository{}

// setup models
Expand All @@ -75,7 +67,6 @@ func SetupTerminal(githubUseCase gu.UseCase) tea.Model {
m := model{
currentTab: currentTab,
TabsWithColor: tabsWithColor,
TabContent: tabContent,
timer: timer.New(1<<63 - 1),
modelInfo: hdlModelInfo, actualModelInfo: hdlModelInfo,
SelectedRepository: &selectedRepository,
Expand Down Expand Up @@ -182,19 +173,19 @@ func (m *model) View() string {
helpDoc = helpWindowStyle.Render(m.actualModelInfo.ViewHelp())
case 1:
mainDoc.WriteString(dynamicWindowStyle.Render(m.modelGithubRepository.View()))
operationDoc = operationWindowStyle.Render(m.actualModelGithubRepository.ViewErrorOrOperation())
operationDoc = operationWindowStyle.Render(m.actualModelGithubRepository.ViewStatus())
helpDoc = helpWindowStyle.Render(m.actualModelGithubRepository.ViewHelp())
case 2:
mainDoc.WriteString(dynamicWindowStyle.Render(m.modelWorkflowHistory.View()))
operationDoc = operationWindowStyle.Render(m.directModelWorkflowHistory.ViewErrorOrOperation())
operationDoc = operationWindowStyle.Render(m.directModelWorkflowHistory.ViewStatus())
helpDoc = helpWindowStyle.Render(m.directModelWorkflowHistory.ViewHelp())
case 3:
mainDoc.WriteString(dynamicWindowStyle.Render(m.modelWorkflow.View()))
operationDoc = operationWindowStyle.Render(m.directModelWorkflow.ViewErrorOrOperation())
operationDoc = operationWindowStyle.Render(m.directModelWorkflow.ViewStatus())
helpDoc = helpWindowStyle.Render(m.directModelWorkflow.ViewHelp())
case 4:
mainDoc.WriteString(dynamicWindowStyle.Render(m.modelTrigger.View()))
operationDoc = operationWindowStyle.Render(m.actualModelTrigger.ViewErrorOrOperation())
operationDoc = operationWindowStyle.Render(m.actualModelTrigger.ViewStatus())
helpDoc = helpWindowStyle.Render(m.actualModelTrigger.ViewHelp())
}

Expand Down
11 changes: 7 additions & 4 deletions internal/terminal/handler/information/information.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@ import (
)

type ModelInfo struct {
Help help.Model
Keys keyMap
Viewport *viewport.Model

// use cases
githubUseCase gu.UseCase

// models
Help help.Model
Viewport *viewport.Model
modelError hdlerror.ModelError

// keymap
Keys keyMap
}

const (
Expand Down

0 comments on commit 70d255e

Please sign in to comment.