Skip to content

Commit d796db2

Browse files
ankitpokhrelankitpokhrel
authored
fix: Update deprecated endpoint (#892)
1 parent 544da1a commit d796db2

File tree

13 files changed

+60
-73
lines changed

13 files changed

+60
-73
lines changed

‎api/client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ func ProxySearch(c *jira.Client, jql string, from, limit uint) (*jira.SearchResu
138138
if it == jira.InstallationTypeLocal {
139139
issues, err = c.SearchV2(jql, from, limit)
140140
} else {
141-
issues, err = c.Search(jql, from, limit)
141+
issues, err = c.Search(jql, limit)
142142
}
143143

144144
return issues, err

‎internal/cmd/epic/list/list.go‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ func singleEpicView(flags query.FlagParser, key, project, projectType, server st
9191
err := flags.Set("type", "") // Unset issue type.
9292
cmdutil.ExitIfError(err)
9393

94-
issues, total, err := func() ([]*jira.Issue, int, error) {
94+
issues, err := func() ([]*jira.Issue, error) {
9595
s := cmdutil.Info("Fetching epic issues...")
9696
defer s.Stop()
9797

9898
q, err := query.NewIssue(project, flags)
9999
if err != nil {
100-
return nil, 0, err
100+
return nil, err
101101
}
102102

103103
var resp *jira.SearchResult
@@ -106,19 +106,19 @@ func singleEpicView(flags query.FlagParser, key, project, projectType, server st
106106
q.Params().Parent = key
107107
q.Params().IssueType = ""
108108

109-
resp, err = client.Search(q.Get(), q.Params().From, q.Params().Limit)
109+
resp, err = client.Search(q.Get(), q.Params().Limit)
110110
} else {
111111
resp, err = client.EpicIssues(key, q.Get(), q.Params().From, q.Params().Limit)
112112
}
113113

114114
if err != nil {
115-
return nil, 0, err
115+
return nil, err
116116
}
117-
return resp.Issues, resp.Total, nil
117+
return resp.Issues, nil
118118
}()
119119
cmdutil.ExitIfError(err)
120120

121-
if total == 0 {
121+
if len(issues) == 0 {
122122
fmt.Println()
123123
cmdutil.Failed("No result found for given query in project %q", project)
124124
return
@@ -127,6 +127,9 @@ func singleEpicView(flags query.FlagParser, key, project, projectType, server st
127127
plain, err := flags.GetBool("plain")
128128
cmdutil.ExitIfError(err)
129129

130+
delimiter, err := flags.GetString("delimiter")
131+
cmdutil.ExitIfError(err)
132+
130133
csv, err := flags.GetBool("csv")
131134
cmdutil.ExitIfError(err)
132135

@@ -145,13 +148,13 @@ func singleEpicView(flags query.FlagParser, key, project, projectType, server st
145148
v := view.IssueList{
146149
Project: project,
147150
Server: server,
148-
Total: total,
149151
Data: issues,
150152
Refresh: func() {
151153
singleEpicView(flags, key, project, projectType, server, client)
152154
},
153155
Display: view.DisplayFormat{
154156
Plain: plain,
157+
Delimiter: delimiter,
155158
CSV: csv,
156159
NoHeaders: noHeaders,
157160
NoTruncate: noTruncate,
@@ -174,19 +177,19 @@ func epicExplorerView(cmd *cobra.Command, flags query.FlagParser, project, proje
174177
q, err := query.NewIssue(project, flags)
175178
cmdutil.ExitIfError(err)
176179

177-
epics, total, err := func() ([]*jira.Issue, int, error) {
180+
epics, err := func() ([]*jira.Issue, error) {
178181
s := cmdutil.Info("Fetching epics...")
179182
defer s.Stop()
180183

181184
resp, err := api.ProxySearch(client, q.Get(), q.Params().From, q.Params().Limit)
182185
if err != nil {
183-
return nil, 0, err
186+
return nil, err
184187
}
185-
return resp.Issues, resp.Total, nil
188+
return resp.Issues, nil
186189
}()
187190
cmdutil.ExitIfError(err)
188191

189-
if total == 0 {
192+
if len(epics) == 0 {
190193
fmt.Println()
191194
cmdutil.Failed("No result found for given query in project %q", project)
192195
return
@@ -196,7 +199,6 @@ func epicExplorerView(cmd *cobra.Command, flags query.FlagParser, project, proje
196199
cmdutil.ExitIfError(err)
197200

198201
v := view.EpicList{
199-
Total: total,
200202
Project: project,
201203
Server: server,
202204
Data: epics,
@@ -207,7 +209,7 @@ func epicExplorerView(cmd *cobra.Command, flags query.FlagParser, project, proje
207209
q.Params().Parent = key
208210
q.Params().IssueType = ""
209211

210-
resp, err = client.Search(q.Get(), q.Params().From, q.Params().Limit)
212+
resp, err = client.Search(q.Get(), q.Params().Limit)
211213
} else {
212214
resp, err = client.EpicIssues(key, "", q.Params().From, q.Params().Limit)
213215
}

‎internal/cmd/issue/list/list.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,25 +109,25 @@ func loadList(cmd *cobra.Command, args []string) {
109109
cmdutil.ExitIfError(cmd.Flags().Set("jql", searchQuery))
110110
}
111111

112-
issues, total, err := func() ([]*jira.Issue, int, error) {
112+
issues, err := func() ([]*jira.Issue, error) {
113113
s := cmdutil.Info("Fetching issues...")
114114
defer s.Stop()
115115

116116
q, err := query.NewIssue(project, cmd.Flags())
117117
if err != nil {
118-
return nil, 0, err
118+
return nil, err
119119
}
120120

121121
resp, err := api.ProxySearch(api.DefaultClient(debug), q.Get(), q.Params().From, q.Params().Limit)
122122
if err != nil {
123-
return nil, 0, err
123+
return nil, err
124124
}
125125

126-
return resp.Issues, resp.Total, nil
126+
return resp.Issues, nil
127127
}()
128128
cmdutil.ExitIfError(err)
129129

130-
if total == 0 {
130+
if len(issues) == 0 {
131131
fmt.Println()
132132
cmdutil.Failed("No result found for given query in project %q", project)
133133
return
@@ -173,7 +173,6 @@ func loadList(cmd *cobra.Command, args []string) {
173173
v := view.IssueList{
174174
Project: project,
175175
Server: server,
176-
Total: total,
177176
Data: issues,
178177
Refresh: func() {
179178
loadList(cmd, args)

‎internal/cmd/sprint/list/list.go‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,26 +93,26 @@ func sprintList(cmd *cobra.Command, args []string) {
9393
}
9494

9595
func singleSprintView(sprintQuery *query.Sprint, flags query.FlagParser, boardID, sprintID int, project, server string, client *jira.Client, sprint *jira.Sprint) {
96-
issues, total, err := func() ([]*jira.Issue, int, error) {
96+
issues, err := func() ([]*jira.Issue, error) {
9797
s := cmdutil.Info("Fetching sprint issues...")
9898
defer s.Stop()
9999

100100
q, err := query.NewIssue(project, flags)
101101
if err != nil {
102-
return nil, 0, err
102+
return nil, err
103103
}
104104
if sprintQuery.Params().ShowAllIssues {
105105
q.Params().JQL = "project IS NOT EMPTY"
106106
}
107107
resp, err := client.SprintIssues(sprintID, q.Get(), q.Params().From, q.Params().Limit)
108108
if err != nil {
109-
return nil, 0, err
109+
return nil, err
110110
}
111-
return resp.Issues, resp.Total, nil
111+
return resp.Issues, nil
112112
}()
113113
cmdutil.ExitIfError(err)
114114

115-
if total == 0 {
115+
if len(issues) == 0 {
116116
fmt.Println()
117117
cmdutil.Failed("No result found for given query in project %q", project)
118118
return
@@ -124,6 +124,9 @@ func singleSprintView(sprintQuery *query.Sprint, flags query.FlagParser, boardID
124124
csv, err := flags.GetBool("csv")
125125
cmdutil.ExitIfError(err)
126126

127+
delimiter, err := flags.GetString("delimiter")
128+
cmdutil.ExitIfError(err)
129+
127130
noHeaders, err := flags.GetBool("no-headers")
128131
cmdutil.ExitIfError(err)
129132

@@ -140,35 +143,35 @@ func singleSprintView(sprintQuery *query.Sprint, flags query.FlagParser, boardID
140143
if sprint != nil {
141144
if sprint.Status == jira.SprintStateFuture {
142145
ft = fmt.Sprintf(
143-
"Showing %d of %d results for project %q in sprint #%d ➤ %s (Future Sprint)",
144-
len(issues), total, project, sprint.ID, sprint.Name,
146+
"Showing %d results for project %q in sprint #%d ➤ %s (Future Sprint)",
147+
len(issues), project, sprint.ID, sprint.Name,
145148
)
146149
} else {
147150
ft = fmt.Sprintf(
148-
"Showing %d of %d results for project %q in sprint #%d ➤ %s (%s - %s)",
149-
len(issues), total, project, sprint.ID, sprint.Name,
151+
"Showing %d results for project %q in sprint #%d ➤ %s (%s - %s)",
152+
len(issues), project, sprint.ID, sprint.Name,
150153
cmdutil.FormatDateTimeHuman(sprint.StartDate, time.RFC3339),
151154
cmdutil.FormatDateTimeHuman(sprint.EndDate, time.RFC3339),
152155
)
153156
}
154157
} else {
155158
ft = fmt.Sprintf(
156-
"Showing %d of %d results for project %q in sprint #%d",
157-
len(issues), total, project, sprintID,
159+
"Showing %d results for project %q in sprint #%d",
160+
len(issues), project, sprintID,
158161
)
159162
}
160163

161164
v := view.IssueList{
162165
Project: project,
163166
Server: server,
164-
Total: total,
165167
Data: issues,
166168
FooterText: ft,
167169
Refresh: func() {
168170
singleSprintView(sprintQuery, flags, boardID, sprintID, project, server, client, nil)
169171
},
170172
Display: view.DisplayFormat{
171173
Plain: plain,
174+
Delimiter: delimiter,
172175
CSV: csv,
173176
NoHeaders: noHeaders,
174177
NoTruncate: noTruncate,

‎internal/view/epic.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ type EpicIssueFunc func(string) []*jira.Issue
1414

1515
// EpicList is a list view for epics.
1616
type EpicList struct {
17-
Total int
1817
Project string
1918
Server string
2019
Data []*jira.Issue
@@ -33,21 +32,21 @@ func (el *EpicList) Render() error {
3332

3433
data := el.data()
3534
view := tui.NewPreview(
36-
tui.WithPreviewFooterText(fmt.Sprintf("Showing %d of %d results for project %q", len(el.Data), el.Total, el.Project)),
35+
tui.WithPreviewFooterText(fmt.Sprintf("Showing %d results for project %q", len(el.Data), el.Project)),
3736
tui.WithInitialText(helpText),
3837
tui.WithSidebarSelectedFunc(navigate(el.Server)),
3938
tui.WithContentTableOpts(
4039
tui.WithTableStyle(el.Display.TableStyle),
4140
tui.WithFixedColumns(el.Display.FixedColumns),
4241
tui.WithSelectedFunc(navigate(el.Server)),
43-
tui.WithViewModeFunc(func(r, c int, d interface{}) (func() interface{}, func(interface{}) (string, error)) {
44-
dataFn := func() interface{} {
42+
tui.WithViewModeFunc(func(r, c int, d any) (func() any, func(any) (string, error)) {
43+
dataFn := func() any {
4544
data := d.(tui.TableData)
4645
ci := data.GetIndex(fieldKey)
4746
iss, _ := api.ProxyGetIssue(api.DefaultClient(false), data.Get(r, ci), issue.NewNumCommentsFilter(1))
4847
return iss
4948
}
50-
renderFn := func(i interface{}) (string, error) {
49+
renderFn := func(i any) (string, error) {
5150
iss := Issue{
5251
Server: el.Server,
5352
Data: i.(*jira.Issue),
@@ -71,15 +70,15 @@ func (el *EpicList) data() []tui.PreviewData {
7170
data = append(data, tui.PreviewData{
7271
Key: "help",
7372
Menu: "?",
74-
Contents: func(s string) interface{} {
73+
Contents: func(_ string) any {
7574
return helpText
7675
},
7776
})
7877
for _, issue := range el.Data {
7978
data = append(data, tui.PreviewData{
8079
Key: issue.Key,
8180
Menu: fmt.Sprintf("➤ %s: %s", issue.Key, prepareTitle(issue.Fields.Summary)),
82-
Contents: func(key string) interface{} {
81+
Contents: func(key string) any {
8382
issues := el.Issues(key)
8483
return el.tabularize(issues)
8584
},

‎internal/view/epic_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ func TestEpicData(t *testing.T) {
9797
}
9898

9999
epic := EpicList{
100-
Total: 2,
101100
Project: "TEST",
102101
Server: "https://test.local",
103102
Data: []*jira.Issue{&epic1, &epic2},

‎internal/view/issues.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ type DisplayFormat struct {
2929

3030
// IssueList is a list view for issues.
3131
type IssueList struct {
32-
Total int
3332
Project string
3433
Server string
3534
Data []*jira.Issue
@@ -62,7 +61,7 @@ func (l *IssueList) Render() error {
6261

6362
data := l.data()
6463
if l.FooterText == "" {
65-
l.FooterText = fmt.Sprintf("Showing %d of %d results for project %q", len(data)-1, l.Total, l.Project)
64+
l.FooterText = fmt.Sprintf("Showing %d results for project %q", len(data)-1, l.Project)
6665
}
6766

6867
view := tui.NewTable(

‎internal/view/issues_test.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212

1313
func TestIssueData(t *testing.T) {
1414
issue := IssueList{
15-
Total: 2,
1615
Project: "TEST",
1716
Server: "https://test.local",
1817
Data: getIssues(),
@@ -42,7 +41,6 @@ func TestIssueRenderInPlainView(t *testing.T) {
4241
var b bytes.Buffer
4342

4443
issue := IssueList{
45-
Total: 2,
4644
Project: "TEST",
4745
Server: "https://test.local",
4846
Data: getIssues(),
@@ -65,7 +63,6 @@ func TestIssueRenderInPlainViewWithCustomDelimiter(t *testing.T) {
6563
var b bytes.Buffer
6664

6765
issue := IssueList{
68-
Total: 2,
6966
Project: "TEST",
7067
Server: "https://test.local",
7168
Data: getIssues(),
@@ -88,7 +85,6 @@ func TestIssueRenderInPlainViewAndNoTruncate(t *testing.T) {
8885
var b bytes.Buffer
8986

9087
issue := IssueList{
91-
Total: 2,
9288
Project: "TEST",
9389
Server: "https://test.local",
9490
Data: getIssues(),
@@ -111,7 +107,6 @@ func TestIssueRenderInPlainViewWithoutHeaders(t *testing.T) {
111107
var b bytes.Buffer
112108

113109
issue := IssueList{
114-
Total: 2,
115110
Project: "TEST",
116111
Server: "https://test.local",
117112
Data: getIssues(),
@@ -135,7 +130,6 @@ func TestIssueRenderInPlainViewWithFewColumns(t *testing.T) {
135130
data := getIssues()
136131

137132
issue := IssueList{
138-
Total: 2,
139133
Project: "TEST",
140134
Server: "https://test.local",
141135
Data: data,

‎pkg/jira/epic_test.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ func TestEpicIssues(t *testing.T) {
4747
assert.NoError(t, err)
4848

4949
expected := &SearchResult{
50-
StartAt: 0,
51-
MaxResults: 50,
52-
Total: 3,
50+
IsLast: true,
5351
Issues: []*Issue{
5452
{
5553
Key: "TEST-1",

0 commit comments

Comments
 (0)