Skip to content

Commit 0c5b23a

Browse files
committed
refactor: reviews are not a pr status anymore
1 parent 6055c43 commit 0c5b23a

File tree

6 files changed

+3
-24
lines changed

6 files changed

+3
-24
lines changed

__snapshots__/e2e_test.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ ID RepoID Name Status Patchsets User
3535
7 contributor/ai feat: lets build an rnn [accepted] 1 admin
3636
6 contributor/test Closed patch with review [closed] 2 contributor
3737
5 contributor/test Accepted patch with review [accepted] 2 contributor
38-
4 contributor/test Reviewed patch [reviewed] 2 contributor
38+
4 contributor/test Reviewed patch [open] 2 contributor
3939
3 contributor/test Closed patch (contributor) [closed] 1 contributor
4040
2 contributor/test Closed patch (admin) [closed] 1 contributor
4141
1 admin/test Accepted patch [accepted] 1 contributor

cli.go

+2-12
Original file line numberDiff line numberDiff line change
@@ -368,10 +368,6 @@ Here's how it works:
368368
Name: "accepted",
369369
Usage: "only show accepted PRs",
370370
},
371-
&cli.BoolFlag{
372-
Name: "reviewed",
373-
Usage: "only show reviewed PRs",
374-
},
375371
&cli.BoolFlag{
376372
Name: "mine",
377373
Usage: "only show your own PRs",
@@ -406,7 +402,6 @@ Here's how it works:
406402
onlyOpen := cCtx.Bool("open")
407403
onlyAccepted := cCtx.Bool("accepted")
408404
onlyClosed := cCtx.Bool("closed")
409-
onlyReviewed := cCtx.Bool("reviewed")
410405
onlyMine := cCtx.Bool("mine")
411406

412407
writer := NewTabWriter(sesh)
@@ -424,10 +419,6 @@ Here's how it works:
424419
continue
425420
}
426421

427-
if onlyReviewed && req.Status != "reviewed" {
428-
continue
429-
}
430-
431422
user, err := pr.GetUserByID(req.UserID)
432423
if err != nil {
433424
be.Logger.Error("could not get user for pr", "err", err)
@@ -846,7 +837,7 @@ Here's how it works:
846837
Flags: []cli.Flag{
847838
&cli.BoolFlag{
848839
Name: "review",
849-
Usage: "submit patchset and mark PR as reviewed",
840+
Usage: "submit patchset mark it as a review",
850841
},
851842
&cli.BoolFlag{
852843
Name: "accept",
@@ -898,8 +889,7 @@ Here's how it works:
898889
op := OpNormal
899890
nextStatus := "open"
900891
if isReview {
901-
wish.Println(sesh, "Marking PR as reviewed")
902-
nextStatus = "reviewed"
892+
wish.Println(sesh, "Marking patchset as a review")
903893
op = OpReview
904894
} else if isAccept {
905895
wish.Println(sesh, "Marking PR as accepted")

tmpl/index.html

-2
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,6 @@ <h3 class="text-lg">format-patch workflow</h3>
220220
filter
221221
<a href="/">open</a> <code>{{.NumOpen}}</code>
222222
&middot;
223-
<a href="/?status=reviewed">reviewed</a> <code>{{.NumReviewed}}</code>
224-
&middot;
225223
<a href="/?status=accepted">accepted</a> <code>{{.NumAccepted}}</code>
226224
&middot;
227225
<a href="/?status=closed">closed</a> <code>{{.NumClosed}}</code>

tmpl/repo-detail.html

-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ <h1 class="text-2xl mb"><a href="/">dashboard</a> / <a href="/r/{{.Username}}">{
2929
filter
3030
<a href="/r/{{.Username}}/{{.Name}}">open</a>
3131
&middot;
32-
<a href="/r/{{.Username}}/{{.Name}}?status=reviewed">reviewed</a>
33-
&middot;
3432
<a href="/r/{{.Username}}/{{.Name}}?status=accepted">accepted</a>
3533
&middot;
3634
<a href="/r/{{.Username}}/{{.Name}}?status=closed">closed</a>

tmpl/user-detail.html

-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ <h1 class="text-2xl mb"><a href="/">dashboard</a> / {{.UserData.Name}}</h1>
2828
filter
2929
<a href="/r/{{.UserData.Name}}">open</a>
3030
&middot;
31-
<a href="/r/{{.UserData.Name}}?status=reviewed">reviewed</a>
32-
&middot;
3331
<a href="/r/{{.UserData.Name}}?status=accepted">accepted</a>
3432
&middot;
3533
<a href="/r/{{.UserData.Name}}?status=closed">closed</a>

web.go

-5
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ type LinkData struct {
112112
type PrTableData struct {
113113
Prs []*PrListData
114114
NumOpen int
115-
NumReviewed int
116115
NumAccepted int
117116
NumClosed int
118117
MetaData
@@ -291,15 +290,12 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
291290
}
292291

293292
numOpen := 0
294-
numReviewed := 0
295293
numAccepted := 0
296294
numClosed := 0
297295
for _, pr := range prs {
298296
switch pr.Status {
299297
case "open":
300298
numOpen += 1
301-
case "reviewed":
302-
numReviewed += 1
303299
case "accepted":
304300
numAccepted += 1
305301
case "closed":
@@ -311,7 +307,6 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
311307
tmpl := getTemplate("index.html")
312308
err = tmpl.ExecuteTemplate(w, "index.html", PrTableData{
313309
NumOpen: numOpen,
314-
NumReviewed: numReviewed,
315310
NumAccepted: numAccepted,
316311
NumClosed: numClosed,
317312
Prs: prdata,

0 commit comments

Comments
 (0)