Skip to content

Commit 75e85c2

Browse files
wxiaoguangwxiaoguang
authored
Refactor repo-issue.ts (#33784)
And remove jQuery
1 parent ca0ce00 commit 75e85c2

File tree

10 files changed

+191
-233
lines changed

10 files changed

+191
-233
lines changed

‎.github/workflows/pull-db-tests.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,10 @@ jobs:
202202
test-mssql:
203203
if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.actions == 'true'
204204
needs: files-changed
205-
# specifying the version of ubuntu in use as mssql fails on newer kernels
206-
# pending resolution from vendor
207-
runs-on: ubuntu-20.04
205+
runs-on: ubuntu-latest
208206
services:
209207
mssql:
210-
image: mcr.microsoft.com/mssql/server:2017-latest
208+
image: mcr.microsoft.com/mssql/server:2019-latest
211209
env:
212210
ACCEPT_EULA: Y
213211
MSSQL_PID: Standard

‎options/locale/locale_en-US.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1938,7 +1938,7 @@ pulls.outdated_with_base_branch = This branch is out-of-date with the base branc
19381938
pulls.close = Close Pull Request
19391939
pulls.closed_at = `closed this pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
19401940
pulls.reopened_at = `reopened this pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
1941-
pulls.cmd_instruction_hint = `View <a class="show-instruction">command line instructions</a>.`
1941+
pulls.cmd_instruction_hint = View command line instructions
19421942
pulls.cmd_instruction_checkout_title = Checkout
19431943
pulls.cmd_instruction_checkout_desc = From your project repository, check out a new branch and test the changes.
19441944
pulls.cmd_instruction_merge_title = Merge

‎templates/repo/issue/sidebar/issue_dependencies.tmpl

+22-25
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@
3131
</div>
3232
<div class="item-right tw-flex tw-items-center tw-m-1">
3333
{{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}}
34-
<a class="delete-dependency-button ci muted" data-id="{{.Issue.ID}}" data-type="blocking" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dependency.remove_info"}}">
34+
<a class="muted show-modal" data-modal="#issue-remove-dependency-confirm"
35+
data-modal-remove-dependency-id="{{.Issue.ID}}" data-modal-dependency-type="blocking"
36+
data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dependency.remove_info"}}">
3537
{{svg "octicon-trash" 16}}
3638
</a>
3739
{{end}}
@@ -63,7 +65,9 @@
6365
</div>
6466
<div class="item-right tw-flex tw-items-center tw-m-1">
6567
{{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}}
66-
<a class="delete-dependency-button ci muted" data-id="{{.Issue.ID}}" data-type="blockedBy" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dependency.remove_info"}}">
68+
<a class="muted show-modal" data-modal="#issue-remove-dependency-confirm"
69+
data-modal-remove-dependency-id="{{.Issue.ID}}" data-modal-dependency-type="blockedBy"
70+
data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dependency.remove_info"}}">
6771
{{svg "octicon-trash" 16}}
6872
</a>
6973
{{end}}
@@ -86,7 +90,9 @@
8690
</div>
8791
<div class="item-right tw-flex tw-items-center tw-m-1">
8892
{{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}}
89-
<a class="delete-dependency-button ci muted" data-id="{{.Issue.ID}}" data-type="blocking" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dependency.remove_info"}}">
93+
<a class="muted show-modal" data-modal="#issue-remove-dependency-confirm"
94+
data-modal-remove-dependency-id="{{.Issue.ID}}" data-modal-dependency-type="blocking"
95+
data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dependency.remove_info"}}">
9096
{{svg "octicon-trash" 16}}
9197
</a>
9298
{{end}}
@@ -106,7 +112,7 @@
106112
<form method="post" action="{{.Issue.Link}}/dependency/add" id="addDependencyForm">
107113
{{$.CsrfTokenHtml}}
108114
<div class="ui fluid action input">
109-
<div class="ui search selection dropdown" id="new-dependency-drop-list" data-issue-id="{{.Issue.ID}}">
115+
<div class="ui search selection dropdown" id="new-dependency-drop-list" data-issue-id="{{.Issue.ID}}" data-issue-cross-repo-search="{{.AllowCrossRepositoryDependencies}}">
110116
<input name="newDependency" type="hidden">
111117
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
112118
<input type="text" class="search">
@@ -122,28 +128,19 @@
122128
</div>
123129

124130
{{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}}
125-
<input type="hidden" id="crossRepoSearch" value="{{.AllowCrossRepositoryDependencies}}">
126-
127-
<div class="ui g-modal-confirm modal remove-dependency">
128-
<div class="header">
129-
{{svg "octicon-trash"}}
130-
{{ctx.Locale.Tr "repo.issues.dependency.remove_header"}}
131-
</div>
131+
<form id="issue-remove-dependency-confirm" class="ui g-modal-confirm modal" method="post" action="{{.Issue.Link}}/dependency/delete">
132+
<div class="header">{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.issues.dependency.remove_header"}}</div>
132133
<div class="content">
133-
<form method="post" action="{{.Issue.Link}}/dependency/delete" id="removeDependencyForm">
134-
{{$.CsrfTokenHtml}}
135-
<input type="hidden" value="" name="removeDependencyID" id="removeDependencyID">
136-
<input type="hidden" value="" name="dependencyType" id="dependencyType">
137-
</form>
138-
<p>{{if .Issue.IsPull}}
139-
{{ctx.Locale.Tr "repo.issues.dependency.pr_remove_text"}}
140-
{{else}}
141-
{{ctx.Locale.Tr "repo.issues.dependency.issue_remove_text"}}
142-
{{end}}</p>
134+
{{$.CsrfTokenHtml}}
135+
<input type="hidden" value="" name="removeDependencyID" class="remove-dependency-id">
136+
<input type="hidden" value="" name="dependencyType" class="dependency-type">
137+
<p>
138+
{{ctx.Locale.Tr (Iif .Issue.IsPull "repo.issues.dependency.pr_remove_text" "repo.issues.dependency.issue_remove_text")}}
139+
</p>
140+
{{$ModalButtonCancelText := ctx.Locale.Tr "repo.issues.dependency.cancel"}}
141+
{{$ModalButtonOkText := ctx.Locale.Tr "repo.issues.dependency.remove"}}
142+
{{template "base/modal_actions_confirm" (dict "." . "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
143143
</div>
144-
{{$ModalButtonCancelText := ctx.Locale.Tr "repo.issues.dependency.cancel"}}
145-
{{$ModalButtonOkText := ctx.Locale.Tr "repo.issues.dependency.remove"}}
146-
{{template "base/modal_actions_confirm" (dict "." . "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
147-
</div>
144+
</form>
148145
{{end}}
149146
{{end}}

‎templates/repo/issue/sidebar/wip_switch.tmpl

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .HasMerged) (not .Issue.IsClosed) (not .IsPullWorkInProgress)}}
2-
<div class="toggle-wip tw-mt-2" data-title="{{.Issue.Title}}" data-wip-prefix="{{index .PullRequestWorkInProgressPrefixes 0}}" data-update-url="{{.Issue.Link}}/title">
3-
<a class="muted">
4-
{{ctx.Locale.Tr "repo.pulls.still_in_progress"}} {{ctx.Locale.Tr "repo.pulls.add_prefix" (index .PullRequestWorkInProgressPrefixes 0)}}
5-
</a>
6-
</div>
2+
<a class="toggle-wip tw-block tw-mt-2" data-title="{{.Issue.Title}}" data-wip-prefix="{{index .PullRequestWorkInProgressPrefixes 0}}" data-update-url="{{.Issue.Link}}/title">
3+
{{ctx.Locale.Tr "repo.pulls.still_in_progress"}} {{ctx.Locale.Tr "repo.pulls.add_prefix" (index .PullRequestWorkInProgressPrefixes 0)}}
4+
</a>
75
{{end}}

‎templates/repo/issue/view_content/pull.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@
8383
{{ctx.Locale.Tr "repo.pulls.data_broken"}}
8484
</div>
8585
{{else if .IsPullWorkInProgress}}
86-
<div class="item toggle-wip" data-title="{{.Issue.Title}}" data-wip-prefix="{{.WorkInProgressPrefix}}" data-update-url="{{.Issue.Link}}/title">
86+
<div class="item">
8787
<div class="item-section-left flex-text-inline tw-flex-1">
8888
{{svg "octicon-x"}}
8989
{{ctx.Locale.Tr "repo.pulls.cannot_merge_work_in_progress"}}
9090
</div>
9191
{{if or .HasIssuesOrPullsWritePermission .IsIssuePoster}}
92-
<button class="ui compact button">
92+
<button class="ui compact button toggle-wip" data-title="{{.Issue.Title}}" data-wip-prefix="{{.WorkInProgressPrefix}}" data-update-url="{{.Issue.Link}}/title">
9393
{{ctx.Locale.Tr "repo.pulls.remove_prefix" .WorkInProgressPrefix}}
9494
</button>
9595
{{end}}

‎templates/repo/issue/view_content/pull_merge_instruction.tmpl

+50-48
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,57 @@
11
<div class="divider"></div>
2-
<div class="instruct-toggle"> {{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}} </div>
3-
<div class="instruct-content tw-mt-2 tw-hidden">
4-
<div><h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_title"}}</h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_desc"}}</div>
5-
{{$localBranch := .PullRequest.HeadBranch}}
6-
{{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}
7-
{{$localBranch = print .PullRequest.HeadRepo.OwnerName "-" .PullRequest.HeadBranch}}
8-
{{end}}
9-
<div class="ui secondary segment">
10-
{{if eq .PullRequest.Flow 0}}
11-
<div>git fetch -u {{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}<origin-url data-url="{{.PullRequest.HeadRepo.Link}}"></origin-url>{{else}}origin{{end}} {{.PullRequest.HeadBranch}}:{{$localBranch}}</div>
12-
{{else}}
13-
<div>git fetch -u origin {{.PullRequest.GetGitRefName}}:{{$localBranch}}</div>
2+
<details>
3+
<summary>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}}</summary>
4+
<div class="tw-mt-2">
5+
<div><h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_title"}}</h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_desc"}}</div>
6+
{{$localBranch := .PullRequest.HeadBranch}}
7+
{{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}
8+
{{$localBranch = print .PullRequest.HeadRepo.OwnerName "-" .PullRequest.HeadBranch}}
149
{{end}}
15-
<div>git checkout {{$localBranch}}</div>
16-
</div>
17-
{{if .ShowMergeInstructions}}
18-
<div>
19-
<h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}</h3>
20-
{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_desc"}}
21-
{{if not .AutodetectManualMerge}}
22-
<div>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_warning"}}</div>
23-
{{end}}
24-
</div>
25-
<div class="ui secondary segment">
26-
<div data-pull-merge-style="merge">
27-
<div>git checkout {{.PullRequest.BaseBranch}}</div>
28-
<div>git merge --no-ff {{$localBranch}}</div>
29-
</div>
30-
<div class="tw-hidden" data-pull-merge-style="rebase">
31-
<div>git checkout {{.PullRequest.BaseBranch}}</div>
32-
<div>git merge --ff-only {{$localBranch}}</div>
33-
</div>
34-
<div class="tw-hidden" data-pull-merge-style="rebase-merge">
10+
<div class="ui secondary segment">
11+
{{if eq .PullRequest.Flow 0}}
12+
<div>git fetch -u {{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}<origin-url data-url="{{.PullRequest.HeadRepo.Link}}"></origin-url>{{else}}origin{{end}} {{.PullRequest.HeadBranch}}:{{$localBranch}}</div>
13+
{{else}}
14+
<div>git fetch -u origin {{.PullRequest.GetGitRefName}}:{{$localBranch}}</div>
15+
{{end}}
3516
<div>git checkout {{$localBranch}}</div>
36-
<div>git rebase {{.PullRequest.BaseBranch}}</div>
37-
<div>git checkout {{.PullRequest.BaseBranch}}</div>
38-
<div>git merge --no-ff {{$localBranch}}</div>
39-
</div>
40-
<div class="tw-hidden" data-pull-merge-style="squash">
41-
<div>git checkout {{.PullRequest.BaseBranch}}</div>
42-
<div>git merge --squash {{$localBranch}}</div>
4317
</div>
44-
<div class="tw-hidden" data-pull-merge-style="fast-forward-only">
45-
<div>git checkout {{.PullRequest.BaseBranch}}</div>
46-
<div>git merge --ff-only {{$localBranch}}</div>
18+
{{if .ShowMergeInstructions}}
19+
<div>
20+
<h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}</h3>
21+
{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_desc"}}
22+
{{if not .AutodetectManualMerge}}
23+
<div>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_warning"}}</div>
24+
{{end}}
4725
</div>
48-
<div class="tw-hidden" data-pull-merge-style="manually-merged">
49-
<div>git checkout {{.PullRequest.BaseBranch}}</div>
50-
<div>git merge {{$localBranch}}</div>
26+
<div class="ui secondary segment">
27+
<div data-pull-merge-style="merge">
28+
<div>git checkout {{.PullRequest.BaseBranch}}</div>
29+
<div>git merge --no-ff {{$localBranch}}</div>
30+
</div>
31+
<div class="tw-hidden" data-pull-merge-style="rebase">
32+
<div>git checkout {{.PullRequest.BaseBranch}}</div>
33+
<div>git merge --ff-only {{$localBranch}}</div>
34+
</div>
35+
<div class="tw-hidden" data-pull-merge-style="rebase-merge">
36+
<div>git checkout {{$localBranch}}</div>
37+
<div>git rebase {{.PullRequest.BaseBranch}}</div>
38+
<div>git checkout {{.PullRequest.BaseBranch}}</div>
39+
<div>git merge --no-ff {{$localBranch}}</div>
40+
</div>
41+
<div class="tw-hidden" data-pull-merge-style="squash">
42+
<div>git checkout {{.PullRequest.BaseBranch}}</div>
43+
<div>git merge --squash {{$localBranch}}</div>
44+
</div>
45+
<div class="tw-hidden" data-pull-merge-style="fast-forward-only">
46+
<div>git checkout {{.PullRequest.BaseBranch}}</div>
47+
<div>git merge --ff-only {{$localBranch}}</div>
48+
</div>
49+
<div class="tw-hidden" data-pull-merge-style="manually-merged">
50+
<div>git checkout {{.PullRequest.BaseBranch}}</div>
51+
<div>git merge {{$localBranch}}</div>
52+
</div>
53+
<div>git push origin {{.PullRequest.BaseBranch}}</div>
5154
</div>
52-
<div>git push origin {{.PullRequest.BaseBranch}}</div>
55+
{{end}}
5356
</div>
54-
{{end}}
55-
</div>
57+
</details>

‎templates/repo/issue/view_content/update_branch_by_merge.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="item-section-right">
99
{{if and $.UpdateAllowed $.UpdateByRebaseAllowed}}
1010
<div class="tw-inline-block">
11-
<div class="ui buttons update-button">
11+
<div id="update-pr-branch-with-base" class="ui buttons">
1212
<button class="ui button" data-do="{{$.Link}}/update" data-redirect="{{$.Link}}">
1313
<span class="button-text">
1414
{{ctx.Locale.Tr "repo.pulls.update_branch"}}

0 commit comments

Comments
 (0)