From aadd437c413687d04b99a1aa9adf93969e825e04 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Thu, 8 Jun 2023 14:36:35 +0800 Subject: [PATCH 01/62] temp --- models/issues/issue.go | 24 +++++++++-- options/locale/locale_en-US.ini | 14 ++++++ routers/web/repo/issue.go | 59 ++++++++++++++++++++++++++ templates/repo/issue/view_content.tmpl | 14 ++++++ web_src/css/repo.css | 2 +- 5 files changed, 109 insertions(+), 4 deletions(-) diff --git a/models/issues/issue.go b/models/issues/issue.go index eab18f4892ce9..170b947d7e18b 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -91,6 +91,23 @@ func (err ErrIssueWasClosed) Error() string { return fmt.Sprintf("Issue [%d] %d was already closed", err.ID, err.Index) } +type IssueClosedState int8 + +const ( + // IssueClosedStateCommonClose close issue without any state. + IssueClosedStateCommonClose IssueClosedState = iota + // IssueClosedStateArchived close issue as archived. + IssueClosedStateArchived + // IssueClosedStateResolved close issue as resolved. + IssueClosedStateResolved + // IssueClosedStateMerged close issue as merged. + IssueClosedStateMerged + // IssueClosedStateDuplicate close issue as duplicate. + IssueClosedStateDuplicate + // IssueClosedStateStale close issue as stale. + IssueClosedStateStale +) + // Issue represents an issue or pull request of repository. type Issue struct { ID int64 `xorm:"pk autoincr"` @@ -112,9 +129,10 @@ type Issue struct { AssigneeID int64 `xorm:"-"` Assignee *user_model.User `xorm:"-"` IsClosed bool `xorm:"INDEX"` - IsRead bool `xorm:"-"` - IsPull bool `xorm:"INDEX"` // Indicates whether is a pull request or not. - PullRequest *PullRequest `xorm:"-"` + ClosedState IssueClosedState + IsRead bool `xorm:"-"` + IsPull bool `xorm:"INDEX"` // Indicates whether is a pull request or not. + PullRequest *PullRequest `xorm:"-"` NumComments int Ref string PinOrder int `xorm:"DEFAULT 0"` diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 195252c47d176..98cdbfa147982 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1452,6 +1452,20 @@ issues.ref_reopening_from = `referenced a pull request %[4]s tha issues.ref_closed_from = `closed this issue %[4]s %[2]s` issues.ref_reopened_from = `reopened this issue %[4]s %[2]s` issues.ref_from = `from %[1]s` +issues.close_as.reopen = Reopen +issues.close_as.common = Close Issue +issues.close_as.archived = Close as archived +issues.close_as.resolved = Close as resolved +issues.close_as.merged = Close as merged +issues.close_as.duplicate = Close as duplicate +issues.close_as.stale = Close as stale +issues.comment_and_close_as.reopen = Comment and Reopen +issues.comment_and_close_as.common = Comment and Close Issue +issues.comment_and_close_as.archived = Comment and Close as archived +issues.comment_and_close_as.resolved = Comment and Close as resolved +issues.comment_and_close_as.merged = Comment and Close as merged +issues.comment_and_close_as.duplicate = Comment and Close as duplicate +issues.comment_and_close_as.stale = Comment and Close as stale issues.poster = Poster issues.collaborator = Collaborator issues.owner = Owner diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index cbb2e20314489..98bd0c7c679d4 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -1249,6 +1249,50 @@ func getBranchData(ctx *context.Context, issue *issues_model.Issue) { } } +type IssueCloseBtnItem struct { + Value issues_model.IssueClosedState + State string + StateAndComment string +} + +var issueCloseBtnItems = []IssueCloseBtnItem{ + { + Value: issues_model.IssueClosedState(-1), + State: "repo.issues.close_as.reopen", + StateAndComment: "repo.issues.comment_and_close_as.reopen", + }, + { + Value: issues_model.IssueClosedStateCommonClose, + State: "repo.issues.close_as.common", + StateAndComment: "repo.issues.comment_and_close_as.common", + }, + { + Value: issues_model.IssueClosedStateArchived, + State: "repo.issues.close_as.archived", + StateAndComment: "repo.issues.comment_and_close_as.archived", + }, + { + Value: issues_model.IssueClosedStateResolved, + State: "repo.issues.close_as.resolved", + StateAndComment: "repo.issues.comment_and_close_as.resolved", + }, + { + Value: issues_model.IssueClosedStateMerged, + State: "repo.issues.close_as.merged", + StateAndComment: "repo.issues.comment_and_close_as.merged", + }, + { + Value: issues_model.IssueClosedStateDuplicate, + State: "repo.issues.close_as.duplicate", + StateAndComment: "repo.issues.comment_and_close_as.duplicate", + }, + { + Value: issues_model.IssueClosedStateStale, + State: "repo.issues.close_as.stale", + StateAndComment: "repo.issues.comment_and_close_as.stale", + }, +} + // ViewIssue render issue view page func ViewIssue(ctx *context.Context) { if ctx.Params(":type") == "issues" { @@ -1309,6 +1353,21 @@ func ViewIssue(ctx *context.Context) { } ctx.Data["PageIsIssueList"] = true ctx.Data["NewIssueChooseTemplate"] = issue_service.HasTemplatesOrContactLinks(ctx.Repo.Repository, ctx.Repo.GitRepo) + + // assemble data for close/reopen button + var btnItems []IssueCloseBtnItem + for _, item := range issueCloseBtnItems { + if !issue.IsClosed && item.Value == issues_model.IssueClosedState(-1) { + // if issue is open, do not append "reopen" btn item + continue + } + if issue.IsClosed && item.Value == issue.ClosedState { + // if issue is closed and the state of issue is equal to this item, skip it. + continue + } + btnItems = append(btnItems, item) + } + ctx.Data["IssueCloseBtnItems"] = btnItems } if issue.IsPull && !ctx.Repo.CanRead(unit.TypeIssues) { diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 3669e00d5e6bd..e7051e712c1bf 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -103,6 +103,20 @@
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .DisableStatusChange)}} + {{/* start: new close / reopen button */}} +
+
+ {{svg "octicon-chevron-down" "dropdown icon"}} +
+ {{range .IssueCloseBtnItems}} +
+ {{$.locale.Tr .State}} +
+ {{end}} +
+
+
+ {{/* end: new close / reopen button */}} {{if .Issue.IsClosed}} + {{if not .Issue.IsPull}} + -
+ {{end}}
{{/* end: new close / reopen button */}} - {{if .Issue.IsClosed}} - - {{else}} - {{$closeTranslationKey := "repo.issues.close"}} - {{if .Issue.IsPull}} - {{$closeTranslationKey = "repo.pulls.close"}} - {{end}} - - {{end}} {{end}} - diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 6a225c6f7dc4d..276713ddabff8 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1051,6 +1051,10 @@ margin-top: 10px; } +.repository.view.issue .comment-list .comment .ui.form .field .ui.buttons { + vertical-align: middle; +} + .repository.view.issue .comment-list .code-comment { border: 1px solid transparent; margin: 0; diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 0dc5728f58bc0..86a6aea22d067 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -635,17 +635,15 @@ export function initSingleCommentEditor($commentForm) { // * issue/pr view page, with comment form, has status-button const opts = {}; const $statusButton = $('#status-button'); + const $statusDropdown = $('#status-dropdown'); if ($statusButton.length) { - $statusButton.on('click', (e) => { - e.preventDefault(); - $('#status').val($statusButton.data('status-val')); - $('#comment-form').trigger('submit'); - }); opts.onContentChanged = (editor) => { - $statusButton.text($statusButton.attr(editor.value().trim() ? 'data-status-and-comment' : 'data-status')); + console.log('content changed', editor.value().trim()); + $statusButton.text($statusDropdown.dropdown('get item').data(editor.value().trim() ? 'status-and-comment': 'status')); }; } initComboMarkdownEditor($commentForm.find('.combo-markdown-editor'), opts); + initRepoIssueStateButton(); } export function initIssueTemplateCommentEditors($commentForm) { @@ -684,3 +682,33 @@ export function initIssueTemplateCommentEditors($commentForm) { initCombo($(el)); } } + +function initRepoIssueStateButton() { + const $statusButton = $('#status-button'); + if (!$statusButton.length) return; + + $statusButton.on('click', (e) => { + e.preventDefault(); + $('#status').val($statusButton.data('status-value') === -1 ? 'reopen' : 'close'); + $('#comment-form').trigger('submit'); + }) + + $('#comment-button').on('click', (e) => { + e.preventDefault(); + $('#status').val(''); + $('#comment-form').trigger('submit'); + }) + + const $statusDropdown = $('#status-dropdown'); + const selectedValue = $statusDropdown.find('input[type=hidden]').val(); + + const onCloseStatusChanged = (val) => { + $statusButton.attr('data-status-value', val); + const editor = getComboMarkdownEditor($('#comment-form .combo-markdown-editor')); + const buttonText = $statusDropdown.dropdown('get item').data(editor.value().trim() ? 'status-and-comment': 'status'); + $statusButton.text(buttonText); + } + $statusDropdown.dropdown('setting', { selectOnKeydown: false, onChange: onCloseStatusChanged }); + $statusDropdown.dropdown('set selected', selectedValue); + onCloseStatusChanged(selectedValue); +} From 8ffa87da18ce6ef6f3b7bd761b065225fd4309d8 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Fri, 16 Jun 2023 14:22:53 +0800 Subject: [PATCH 03/62] form struct add closed status --- services/forms/repo_form.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index 8108a55f7a35d..c72430f6cdc29 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -454,9 +454,10 @@ func (f *CreateIssueForm) Validate(req *http.Request, errs binding.Errors) bindi // CreateCommentForm form for creating comment type CreateCommentForm struct { - Content string - Status string `binding:"OmitEmpty;In(reopen,close)"` - Files []string + Content string + Status string `binding:"OmitEmpty;In(reopen,close)"` + ClosedStatus issues_model.IssueClosedStatus + Files []string } // Validate validates the fields From 8d0d28fbf4409c99881ba1509dd1eaf3d1dc2ec6 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Mon, 19 Jun 2023 15:18:47 +0800 Subject: [PATCH 04/62] delete console log --- web_src/js/features/repo-issue.js | 1 - 1 file changed, 1 deletion(-) diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 86a6aea22d067..681448f40770f 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -638,7 +638,6 @@ export function initSingleCommentEditor($commentForm) { const $statusDropdown = $('#status-dropdown'); if ($statusButton.length) { opts.onContentChanged = (editor) => { - console.log('content changed', editor.value().trim()); $statusButton.text($statusDropdown.dropdown('get item').data(editor.value().trim() ? 'status-and-comment': 'status')); }; } From dd715575b9510c6ef3883bc7777861774a7de71f Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Mon, 19 Jun 2023 18:36:12 +0800 Subject: [PATCH 05/62] update ChangeStatus --- models/issues/dependency_test.go | 3 +- models/issues/issue_update.go | 11 +- models/issues/issue_xref_test.go | 2 +- models/issues/pull.go | 3 +- routers/api/v1/repo/issue.go | 3 +- routers/web/repo/issue.go | 225 ++++++++++++++++--------------- services/issue/commit.go | 3 +- services/issue/status.go | 15 ++- services/pull/merge.go | 3 +- services/pull/pull.go | 6 +- 10 files changed, 143 insertions(+), 131 deletions(-) diff --git a/models/issues/dependency_test.go b/models/issues/dependency_test.go index cdc8e3182d361..dac7af3e826f1 100644 --- a/models/issues/dependency_test.go +++ b/models/issues/dependency_test.go @@ -49,7 +49,8 @@ func TestCreateIssueDependency(t *testing.T) { assert.False(t, left) // Close #2 and check again - _, err = issues_model.ChangeIssueStatus(db.DefaultContext, issue2, user1, true) + issue2.IsClosed = true + _, err = issues_model.ChangeIssueStatus(db.DefaultContext, issue2, user1) assert.NoError(t, err) left, err = issues_model.IssueNoDependenciesLeft(db.DefaultContext, issue1) diff --git a/models/issues/issue_update.go b/models/issues/issue_update.go index b6fd720fe5eb8..6bff373ea4ec3 100644 --- a/models/issues/issue_update.go +++ b/models/issues/issue_update.go @@ -33,7 +33,7 @@ func UpdateIssueCols(ctx context.Context, issue *Issue, cols ...string) error { return nil } -func changeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.User, isClosed, isMergePull bool) (*Comment, error) { +func changeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.User, isMergePull bool) (*Comment, error) { // Reload the issue currentIssue, err := GetIssueByID(ctx, issue.ID) if err != nil { @@ -41,7 +41,7 @@ func changeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.User, } // Nothing should be performed if current status is same as target status - if currentIssue.IsClosed == isClosed { + if currentIssue.IsClosed == issue.IsClosed { if !issue.IsPull { return nil, ErrIssueWasClosed{ ID: issue.ID, @@ -52,7 +52,6 @@ func changeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.User, } } - issue.IsClosed = isClosed return doChangeIssueStatus(ctx, issue, doer, isMergePull) } @@ -76,7 +75,7 @@ func doChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.Use issue.ClosedUnix = 0 } - if err := UpdateIssueCols(ctx, issue, "is_closed", "closed_unix"); err != nil { + if err := UpdateIssueCols(ctx, issue, "is_closed", "closed_status", "closed_unix"); err != nil { return nil, err } @@ -119,7 +118,7 @@ func doChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.Use } // ChangeIssueStatus changes issue status to open or closed. -func ChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.User, isClosed bool) (*Comment, error) { +func ChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.User) (*Comment, error) { if err := issue.LoadRepo(ctx); err != nil { return nil, err } @@ -127,7 +126,7 @@ func ChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.User, return nil, err } - return changeIssueStatus(ctx, issue, doer, isClosed, false) + return changeIssueStatus(ctx, issue, doer, false) } // ChangeIssueTitle changes the title of this issue, as the given user. diff --git a/models/issues/issue_xref_test.go b/models/issues/issue_xref_test.go index 6e94c262723eb..b7dac09338400 100644 --- a/models/issues/issue_xref_test.go +++ b/models/issues/issue_xref_test.go @@ -98,7 +98,7 @@ func TestXRef_ResolveCrossReferences(t *testing.T) { i1 := testCreateIssue(t, 1, 2, "title1", "content1", false) i2 := testCreateIssue(t, 1, 2, "title2", "content2", false) i3 := testCreateIssue(t, 1, 2, "title3", "content3", false) - _, err := issues_model.ChangeIssueStatus(db.DefaultContext, i3, d, true) + _, err := issues_model.ChangeIssueStatus(db.DefaultContext, i3, d) assert.NoError(t, err) pr := testCreatePR(t, 1, 2, "titlepr", fmt.Sprintf("closes #%d", i1.Index)) diff --git a/models/issues/pull.go b/models/issues/pull.go index 2acc2b4226e0b..83fbe3ec505ee 100644 --- a/models/issues/pull.go +++ b/models/issues/pull.go @@ -519,7 +519,8 @@ func (pr *PullRequest) SetMerged(ctx context.Context) (bool, error) { return false, err } - if _, err := changeIssueStatus(ctx, pr.Issue, pr.Merger, true, true); err != nil { + pr.Issue.IsClosed = true + if _, err := changeIssueStatus(ctx, pr.Issue, pr.Merger, true); err != nil { return false, fmt.Errorf("Issue.changeStatus: %w", err) } diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 49252f7a4b49a..a3fb5387b8e0e 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -661,7 +661,8 @@ func CreateIssue(ctx *context.APIContext) { } if form.Closed { - if err := issue_service.ChangeStatus(issue, ctx.Doer, "", true); err != nil { + issue.IsClosed = form.Closed + if err := issue_service.ChangeStatus(issue, ctx.Doer, ""); err != nil { if issues_model.IsErrDependenciesLeft(err) { ctx.Error(http.StatusPreconditionFailed, "DependenciesLeft", "cannot close this issue because it still has open dependencies") return diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index d5115cc477d71..fd42b828003ad 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -2787,7 +2787,8 @@ func UpdateIssueStatus(ctx *context.Context) { } for _, issue := range issues { if issue.IsClosed != isClosed { - if err := issue_service.ChangeStatus(issue, ctx.Doer, "", isClosed); err != nil { + issue.IsClosed = isClosed + if err := issue_service.ChangeStatus(issue, ctx.Doer, ""); err != nil { if issues_model.IsErrDependenciesLeft(err) { ctx.JSON(http.StatusPreconditionFailed, map[string]interface{}{ "error": ctx.Tr("repo.issues.dependency.issue_batch_close_blocked", issue.Index), @@ -2853,138 +2854,142 @@ func NewComment(ctx *context.Context) { } var comment *issues_model.Comment - defer func() { - // Check if issue admin/poster changes the status of issue. - if (ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) || (ctx.IsSigned && issue.IsPoster(ctx.Doer.ID))) && - (form.Status == "reopen" || form.Status == "close") && - !(issue.IsPull && issue.PullRequest.HasMerged) { - // Duplication and conflict check should apply to reopen pull request. - var pr *issues_model.PullRequest + defer closeOrReopenIssue(ctx, form, issue, comment) - if form.Status == "reopen" && issue.IsPull { - pull := issue.PullRequest - var err error - pr, err = issues_model.GetUnmergedPullRequest(ctx, pull.HeadRepoID, pull.BaseRepoID, pull.HeadBranch, pull.BaseBranch, pull.Flow) - if err != nil { - if !issues_model.IsErrPullRequestNotExist(err) { - ctx.Flash.Error(ctx.Tr("repo.issues.dependency.pr_close_blocked")) - ctx.Redirect(fmt.Sprintf("%s/pulls/%d", ctx.Repo.RepoLink, pull.Index)) - return - } - } + // Fix #321: Allow empty comments, as long as we have attachments. + if len(form.Content) == 0 && len(attachments) == 0 { + return + } - // Regenerate patch and test conflict. - if pr == nil { - issue.PullRequest.HeadCommitID = "" - pull_service.AddToTaskQueue(issue.PullRequest) - } + comment, err := issue_service.CreateIssueComment(ctx, ctx.Doer, ctx.Repo.Repository, issue, form.Content, attachments) + if err != nil { + ctx.ServerError("CreateIssueComment", err) + return + } - // check whether the ref of PR in base repo is consistent with the head commit of head branch in the head repo - // get head commit of PR - prHeadRef := pull.GetGitRefName() - if err := pull.LoadBaseRepo(ctx); err != nil { - ctx.ServerError("Unable to load base repo", err) - return - } - prHeadCommitID, err := git.GetFullCommitID(ctx, pull.BaseRepo.RepoPath(), prHeadRef) - if err != nil { - ctx.ServerError("Get head commit Id of pr fail", err) - return - } + log.Trace("Comment created: %d/%d/%d", ctx.Repo.Repository.ID, issue.ID, comment.ID) +} - // get head commit of branch in the head repo - if err := pull.LoadHeadRepo(ctx); err != nil { - ctx.ServerError("Unable to load head repo", err) - return - } - if ok := git.IsBranchExist(ctx, pull.HeadRepo.RepoPath(), pull.BaseBranch); !ok { - // todo localize - ctx.Flash.Error("The origin branch is delete, cannot reopen.") +// closeOrReopenIssue close or reopen Issue(including PR) after creating comment. +func closeOrReopenIssue(ctx *context.Context, form *forms.CreateCommentForm, issue *issues_model.Issue, comment *issues_model.Comment) { + // Check if issue admin/poster changes the status of issue. + if (ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) || (ctx.IsSigned && issue.IsPoster(ctx.Doer.ID))) && + (form.Status == "reopen" || form.Status == "close") && + !(issue.IsPull && issue.PullRequest.HasMerged) { + + // Duplication and conflict check should apply to reopen pull request. + var pr *issues_model.PullRequest + + if form.Status == "reopen" && issue.IsPull { + pull := issue.PullRequest + var err error + pr, err = issues_model.GetUnmergedPullRequest(ctx, pull.HeadRepoID, pull.BaseRepoID, pull.HeadBranch, pull.BaseBranch, pull.Flow) + if err != nil { + if !issues_model.IsErrPullRequestNotExist(err) { + ctx.Flash.Error(ctx.Tr("repo.issues.dependency.pr_close_blocked")) ctx.Redirect(fmt.Sprintf("%s/pulls/%d", ctx.Repo.RepoLink, pull.Index)) return } - headBranchRef := pull.GetGitHeadBranchRefName() - headBranchCommitID, err := git.GetFullCommitID(ctx, pull.HeadRepo.RepoPath(), headBranchRef) - if err != nil { - ctx.ServerError("Get head commit Id of head branch fail", err) - return - } + } - err = pull.LoadIssue(ctx) - if err != nil { - ctx.ServerError("load the issue of pull request error", err) - return - } + // Regenerate patch and test conflict. + if pr == nil { + issue.PullRequest.HeadCommitID = "" + pull_service.AddToTaskQueue(issue.PullRequest) + } - if prHeadCommitID != headBranchCommitID { - // force push to base repo - err := git.Push(ctx, pull.HeadRepo.RepoPath(), git.PushOptions{ - Remote: pull.BaseRepo.RepoPath(), - Branch: pull.HeadBranch + ":" + prHeadRef, - Force: true, - Env: repo_module.InternalPushingEnvironment(pull.Issue.Poster, pull.BaseRepo), - }) - if err != nil { - ctx.ServerError("force push error", err) - return - } - } + // check whether the ref of PR in base repo is consistent with the head commit of head branch in the head repo + // get head commit of PR + prHeadRef := pull.GetGitRefName() + if err := pull.LoadBaseRepo(ctx); err != nil { + ctx.ServerError("Unable to load base repo", err) + return + } + prHeadCommitID, err := git.GetFullCommitID(ctx, pull.BaseRepo.RepoPath(), prHeadRef) + if err != nil { + ctx.ServerError("Get head commit Id of pr fail", err) + return } - if pr != nil { - ctx.Flash.Info(ctx.Tr("repo.pulls.open_unmerged_pull_exists", pr.Index)) - } else { - isClosed := form.Status == "close" - if err := issue_service.ChangeStatus(issue, ctx.Doer, "", isClosed); err != nil { - log.Error("ChangeStatus: %v", err) - - if issues_model.IsErrDependenciesLeft(err) { - if issue.IsPull { - ctx.Flash.Error(ctx.Tr("repo.issues.dependency.pr_close_blocked")) - ctx.Redirect(fmt.Sprintf("%s/pulls/%d", ctx.Repo.RepoLink, issue.Index)) - } else { - ctx.Flash.Error(ctx.Tr("repo.issues.dependency.issue_close_blocked")) - ctx.Redirect(fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issue.Index)) - } - return - } - } else { - if err := stopTimerIfAvailable(ctx.Doer, issue); err != nil { - ctx.ServerError("CreateOrStopIssueStopwatch", err) - return - } + // get head commit of branch in the head repo + if err := pull.LoadHeadRepo(ctx); err != nil { + ctx.ServerError("Unable to load head repo", err) + return + } + if ok := git.IsBranchExist(ctx, pull.HeadRepo.RepoPath(), pull.BaseBranch); !ok { + // todo localize + ctx.Flash.Error("The origin branch is delete, cannot reopen.") + ctx.Redirect(fmt.Sprintf("%s/pulls/%d", ctx.Repo.RepoLink, pull.Index)) + return + } + headBranchRef := pull.GetGitHeadBranchRefName() + headBranchCommitID, err := git.GetFullCommitID(ctx, pull.HeadRepo.RepoPath(), headBranchRef) + if err != nil { + ctx.ServerError("Get head commit Id of head branch fail", err) + return + } - log.Trace("Issue [%d] status changed to closed: %v", issue.ID, issue.IsClosed) - } + err = pull.LoadIssue(ctx) + if err != nil { + ctx.ServerError("load the issue of pull request error", err) + return } + if prHeadCommitID != headBranchCommitID { + // force push to base repo + err := git.Push(ctx, pull.HeadRepo.RepoPath(), git.PushOptions{ + Remote: pull.BaseRepo.RepoPath(), + Branch: pull.HeadBranch + ":" + prHeadRef, + Force: true, + Env: repo_module.InternalPushingEnvironment(pull.Issue.Poster, pull.BaseRepo), + }) + if err != nil { + ctx.ServerError("force push error", err) + return + } + } } - // Redirect to comment hashtag if there is any actual content. - typeName := "issues" - if issue.IsPull { - typeName = "pulls" - } - if comment != nil { - ctx.Redirect(fmt.Sprintf("%s/%s/%d#%s", ctx.Repo.RepoLink, typeName, issue.Index, comment.HashTag())) + if pr != nil { + ctx.Flash.Info(ctx.Tr("repo.pulls.open_unmerged_pull_exists", pr.Index)) } else { - ctx.Redirect(fmt.Sprintf("%s/%s/%d", ctx.Repo.RepoLink, typeName, issue.Index)) + issue.IsClosed = form.Status == "close" + if err := issue_service.ChangeStatus(issue, ctx.Doer, ""); err != nil { + log.Error("ChangeStatus: %v", err) + + if issues_model.IsErrDependenciesLeft(err) { + if issue.IsPull { + ctx.Flash.Error(ctx.Tr("repo.issues.dependency.pr_close_blocked")) + ctx.Redirect(fmt.Sprintf("%s/pulls/%d", ctx.Repo.RepoLink, issue.Index)) + } else { + ctx.Flash.Error(ctx.Tr("repo.issues.dependency.issue_close_blocked")) + ctx.Redirect(fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issue.Index)) + } + return + } + } else { + if err := stopTimerIfAvailable(ctx.Doer, issue); err != nil { + ctx.ServerError("CreateOrStopIssueStopwatch", err) + return + } + + log.Trace("Issue [%d] status changed to closed: %v", issue.ID, issue.IsClosed) + } } - }() - // Fix #321: Allow empty comments, as long as we have attachments. - if len(form.Content) == 0 && len(attachments) == 0 { - return } - comment, err := issue_service.CreateIssueComment(ctx, ctx.Doer, ctx.Repo.Repository, issue, form.Content, attachments) - if err != nil { - ctx.ServerError("CreateIssueComment", err) - return + // Redirect to comment hashtag if there is any actual content. + typeName := "issues" + if issue.IsPull { + typeName = "pulls" + } + if comment != nil { + ctx.Redirect(fmt.Sprintf("%s/%s/%d#%s", ctx.Repo.RepoLink, typeName, issue.Index, comment.HashTag())) + } else { + ctx.Redirect(fmt.Sprintf("%s/%s/%d", ctx.Repo.RepoLink, typeName, issue.Index)) } - - log.Trace("Comment created: %d/%d/%d", ctx.Repo.Repository.ID, issue.ID, comment.ID) } // UpdateCommentContent change comment of issue's content diff --git a/services/issue/commit.go b/services/issue/commit.go index 7a8c71e609c4b..087fab170ad3d 100644 --- a/services/issue/commit.go +++ b/services/issue/commit.go @@ -193,7 +193,8 @@ func UpdateIssuesCommit(doer *user_model.User, repo *repo_model.Repository, comm } if close != refIssue.IsClosed { refIssue.Repo = refRepo - if err := ChangeStatus(refIssue, doer, c.Sha1, close); err != nil { + refIssue.IsClosed = close + if err := ChangeStatus(refIssue, doer, c.Sha1); err != nil { return err } } diff --git a/services/issue/status.go b/services/issue/status.go index d4a0fce3e586a..8859692967266 100644 --- a/services/issue/status.go +++ b/services/issue/status.go @@ -14,16 +14,16 @@ import ( ) // ChangeStatus changes issue status to open or closed. -func ChangeStatus(issue *issues_model.Issue, doer *user_model.User, commitID string, closed bool) error { - return changeStatusCtx(db.DefaultContext, issue, doer, commitID, closed) +func ChangeStatus(issue *issues_model.Issue, doer *user_model.User, commitID string) error { + return changeStatusCtx(db.DefaultContext, issue, doer, commitID) } // changeStatusCtx changes issue status to open or closed. // TODO: if context is not db.DefaultContext we get a deadlock!!! -func changeStatusCtx(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, commitID string, closed bool) error { - comment, err := issues_model.ChangeIssueStatus(ctx, issue, doer, closed) +func changeStatusCtx(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, commitID string) error { + comment, err := issues_model.ChangeIssueStatus(ctx, issue, doer) if err != nil { - if issues_model.IsErrDependenciesLeft(err) && closed { + if issues_model.IsErrDependenciesLeft(err) && issue.IsClosed { if err := issues_model.FinishIssueStopwatchIfPossible(ctx, doer, issue); err != nil { log.Error("Unable to stop stopwatch for issue[%d]#%d: %v", issue.ID, issue.Index, err) } @@ -31,13 +31,14 @@ func changeStatusCtx(ctx context.Context, issue *issues_model.Issue, doer *user_ return err } - if closed { + if issue.IsClosed { if err := issues_model.FinishIssueStopwatchIfPossible(ctx, doer, issue); err != nil { return err } } - notification.NotifyIssueChangeStatus(ctx, doer, commitID, issue, comment, closed) + // TBD: whether to notify if only closed_status is changed. + notification.NotifyIssueChangeStatus(ctx, doer, commitID, issue, comment, issue.IsClosed) return nil } diff --git a/services/pull/merge.go b/services/pull/merge.go index 85bb90b853899..4a967e94cf2f7 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -229,7 +229,8 @@ func Merge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.U } close := ref.RefAction == references.XRefActionCloses if close != ref.Issue.IsClosed { - if err = issue_service.ChangeStatus(ref.Issue, doer, pr.MergedCommitID, close); err != nil { + ref.Issue.IsClosed = close + if err = issue_service.ChangeStatus(ref.Issue, doer, pr.MergedCommitID); err != nil { // Allow ErrDependenciesLeft if !issues_model.IsErrDependenciesLeft(err) { return err diff --git a/services/pull/pull.go b/services/pull/pull.go index f44e690ab7087..3c85c0a4fb897 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -521,7 +521,8 @@ func CloseBranchPulls(doer *user_model.User, repoID int64, branch string) error var errs errlist for _, pr := range prs { - if err = issue_service.ChangeStatus(pr.Issue, doer, "", true); err != nil && !issues_model.IsErrPullWasClosed(err) && !issues_model.IsErrDependenciesLeft(err) { + pr.Issue.IsClosed = true + if err = issue_service.ChangeStatus(pr.Issue, doer, ""); err != nil && !issues_model.IsErrPullWasClosed(err) && !issues_model.IsErrDependenciesLeft(err) { errs = append(errs, err) } } @@ -555,7 +556,8 @@ func CloseRepoBranchesPulls(ctx context.Context, doer *user_model.User, repo *re if pr.BaseRepoID == repo.ID { continue } - if err = issue_service.ChangeStatus(pr.Issue, doer, "", true); err != nil && !issues_model.IsErrPullWasClosed(err) { + pr.Issue.IsClosed = true + if err = issue_service.ChangeStatus(pr.Issue, doer, ""); err != nil && !issues_model.IsErrPullWasClosed(err) { errs = append(errs, err) } } From 74e2af84376f3de5c679412b7f4a150c617bcc3d Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Tue, 20 Jun 2023 15:42:19 +0800 Subject: [PATCH 06/62] update --- models/issues/issue.go | 9 ++++++++ models/issues/issue_update.go | 23 ++++++++++++------- models/issues/issue_xref_test.go | 1 + options/locale/locale_en-US.ini | 6 +++++ routers/web/repo/issue.go | 4 ++++ templates/repo/issue/view_content.tmpl | 12 +++++++--- .../repo/issue/view_content/comments.tmpl | 6 ++++- web_src/js/features/repo-issue.js | 3 ++- 8 files changed, 51 insertions(+), 13 deletions(-) diff --git a/models/issues/issue.go b/models/issues/issue.go index b0528b24ad921..f71148725162d 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -108,6 +108,15 @@ const ( IssueClosedStatusStale ) +var issueClosedCommentTrMap = map[IssueClosedStatus]string{ + IssueClosedStatusCommonClose: "repo.issues.closed_at", + IssueClosedStatusArchived: "repo.issues.closed_as_archived_at", + IssueClosedStatusResolved: "repo.issues.closed_as_resolved_at", + IssueClosedStatusMerged: "repo.issues.closed_as_merged_at", + IssueClosedStatusDuplicate: "repo.issues.closed_as_duplicate_at", + IssueClosedStatusStale: "repo.issues.closed_as_stale_at", +} + // Issue represents an issue or pull request of repository. type Issue struct { ID int64 `xorm:"pk autoincr"` diff --git a/models/issues/issue_update.go b/models/issues/issue_update.go index 6bff373ea4ec3..c972d9d1ca721 100644 --- a/models/issues/issue_update.go +++ b/models/issues/issue_update.go @@ -42,13 +42,15 @@ func changeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.User, // Nothing should be performed if current status is same as target status if currentIssue.IsClosed == issue.IsClosed { - if !issue.IsPull { - return nil, ErrIssueWasClosed{ + if issue.IsPull { + return nil, ErrPullWasClosed{ ID: issue.ID, } } - return nil, ErrPullWasClosed{ - ID: issue.ID, + if currentIssue.ClosedStatus == issue.ClosedStatus { + return nil, ErrIssueIsClosed{ + ID: issue.ID, + } } } @@ -103,6 +105,10 @@ func doChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.Use // New action comment cmtType := CommentTypeClose + var content string + if !issue.IsPull && issue.IsClosed { + content = issueClosedCommentTrMap[issue.ClosedStatus] + } if !issue.IsClosed { cmtType = CommentTypeReopen } else if isMergePull { @@ -110,10 +116,11 @@ func doChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.Use } return CreateComment(ctx, &CreateCommentOptions{ - Type: cmtType, - Doer: doer, - Repo: issue.Repo, - Issue: issue, + Type: cmtType, + Doer: doer, + Repo: issue.Repo, + Issue: issue, + Content: content, }) } diff --git a/models/issues/issue_xref_test.go b/models/issues/issue_xref_test.go index b7dac09338400..42727af1bdb5c 100644 --- a/models/issues/issue_xref_test.go +++ b/models/issues/issue_xref_test.go @@ -98,6 +98,7 @@ func TestXRef_ResolveCrossReferences(t *testing.T) { i1 := testCreateIssue(t, 1, 2, "title1", "content1", false) i2 := testCreateIssue(t, 1, 2, "title2", "content2", false) i3 := testCreateIssue(t, 1, 2, "title3", "content3", false) + i3.IsClosed = true _, err := issues_model.ChangeIssueStatus(db.DefaultContext, i3, d) assert.NoError(t, err) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 1f43a3a68dd69..bb32523011ba8 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1447,6 +1447,11 @@ issues.reopen_issue = Reopen issues.reopen_comment_issue = Comment and Reopen issues.create_comment = Comment issues.closed_at = `closed this issue %[2]s` +issues.closed_as_archived_at = `closed this issue as archived %[2]s` +issues.closed_as_resolved_at = `closed this issue as resolved %[2]s` +issues.closed_as_merged_at = `closed this issue as merged %[2]s` +issues.closed_as_duplicate_at = `closed this issue as duplicate %[2]s` +issues.closed_as_stale_at = `closed this issue as stale %[2]s` issues.reopened_at = `reopened this issue %[2]s` issues.commit_ref_at = `referenced this issue from a commit %[2]s` issues.ref_issue_from = `referenced this issue %[4]s %[2]s` @@ -1748,6 +1753,7 @@ pulls.update_branch_success = Branch update was successful pulls.update_not_allowed = You are not allowed to update branch pulls.outdated_with_base_branch = This branch is out-of-date with the base branch pulls.close = Close Pull Request +pulls.comment_and_close = Comment and close Pull Request pulls.closed_at = `closed this pull request %[2]s` pulls.reopened_at = `reopened this pull request %[2]s` pulls.merge_instruction_hint = `You can also view command line instructions.` diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index fd42b828003ad..9e52ec41c0c24 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -2955,6 +2955,10 @@ func closeOrReopenIssue(ctx *context.Context, form *forms.CreateCommentForm, iss ctx.Flash.Info(ctx.Tr("repo.pulls.open_unmerged_pull_exists", pr.Index)) } else { issue.IsClosed = form.Status == "close" + issue.ClosedStatus = issues_model.IssueClosedStatus(0) + if issue.IsClosed { + issue.ClosedStatus = form.ClosedStatus + } if err := issue_service.ChangeStatus(issue, ctx.Doer, ""); err != nil { log.Error("ChangeStatus: %v", err) diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index d7c73da86c7ed..6e21e54363744 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -103,19 +103,26 @@
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .DisableStatusChange)}} - {{/* start: new close / reopen button */}} {{$buttonTranslationKey := "repo.issues.close_as.reopen"}} + {{$buttonCommentTranslationKey := "repo.issues.comment_and_close_as.reopen"}} {{$buttonValue := -1}} {{if not .Issue.IsClosed}} {{$buttonValue = 0}} {{if .Issue.IsPull}} {{$buttonTranslationKey = "repo.pulls.close"}} + {{$buttonCommentTranslationKey = "repo.pulls.comment_and_close"}} {{else}} {{$buttonTranslationKey = "repo.issues.close_as.common"}} + {{$buttonCommentTranslationKey = "repo.issues.comment_and_close_as.common"}} {{end}} {{end}}
-
{{end}}
- {{/* end: new close / reopen button */}} {{end}}
diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 681448f40770f..de94d53683775 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -638,7 +638,8 @@ export function initSingleCommentEditor($commentForm) { const $statusDropdown = $('#status-dropdown'); if ($statusButton.length) { opts.onContentChanged = (editor) => { - $statusButton.text($statusDropdown.dropdown('get item').data(editor.value().trim() ? 'status-and-comment': 'status')); + const $source = $statusDropdown.length > 0 ? $statusDropdown.dropdown('get item') : $statusButton; + $statusButton.text($source.data(editor.value().trim() ? 'status-and-comment': 'status')); }; } initComboMarkdownEditor($commentForm.find('.combo-markdown-editor'), opts); From 23d466d50a2ab655783606d9763c479d7a02564a Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Wed, 21 Jun 2023 10:15:54 +0800 Subject: [PATCH 07/62] fix --- templates/repo/issue/view_content.tmpl | 2 +- templates/repo/issue/view_content/comments.tmpl | 2 +- web_src/css/repo.css | 9 --------- web_src/js/features/repo-issue.js | 12 ++++++------ 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index a22d1a1e4113c..05746abc48b80 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -115,7 +115,7 @@ {{$buttonCommentTranslationKey = "repo.issues.comment_and_close_as.common"}} {{end}} {{end}} -
+
{{end}} -
From d42d25f045575e324bae9dfe58e69071d1eba7ab Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Wed, 21 Jun 2023 16:38:41 +0800 Subject: [PATCH 10/62] duplicate ui modal --- options/locale/locale_en-US.ini | 2 + services/forms/repo_form.go | 9 ++-- templates/repo/issue/view_content.tmpl | 22 ++++++++ web_src/js/features/repo-issue.js | 75 +++++++++++++++----------- 4 files changed, 73 insertions(+), 35 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 3c689a6ff2416..8e025a80d6077 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1478,6 +1478,8 @@ issues.comment_and_close_as.resolved = Comment and Close as resolved issues.comment_and_close_as.merged = Comment and Close as merged issues.comment_and_close_as.duplicate = Comment and Close as duplicate issues.comment_and_close_as.stale = Comment and Close as stale +issues.duplicate.header = Select the duplicate issue +issues.duplicate.label = Duplicate Issue issues.poster = Poster issues.collaborator = Collaborator issues.owner = Owner diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index c72430f6cdc29..a7f060100cec4 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -454,10 +454,11 @@ func (f *CreateIssueForm) Validate(req *http.Request, errs binding.Errors) bindi // CreateCommentForm form for creating comment type CreateCommentForm struct { - Content string - Status string `binding:"OmitEmpty;In(reopen,close)"` - ClosedStatus issues_model.IssueClosedStatus - Files []string + Content string + Status string `binding:"OmitEmpty;In(reopen,close)"` + Files []string + ClosedStatus issues_model.IssueClosedStatus + DuplicateIssueID int64 } // Validate validates the fields diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index d8dd96b99e477..9ea7c2a2ee658 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -227,3 +227,25 @@ {{template "base/modal_actions_confirm" .}} +}} + + \ No newline at end of file diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 308e912e91686..649c805d128ad 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -87,6 +87,39 @@ export function initRepoIssueDue() { } export function initRepoIssueSidebarList() { + initIssueSearchDropdown('#new-dependency-drop-list'); + + function excludeLabel(item) { + const href = $(item).attr('href'); + const id = $(item).data('label-id'); + + const regStr = `labels=((?:-?[0-9]+%2c)*)(${id})((?:%2c-?[0-9]+)*)&`; + const newStr = 'labels=$1-$2$3&'; + + window.location = href.replace(new RegExp(regStr), newStr); + } + + $('.menu a.label-filter-item').each(function () { + $(this).on('click', function (e) { + if (e.altKey) { + e.preventDefault(); + excludeLabel(this); + } + }); + }); + + $('.menu .ui.dropdown.label-filter').on('keydown', (e) => { + if (e.altKey && e.keyCode === 13) { + const selectedItems = $('.menu .ui.dropdown.label-filter .menu .item.selected'); + if (selectedItems.length > 0) { + excludeLabel($(selectedItems[0])); + } + } + }); + $('.ui.dropdown.label-filter, .ui.dropdown.select-label').dropdown('setting', {'hideDividers': 'empty'}).dropdown('refreshItems'); +} + +function initIssueSearchDropdown(selector) { const repolink = $('#repolink').val(); const repoId = $('#repoId').val(); const crossRepoSearch = $('#crossRepoSearch').val(); @@ -95,13 +128,13 @@ export function initRepoIssueSidebarList() { if (crossRepoSearch === 'true') { issueSearchUrl = `${appSubUrl}/issues/search?q={query}&priority_repo_id=${repoId}&type=${tp}`; } - $('#new-dependency-drop-list') + $(selector) .dropdown({ apiSettings: { url: issueSearchUrl, onResponse(response) { const filteredResponse = {success: true, results: []}; - const currIssueId = $('#new-dependency-drop-list').data('issue-id'); + const currIssueId = $(selector).data('issue-id'); // Parse the response from the api to work with our dropdown $.each(response, (_i, issue) => { // Don't list current issue in the dependency list. @@ -121,35 +154,6 @@ export function initRepoIssueSidebarList() { fullTextSearch: true, }); - - function excludeLabel(item) { - const href = $(item).attr('href'); - const id = $(item).data('label-id'); - - const regStr = `labels=((?:-?[0-9]+%2c)*)(${id})((?:%2c-?[0-9]+)*)&`; - const newStr = 'labels=$1-$2$3&'; - - window.location = href.replace(new RegExp(regStr), newStr); - } - - $('.menu a.label-filter-item').each(function () { - $(this).on('click', function (e) { - if (e.altKey) { - e.preventDefault(); - excludeLabel(this); - } - }); - }); - - $('.menu .ui.dropdown.label-filter').on('keydown', (e) => { - if (e.altKey && e.keyCode === 13) { - const selectedItems = $('.menu .ui.dropdown.label-filter .menu .item.selected'); - if (selectedItems.length > 0) { - excludeLabel($(selectedItems[0])); - } - } - }); - $('.ui.dropdown.label-filter, .ui.dropdown.select-label').dropdown('setting', {'hideDividers': 'empty'}).dropdown('refreshItems'); } export function initRepoIssueCommentDelete() { @@ -691,6 +695,15 @@ function initRepoIssueStateButton() { const $statusDropdown = $('#status-dropdown'); const selectedValue = $statusDropdown.find('input[type=hidden]').val(); + $statusButton.on('click', function (e) { + if ($statusDropdown.find('input[type=hidden]').val() !== "4") return; + // if click the button of "close as duplicate", show modal to let users select issue firstly. + e.preventDefault(); + initIssueSearchDropdown('#duplicate-issues-list'); + const $duplicateModal = $('#duplicate-issue-modal'); + $duplicateModal.modal('show'); + }); + const onCloseStatusChanged = (val) => { const editor = getComboMarkdownEditor($('#comment-form .combo-markdown-editor')); const buttonText = $statusDropdown.dropdown('get item').data(editor.value().trim() ? 'status-and-comment' : 'status'); From 42de79547f4e0057df61cf990983442de9b260e2 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Wed, 21 Jun 2023 16:42:56 +0800 Subject: [PATCH 11/62] lint fix --- templates/repo/issue/view_content.tmpl | 2 +- web_src/js/features/repo-issue.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 9ea7c2a2ee658..7b911556e7782 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -248,4 +248,4 @@ {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}} - \ No newline at end of file + diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 649c805d128ad..65059a2930f17 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -695,8 +695,8 @@ function initRepoIssueStateButton() { const $statusDropdown = $('#status-dropdown'); const selectedValue = $statusDropdown.find('input[type=hidden]').val(); - $statusButton.on('click', function (e) { - if ($statusDropdown.find('input[type=hidden]').val() !== "4") return; + $statusButton.on('click', (e) => { + if ($statusDropdown.find('input[type=hidden]').val() !== '4') return; // if click the button of "close as duplicate", show modal to let users select issue firstly. e.preventDefault(); initIssueSearchDropdown('#duplicate-issues-list'); From cebbe9a5e7fea080a664b34af545311acd09c5ac Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Wed, 21 Jun 2023 17:06:24 +0800 Subject: [PATCH 12/62] temp --- models/issues/issue.go | 15 ++++++++------- templates/repo/issue/view_content.tmpl | 1 - 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/models/issues/issue.go b/models/issues/issue.go index f71148725162d..b2d23463cceb7 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -135,13 +135,14 @@ type Issue struct { Milestone *Milestone `xorm:"-"` Project *project_model.Project `xorm:"-"` Priority int - AssigneeID int64 `xorm:"-"` - Assignee *user_model.User `xorm:"-"` - IsClosed bool `xorm:"INDEX"` - ClosedStatus IssueClosedStatus - IsRead bool `xorm:"-"` - IsPull bool `xorm:"INDEX"` // Indicates whether is a pull request or not. - PullRequest *PullRequest `xorm:"-"` + AssigneeID int64 `xorm:"-"` + Assignee *user_model.User `xorm:"-"` + IsClosed bool `xorm:"INDEX"` + ClosedStatus IssueClosedStatus `xorm:"INDEX NOT NULL"` + DuplicateIssueID int64 `xorm:"INDEX NOT NULL"` + IsRead bool `xorm:"-"` + IsPull bool `xorm:"INDEX"` // Indicates whether is a pull request or not. + PullRequest *PullRequest `xorm:"-"` NumComments int Ref string PinOrder int `xorm:"DEFAULT 0"` diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 7b911556e7782..efe4363d77d8e 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -227,7 +227,6 @@ {{template "base/modal_actions_confirm" .}} -}} {{else if eq .Type 28}}
diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 65059a2930f17..e17ea75d6ef1e 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -701,7 +701,11 @@ function initRepoIssueStateButton() { e.preventDefault(); initIssueSearchDropdown('#duplicate-issues-list'); const $duplicateModal = $('#duplicate-issue-modal'); - $duplicateModal.modal('show'); + $duplicateModal.modal({ + onHidden() { + $('#duplicate-issues-list').dropdown('set exactly', []); + }, + }).modal('show'); }); const onCloseStatusChanged = (val) => { From 183cd8239d2d181d5dfe22a6016542790a00e43f Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Sun, 25 Jun 2023 18:00:40 +0800 Subject: [PATCH 15/62] lint&fmt --- models/issues/comment.go | 3 +-- models/issues/issue_update.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/models/issues/comment.go b/models/issues/comment.go index 340f7933f99f3..040d89430680d 100644 --- a/models/issues/comment.go +++ b/models/issues/comment.go @@ -1266,6 +1266,5 @@ func (c *Comment) LoadClosedIssueCommentContent(ctx context.Context) (err error) if c.DuplicateIssue, err = GetIssueByID(ctx, ctnt.DuplicateIssueID); err != nil { return } - err = c.DuplicateIssue.LoadRepo((ctx)) - return + return c.DuplicateIssue.LoadRepo((ctx)) } diff --git a/models/issues/issue_update.go b/models/issues/issue_update.go index b411cb7bd43ae..7f6567aa14006 100644 --- a/models/issues/issue_update.go +++ b/models/issues/issue_update.go @@ -5,7 +5,6 @@ package issues import ( "context" - "encoding/json" "fmt" "strings" @@ -19,6 +18,7 @@ import ( "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/references" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/timeutil" From a031a6e8f0307726cb77a52c23939a8bca3a191d Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Mon, 26 Jun 2023 15:41:40 +0800 Subject: [PATCH 16/62] transfer subscriber of original issue to duplicate issue --- models/issues/issue_update.go | 32 ++++++++++++++++++++ modules/util/slice.go | 20 +++++++++++++ modules/util/string_test.go | 55 +++++++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+) diff --git a/models/issues/issue_update.go b/models/issues/issue_update.go index 7f6567aa14006..c2ec15837d894 100644 --- a/models/issues/issue_update.go +++ b/models/issues/issue_update.go @@ -5,6 +5,7 @@ package issues import ( "context" + "errors" "fmt" "strings" @@ -22,6 +23,7 @@ import ( "code.gitea.io/gitea/modules/references" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/modules/util" "xorm.io/builder" ) @@ -114,6 +116,9 @@ func doChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.Use if issue.ClosedStatus == IssueClosedStatusDuplicate { c.DuplicateIssueID = issue.DuplicateIssueID // TODO: Transfer the issue watchers to the duplicate issue + if err := transferWatchersToDuplicateIssue(ctx, issue); err != nil { + return nil, err + } } data, err := json.Marshal(c) if err != nil { @@ -137,6 +142,33 @@ func doChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.Use }) } +// transferWatchersToDuplicateIssue transfer the watchers (including users who participated in the comments) of the original issue to the duplicate issue. +func transferWatchersToDuplicateIssue(ctx context.Context, issue *Issue) error { + if issue.DuplicateIssueID <= 0 { + return errors.New("the ID of duplicate issue cannot be zero") + } + // participants of the origianl issue + participatingUserIDs, err := issue.GetParticipantIDsByIssue(ctx) + if err != nil { + return err + } + // watchers of the original issue + iws, err := GetIssueWatchersIDs(ctx, issue.ID, true) + if err != nil { + return err + } + subscribers := util.SliceUnion(participatingUserIDs, iws) + for _, sid := range subscribers { + if err := CreateOrUpdateIssueWatch(sid, issue.DuplicateIssueID, true); err != nil { + return err + } + if err := CreateOrUpdateIssueWatch(sid, issue.ID, false); err != nil { + return err + } + } + return nil +} + // ChangeIssueStatus changes issue status to open or closed. func ChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.User) (*Comment, error) { if err := issue.LoadRepo(ctx); err != nil { diff --git a/modules/util/slice.go b/modules/util/slice.go index 74356f5496205..48b71a7047749 100644 --- a/modules/util/slice.go +++ b/modules/util/slice.go @@ -88,3 +88,23 @@ func SliceRemoveAllFunc[T comparable](slice []T, targetFunc func(T) bool) []T { } return slice[:idx] } + +// SliceRemoveAll returns the union of the slices +func SliceUnion[T comparable](inputs ...[]T) []T { + m := make(map[T]struct{}) + + for idx1 := range inputs { + for idx2 := range inputs[idx1] { + m[inputs[idx1][idx2]] = struct{}{} + } + } + + output := make([]T, len(m)) + i := 0 + for k := range m { + output[i] = k + i++ + } + + return output +} diff --git a/modules/util/string_test.go b/modules/util/string_test.go index 0a4a8bbcfbf9d..e36287ecc32e9 100644 --- a/modules/util/string_test.go +++ b/modules/util/string_test.go @@ -4,6 +4,8 @@ package util import ( + "fmt" + "sort" "testing" "github.com/stretchr/testify/assert" @@ -45,3 +47,56 @@ func TestToSnakeCase(t *testing.T) { assert.Equal(t, expected, ToSnakeCase(input)) } } + +type testSliceUnionInput[T string | int] [][]T +type testSliceUnionOutput[T string | int] []T +type testUnionItem[T string | int] struct { + input testSliceUnionInput[T] + expected testSliceUnionOutput[T] +} + +func TestSliceUnion(t *testing.T) { + intTests := []testUnionItem[int]{ + { + input: testSliceUnionInput[int]{ + []int{1, 2, 2, 3}, + []int{2, 4, 7}, + }, + expected: []int{1, 2, 3, 4, 7}, + }, + { + input: testSliceUnionInput[int]{ + []int{7, 8, 1}, + []int{1, 2, 3}, + []int{3, 4, 5}, + }, + expected: []int{1, 2, 3, 4, 5, 7, 8}, + }, + } + for i, test := range intTests { + t.Run(fmt.Sprintf("int test: %d", i), func(t *testing.T) { + actual := SliceUnion(test.input...) + // sort + sort.Ints(actual) + assert.EqualValues(t, test.expected, actual, actual) + }) + } + + stringTests := []testUnionItem[string]{ + { + input: testSliceUnionInput[string]{ + []string{"a", "c"}, + []string{"c", "d", "a", "b"}, + }, + expected: []string{"a", "b", "c", "d"}, + }, + } + for i, test := range stringTests { + t.Run(fmt.Sprintf("string test: %d", i), func(t *testing.T) { + actual := SliceUnion(test.input...) + // sort + sort.Strings(actual) + assert.EqualValues(t, test.expected, actual, actual) + }) + } +} From 033e330bd54dcfeeb50ac419463707b3056dca98 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Mon, 26 Jun 2023 17:08:08 +0800 Subject: [PATCH 17/62] fix --- models/issues/issue_update.go | 9 +++------ services/issue/status.go | 7 ++++++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/models/issues/issue_update.go b/models/issues/issue_update.go index c2ec15837d894..a384e62b4e4f7 100644 --- a/models/issues/issue_update.go +++ b/models/issues/issue_update.go @@ -115,10 +115,6 @@ func doChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.Use } if issue.ClosedStatus == IssueClosedStatusDuplicate { c.DuplicateIssueID = issue.DuplicateIssueID - // TODO: Transfer the issue watchers to the duplicate issue - if err := transferWatchersToDuplicateIssue(ctx, issue); err != nil { - return nil, err - } } data, err := json.Marshal(c) if err != nil { @@ -142,8 +138,9 @@ func doChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.Use }) } -// transferWatchersToDuplicateIssue transfer the watchers (including users who participated in the comments) of the original issue to the duplicate issue. -func transferWatchersToDuplicateIssue(ctx context.Context, issue *Issue) error { +// TransferWatchersToDuplicateIssue transfer the watchers (including users who participated in the comments) of the original issue to the duplicate issue. +// It can only be called after notification +func TransferWatchersToDuplicateIssue(ctx context.Context, issue *Issue) error { if issue.DuplicateIssueID <= 0 { return errors.New("the ID of duplicate issue cannot be zero") } diff --git a/services/issue/status.go b/services/issue/status.go index b207fb180e9c9..3a150443a3dbc 100644 --- a/services/issue/status.go +++ b/services/issue/status.go @@ -37,8 +37,13 @@ func changeStatusCtx(ctx context.Context, issue *issues_model.Issue, doer *user_ } } - // TBD: whether to notify if only `is_closed` is changed(). notification.NotifyIssueChangeStatus(ctx, doer, commitID, issue, comment, issue.IsClosed) + if issue.ClosedStatus == issues_model.IssueClosedStatusDuplicate && issue.DuplicateIssueID > 0 { + if err := issues_model.TransferWatchersToDuplicateIssue(ctx, issue); err != nil { + return err + } + } + return nil } From a4257c94ddfac6e2c00f0fa6420a50e52df7779b Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Mon, 26 Jun 2023 17:41:38 +0800 Subject: [PATCH 18/62] default issue email template --- options/locale/locale_en-US.ini | 5 +++++ templates/mail/issue/default.tmpl | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 7ec9b7da1ac28..9d449fee1e5ac 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -450,6 +450,11 @@ issue.action.force_push = %[1]s force-pushed the %[2]s from %[3]s issue.action.push_1 = @%[1]s pushed %[3]d commit to %[2]s issue.action.push_n = @%[1]s pushed %[3]d commits to %[2]s issue.action.close = @%[1]s closed #%[2]d. +issue.action.close_as_archived = @%[1]s closed as archived #%[2]d. +issue.action.close_as_resolved = @%[1]s closed as resolved #%[2]d. +issue.action.close_as_merged = @%[1]s closed as merged #%[2]d. +issue.action.close_as_duplicate = @%[1]s closed as duplicate #%[2]d. +issue.action.close_as_stale = @%[1]s closed as stale #%[2]d. issue.action.reopen = @%[1]s reopened #%[2]d. issue.action.merge = @%[1]s merged #%[2]d into %[3]s. issue.action.approve = @%[1]s approved this pull request. diff --git a/templates/mail/issue/default.tmpl b/templates/mail/issue/default.tmpl index 422a4f0461108..399e403313303 100644 --- a/templates/mail/issue/default.tmpl +++ b/templates/mail/issue/default.tmpl @@ -36,7 +36,19 @@ {{end}}

{{if eq .ActionName "close"}} - {{.locale.Tr "mail.issue.action.close" (Escape .Doer.Name) .Issue.Index | Str2html}} + {{$closeTrans := "mail.issue.action.close"}} + {{if eq .Issue.ClosedStatus 1}} + {{$closeTrans = "mail.issue.action.close_as_archived"}} + {{else if eq .Issue.ClosedStatus 2}} + {{$closeTrans = "mail.issue.action.close_as_resolved"}} + {{else if eq .Issue.ClosedStatus 3}} + {{$closeTrans = "mail.issue.action.close_as_merged"}} + {{else if eq .Issue.ClosedStatus 4}} + {{$closeTrans = "mail.issue.action.close_as_duplicate"}} + {{else if eq .Issue.ClosedStatus 5}} + {{$closeTrans = "mail.issue.action.close_as_stale"}} + {{end}} + {{.locale.Tr $closeTrans (Escape .Doer.Name) .Issue.Index | Str2html}} {{else if eq .ActionName "reopen"}} {{.locale.Tr "mail.issue.action.reopen" (Escape .Doer.Name) .Issue.Index | Str2html}} {{else if eq .ActionName "merge"}} From 83463c7446f59acd5da73eeee8fbaee9bcce680e Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Mon, 26 Jun 2023 18:15:42 +0800 Subject: [PATCH 19/62] fix issue filter in duplicate modal --- web_src/js/features/repo-issue.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index e17ea75d6ef1e..3b09720d933f1 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -119,14 +119,15 @@ export function initRepoIssueSidebarList() { $('.ui.dropdown.label-filter, .ui.dropdown.select-label').dropdown('setting', {'hideDividers': 'empty'}).dropdown('refreshItems'); } -function initIssueSearchDropdown(selector) { +function initIssueSearchDropdown(selector, isDuplicateModal) { const repolink = $('#repolink').val(); const repoId = $('#repoId').val(); const crossRepoSearch = $('#crossRepoSearch').val(); - const tp = $('#type').val(); - let issueSearchUrl = `${appSubUrl}/${repolink}/issues/search?q={query}&type=${tp}`; + const tp = isDuplicateModal ? 'issues' : $('#type').val(); + const state = isDuplicateModal ? 'all' : ''; + let issueSearchUrl = `${appSubUrl}/${repolink}/issues/search?q={query}&type=${tp}&state=${state}`; if (crossRepoSearch === 'true') { - issueSearchUrl = `${appSubUrl}/issues/search?q={query}&priority_repo_id=${repoId}&type=${tp}`; + issueSearchUrl = `${appSubUrl}/issues/search?q={query}&priority_repo_id=${repoId}&type=${tp}&state=${state}`; } $(selector) .dropdown({ @@ -699,7 +700,7 @@ function initRepoIssueStateButton() { if ($statusDropdown.find('input[type=hidden]').val() !== '4') return; // if click the button of "close as duplicate", show modal to let users select issue firstly. e.preventDefault(); - initIssueSearchDropdown('#duplicate-issues-list'); + initIssueSearchDropdown('#duplicate-issues-list', true); const $duplicateModal = $('#duplicate-issue-modal'); $duplicateModal.modal({ onHidden() { From dace5ced954e67f8c56e31b84149942e2cc191e2 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Tue, 27 Jun 2023 10:41:01 +0800 Subject: [PATCH 20/62] update --- templates/repo/issue/view_content.tmpl | 2 ++ web_src/js/features/repo-issue.js | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index efe4363d77d8e..5a8658680af08 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -4,7 +4,9 @@ + + {{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}}

diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 3b09720d933f1..4d7841a8c6bb0 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -119,12 +119,12 @@ export function initRepoIssueSidebarList() { $('.ui.dropdown.label-filter, .ui.dropdown.select-label').dropdown('setting', {'hideDividers': 'empty'}).dropdown('refreshItems'); } -function initIssueSearchDropdown(selector, isDuplicateModal) { +function initIssueSearchDropdown(selector) { const repolink = $('#repolink').val(); const repoId = $('#repoId').val(); const crossRepoSearch = $('#crossRepoSearch').val(); - const tp = isDuplicateModal ? 'issues' : $('#type').val(); - const state = isDuplicateModal ? 'all' : ''; + const tp = $('#type').val(); + const state = $('#state').val(); let issueSearchUrl = `${appSubUrl}/${repolink}/issues/search?q={query}&type=${tp}&state=${state}`; if (crossRepoSearch === 'true') { issueSearchUrl = `${appSubUrl}/issues/search?q={query}&priority_repo_id=${repoId}&type=${tp}&state=${state}`; @@ -700,11 +700,21 @@ function initRepoIssueStateButton() { if ($statusDropdown.find('input[type=hidden]').val() !== '4') return; // if click the button of "close as duplicate", show modal to let users select issue firstly. e.preventDefault(); - initIssueSearchDropdown('#duplicate-issues-list', true); + // save the original value of "type" and "state" input + const originalType = $('#type').val(); + const originalSate = $('#state').val(); + // temporarily reset the input value + $('#type').val('issue'); + $('#state').val('all'); + initIssueSearchDropdown('#duplicate-issues-list'); const $duplicateModal = $('#duplicate-issue-modal'); $duplicateModal.modal({ - onHidden() { + onHidden() { // close modal + // clear selected item in the dropdown $('#duplicate-issues-list').dropdown('set exactly', []); + // restore the value of "type" and "state" input + $('#type').val(originalType); + $('#state').val(originalSate); }, }).modal('show'); }); From fdb29770fa97c6f1fce9914c9881dad038102fe3 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Tue, 27 Jun 2023 11:27:15 +0800 Subject: [PATCH 21/62] api --- modules/structs/issue.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/structs/issue.go b/modules/structs/issue.go index a9fb6c6e797b2..99ef91c775758 100644 --- a/modules/structs/issue.go +++ b/modules/structs/issue.go @@ -108,8 +108,10 @@ type EditIssueOption struct { Milestone *int64 `json:"milestone"` State *string `json:"state"` // swagger:strfmt date-time - Deadline *time.Time `json:"due_date"` - RemoveDeadline *bool `json:"unset_due_date"` + Deadline *time.Time `json:"due_date"` + RemoveDeadline *bool `json:"unset_due_date"` + ClosedStatus int8 `json:"closed_status"` + DuplicateIssueID int64 `json:"duplicate_issue_id"` } // EditDeadlineOption options for creating a deadline From 76730d3caf38a5fe598f22debe987dc5bcb9dc55 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Tue, 27 Jun 2023 11:28:11 +0800 Subject: [PATCH 22/62] api --- routers/api/v1/repo/issue.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index a3fb5387b8e0e..e745a33b86f38 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -818,6 +818,11 @@ func EditIssue(ctx *context.APIContext) { } } issue.IsClosed = api.StateClosed == api.StateType(*form.State) + issue.ClosedStatus = issues_model.IssueClosedStatus(0) + issue.DuplicateIssueID = form.DuplicateIssueID + if issue.IsClosed { + issue.ClosedStatus = issues_model.IssueClosedStatus(form.ClosedStatus) + } } statusChangeComment, titleChanged, err := issues_model.UpdateIssueByAPI(issue, ctx.Doer) if err != nil { From 369f99596da4b23e8dc4a73c3d46f157dcc7e292 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Tue, 27 Jun 2023 13:45:27 +0800 Subject: [PATCH 23/62] unuse form in duplicate modal --- templates/repo/issue/view_content.tmpl | 26 ++++++++++---------------- web_src/js/features/repo-issue.js | 4 ++++ 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 5a8658680af08..de358bb450fcf 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -130,6 +130,7 @@ {{if not .Issue.IsPull}} + {{template "base/footer" .}} diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 2e8732b40b806..8f8e9fa0e81b8 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -26,7 +26,8 @@ {{.locale.Tr "repo.diff.browse_source"}} {{if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}{{- /* */ -}} -
{{.locale.Tr "repo.commit.operations"}} +
+ {{.locale.Tr "repo.commit.operations"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{.locale.Tr "repo.commit.operations"}}
diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 4efe81682ce19..4387e8907182f 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -192,7 +192,7 @@ {{if .HasPullRequest}}
- {{.locale.Tr "repo.pulls.has_pull_request" (Escape $.RepoLink) (Escape $.RepoRelPath) .PullRequest.Index | Safe}} + {{.locale.Tr "repo.pulls.has_pull_request" (print (Escape $.RepoLink) "/pulls/" .PullRequest.Issue.Index) (Escape $.RepoRelPath) .PullRequest.Index | Safe}}

{{RenderIssueTitle $.Context .PullRequest.Issue.Title $.RepoLink $.Repository.ComposeMetas}} #{{.PullRequest.Issue.Index}} diff --git a/templates/repo/migrate/migrate.tmpl b/templates/repo/migrate/migrate.tmpl index 01245322f8656..0e15da84255ba 100644 --- a/templates/repo/migrate/migrate.tmpl +++ b/templates/repo/migrate/migrate.tmpl @@ -3,9 +3,9 @@
{{template "repo/migrate/helper" .}} -
+
{{range .Services}} - + {{if eq .Name "github"}} {{svg "octicon-mark-github" 184 "gt-p-4"}} {{else if eq .Name "gitlab"}} diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 97c35fc7dc965..01f70e4cc2e5c 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -128,6 +128,10 @@ {{.locale.Tr "settings.add_email"}} + {{/* if ActivationsPending is false, then CanAddEmails must be true, so if CanAddEmails is false, ActivationsPending must be true */}} + {{if not .CanAddEmails}} +
{{.locale.Tr "settings.can_not_add_email_activations_pending"}}
+ {{end}}

diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go new file mode 100644 index 0000000000000..bbf7ad302e08f --- /dev/null +++ b/tests/integration/actions_trigger_test.go @@ -0,0 +1,144 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package integration + +import ( + "net/url" + "testing" + "time" + + actions_model "code.gitea.io/gitea/models/actions" + "code.gitea.io/gitea/models/db" + issues_model "code.gitea.io/gitea/models/issues" + repo_model "code.gitea.io/gitea/models/repo" + unit_model "code.gitea.io/gitea/models/unit" + "code.gitea.io/gitea/models/unittest" + user_model "code.gitea.io/gitea/models/user" + actions_module "code.gitea.io/gitea/modules/actions" + "code.gitea.io/gitea/modules/git" + repo_module "code.gitea.io/gitea/modules/repository" + pull_service "code.gitea.io/gitea/services/pull" + repo_service "code.gitea.io/gitea/services/repository" + files_service "code.gitea.io/gitea/services/repository/files" + + "github.com/stretchr/testify/assert" +) + +func TestPullRequestTargetEvent(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { + user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the base repo + user3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3}) // owner of the forked repo + + // create the base repo + baseRepo, err := repo_service.CreateRepository(db.DefaultContext, user2, user2, repo_module.CreateRepoOptions{ + Name: "repo-pull-request-target", + Description: "test pull-request-target event", + AutoInit: true, + Gitignores: "Go", + License: "MIT", + Readme: "Default", + DefaultBranch: "main", + IsPrivate: false, + }) + assert.NoError(t, err) + assert.NotEmpty(t, baseRepo) + + // enable actions + err = repo_model.UpdateRepositoryUnits(baseRepo, []repo_model.RepoUnit{{ + RepoID: baseRepo.ID, + Type: unit_model.TypeActions, + }}, nil) + assert.NoError(t, err) + + // create the forked repo + forkedRepo, err := repo_service.ForkRepository(git.DefaultContext, user2, user3, repo_service.ForkRepoOptions{ + BaseRepo: baseRepo, + Name: "forked-repo-pull-request-target", + Description: "test pull-request-target event", + }) + assert.NoError(t, err) + assert.NotEmpty(t, forkedRepo) + + // add workflow file to the base repo + addWorkflowToBaseResp, err := files_service.ChangeRepoFiles(git.DefaultContext, baseRepo, user2, &files_service.ChangeRepoFilesOptions{ + Files: []*files_service.ChangeRepoFile{ + { + Operation: "create", + TreePath: ".gitea/workflows/pr.yml", + Content: "name: test\non: pull_request_target\njobs:\n test:\n runs-on: ubuntu-latest\n steps:\n - run: echo helloworld\n", + }, + }, + Message: "add workflow", + OldBranch: "main", + NewBranch: "main", + Author: &files_service.IdentityOptions{ + Name: user2.Name, + Email: user2.Email, + }, + Committer: &files_service.IdentityOptions{ + Name: user2.Name, + Email: user2.Email, + }, + Dates: &files_service.CommitDateOptions{ + Author: time.Now(), + Committer: time.Now(), + }, + }) + assert.NoError(t, err) + assert.NotEmpty(t, addWorkflowToBaseResp) + + // add a new file to the forked repo + addFileToForkedResp, err := files_service.ChangeRepoFiles(git.DefaultContext, forkedRepo, user3, &files_service.ChangeRepoFilesOptions{ + Files: []*files_service.ChangeRepoFile{ + { + Operation: "create", + TreePath: "file_1.txt", + Content: "file1", + }, + }, + Message: "add file1", + OldBranch: "main", + NewBranch: "fork-branch-1", + Author: &files_service.IdentityOptions{ + Name: user3.Name, + Email: user3.Email, + }, + Committer: &files_service.IdentityOptions{ + Name: user3.Name, + Email: user3.Email, + }, + Dates: &files_service.CommitDateOptions{ + Author: time.Now(), + Committer: time.Now(), + }, + }) + assert.NoError(t, err) + assert.NotEmpty(t, addFileToForkedResp) + + // create Pull + pullIssue := &issues_model.Issue{ + RepoID: baseRepo.ID, + Title: "Test pull-request-target-event", + PosterID: user3.ID, + Poster: user3, + IsPull: true, + } + pullRequest := &issues_model.PullRequest{ + HeadRepoID: forkedRepo.ID, + BaseRepoID: baseRepo.ID, + HeadBranch: "fork-branch-1", + BaseBranch: "main", + HeadRepo: forkedRepo, + BaseRepo: baseRepo, + Type: issues_model.PullRequestGitea, + } + err = pull_service.NewPullRequest(git.DefaultContext, baseRepo, pullIssue, nil, nil, pullRequest, nil) + assert.NoError(t, err) + + // load and compare ActionRun + actionRun := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{RepoID: baseRepo.ID}) + assert.Equal(t, addWorkflowToBaseResp.Commit.SHA, actionRun.CommitSHA) + assert.Equal(t, actions_module.GithubEventPullRequestTarget, actionRun.TriggerEvent) + }) +} diff --git a/tests/integration/signout_test.go b/tests/integration/signout_test.go index 0e822ac04e96c..7fd0b5c64a017 100644 --- a/tests/integration/signout_test.go +++ b/tests/integration/signout_test.go @@ -16,7 +16,7 @@ func TestSignOut(t *testing.T) { session := loginUser(t, "user2") req := NewRequest(t, "POST", "/user/logout") - session.MakeRequest(t, req, http.StatusSeeOther) + session.MakeRequest(t, req, http.StatusOK) // try to view a private repo, should fail req = NewRequest(t, "GET", "/user2/repo2") diff --git a/web_src/css/admin.css b/web_src/css/admin.css index 792b76d3e2868..0a2a88f143e29 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -35,9 +35,6 @@ font-weight: var(--font-weight-semibold); width: 220px; margin-right: 5px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; } @media (max-width: 767.98px) { diff --git a/web_src/css/base.css b/web_src/css/base.css index 23930403963ae..2d649cb511627 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -2192,6 +2192,17 @@ table th[data-sortt-desc] .svg { - "> .ui.label > .delete.icon": the "x" icon for removing a label item in multiple selection dropdown */ +.ui.dropdown.mini.button, +.ui.dropdown.tiny.button { + padding-right: 20px; +} +.ui.dropdown.button { + padding-right: 22px; +} +.ui.dropdown.large.button { + padding-right: 24px; +} + /* Gitea uses SVG images instead of Fomantic builtin "" font icons, so we need to reset the icon styles */ .ui.ui.dropdown > .icon.icon { position: initial; /* plain dropdown and button dropdown use flex layout for icons */ diff --git a/web_src/css/index.css b/web_src/css/index.css index 66a1a9ffd3a1d..d7ac9f453d7d4 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -8,6 +8,7 @@ @import "./modules/card.css"; @import "./modules/comment.css"; @import "./modules/navbar.css"; +@import "./modules/toast.css"; @import "./shared/issuelist.css"; @import "./shared/milestone.css"; diff --git a/web_src/css/modules/toast.css b/web_src/css/modules/toast.css new file mode 100644 index 0000000000000..c96521f2736b9 --- /dev/null +++ b/web_src/css/modules/toast.css @@ -0,0 +1,78 @@ +.toastify { + color: var(--color-white); + position: fixed; + opacity: 0; + transition: all .2s ease; + z-index: 500; + border-radius: 4px; + box-shadow: 0 8px 24px var(--color-shadow); + display: flex; + max-width: 50vw; + min-width: 300px; + padding: 4px; +} + +.toastify.on { + opacity: 1; +} + +.toast-body { + flex: 1; + padding: 5px 0; + overflow-wrap: anywhere; +} + +.toast-close, +.toast-icon { + color: currentcolor; + border-radius: 3px; + background: transparent; + border: none; + display: inline-block; + display: flex; + width: 30px; + height: 30px; + justify-content: center; + align-items: center; +} + +.toast-close:hover { + background: var(--color-hover); +} + +.toast-close:active { + background: var(--color-active); +} + +.toastify-right { + right: 15px; +} + +.toastify-left { + left: 15px; +} + +.toastify-top { + top: -150px; +} + +.toastify-bottom { + bottom: -150px; +} + +.toastify-center { + margin-left: auto; + margin-right: auto; + left: 0; + right: 0; +} + +@media (max-width: 360px) { + .toastify-right, .toastify-left { + margin-left: auto; + margin-right: auto; + left: 0; + right: 0; + max-width: fit-content; + } +} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 3a685a106d4ac..8c339b1179b63 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -3091,18 +3091,37 @@ tbody.commit-list { } } -.repository.migrate .card { +.migrate-entries { + display: grid !important; + grid-template-columns: repeat(3, 1fr); + gap: 25px; + margin: 0 !important; +} + +@media (max-width: 767.98px) { + .migrate-entries { + grid-template-columns: repeat(1, 1fr); + } +} + +.migrate-entry { transition: all 0.1s ease-in-out; box-shadow: none !important; border: 1px solid var(--color-secondary); - color: var(--color-text); + color: var(--color-text) !important; + width: auto !important; + margin: 0 !important; } -.repository.migrate .card:hover { +.migrate-entry:hover { transform: scale(105%); box-shadow: 0 0.5rem 1rem var(--color-shadow) !important; } +.migrate-entry .description { + text-wrap: balance; +} + @media (max-width: 767.98px) { .repository.file.list #repo-files-table .entry, .repository.file.list #repo-files-table .commit-list { diff --git a/web_src/css/standalone/devtest.css b/web_src/css/standalone/devtest.css new file mode 100644 index 0000000000000..a7b00e1e56181 --- /dev/null +++ b/web_src/css/standalone/devtest.css @@ -0,0 +1,16 @@ +.button-sample-groups { + margin: 0; padding: 0; +} + +.button-sample-groups .sample-group { + list-style: none; margin: 0; padding: 0; +} + +.button-sample-groups .sample-group .ui.button { + margin-bottom: 5px; +} + +h1, h2 { + margin: 0; + padding: 10px 0; +} diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js index 8bbf202eff8b4..a99b29141d3f8 100644 --- a/web_src/js/features/common-global.js +++ b/web_src/js/features/common-global.js @@ -9,6 +9,7 @@ import {hideElem, showElem, toggleElem} from '../utils/dom.js'; import {htmlEscape} from 'escape-goat'; import {createTippy} from '../modules/tippy.js'; import {confirmModal} from './comp/ConfirmModal.js'; +import {showErrorToast} from '../modules/toast.js'; const {appUrl, appSubUrl, csrfToken, i18n} = window.config; @@ -395,8 +396,6 @@ function initGlobalShowModal() { if (colorPickers.length > 0) { initCompColorPicker(); // FIXME: this might cause duplicate init } - // all non-"ok" buttons which do not have "type" should not submit the form, should not be triggered by "Enter" - $modal.find('form button:not(.ok):not([type])').attr('type', 'button'); $modal.modal('setting', { onApprove: () => { // "form-fetch-action" can handle network errors gracefully, @@ -441,7 +440,7 @@ export function initGlobalButtons() { return; } // should never happen, otherwise there is a bug in code - alert('Nothing to hide'); + showErrorToast('Nothing to hide'); }); initGlobalShowModal(); diff --git a/web_src/js/features/comp/ComboMarkdownEditor.js b/web_src/js/features/comp/ComboMarkdownEditor.js index 103e71daae473..3d696be75b86d 100644 --- a/web_src/js/features/comp/ComboMarkdownEditor.js +++ b/web_src/js/features/comp/ComboMarkdownEditor.js @@ -8,6 +8,7 @@ import {handleGlobalEnterQuickSubmit} from './QuickSubmit.js'; import {renderPreviewPanelContent} from '../repo-editor.js'; import {easyMDEToolbarActions} from './EasyMDEToolbarActions.js'; import {initTextExpander} from './TextExpander.js'; +import {showErrorToast} from '../../modules/toast.js'; let elementIdCounter = 0; @@ -26,7 +27,7 @@ export function validateTextareaNonEmpty($textarea) { $form[0]?.reportValidity(); } else { // The alert won't hurt users too much, because we are dropping the EasyMDE and the check only occurs in a few places. - alert('Require non-empty content'); + showErrorToast('Require non-empty content'); } return false; } diff --git a/web_src/js/features/repo-issue-content.js b/web_src/js/features/repo-issue-content.js index d66f6ad4a4dbb..fc916aea1920a 100644 --- a/web_src/js/features/repo-issue-content.js +++ b/web_src/js/features/repo-issue-content.js @@ -1,5 +1,6 @@ import $ from 'jquery'; import {svg} from '../svg.js'; +import {showErrorToast} from '../modules/toast.js'; const {appSubUrl, csrfToken} = window.config; let i18nTextEdited; @@ -39,12 +40,12 @@ function showContentHistoryDetail(issueBaseUrl, commentId, historyId, itemTitleH if (resp.ok) { $dialog.modal('hide'); } else { - alert(resp.message); + showErrorToast(resp.message); } }); } } else { // required by eslint - window.alert(`unknown option item: ${optionItem}`); + showErrorToast(`unknown option item: ${optionItem}`); } }, onHide() { diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index 4d61de0ce59b4..5402f958f2a47 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -4,6 +4,7 @@ import {toggleElem} from '../utils/dom.js'; import {htmlEscape} from 'escape-goat'; import {Sortable} from 'sortablejs'; import {confirmModal} from './comp/ConfirmModal.js'; +import {showErrorToast} from '../modules/toast.js'; function initRepoIssueListCheckboxes() { const $issueSelectAll = $('.issue-checkbox-all'); @@ -75,7 +76,7 @@ function initRepoIssueListCheckboxes() { ).then(() => { window.location.reload(); }).catch((reason) => { - window.alert(reason.responseJSON.error); + showErrorToast(reason.responseJSON.error); }); }); } diff --git a/web_src/js/modules/toast.js b/web_src/js/modules/toast.js new file mode 100644 index 0000000000000..b0d02dc64470e --- /dev/null +++ b/web_src/js/modules/toast.js @@ -0,0 +1,60 @@ +import {htmlEscape} from 'escape-goat'; +import {svg} from '../svg.js'; + +const levels = { + info: { + icon: 'octicon-check', + background: 'var(--color-green)', + duration: 2500, + }, + warning: { + icon: 'gitea-exclamation', + background: 'var(--color-orange)', + duration: -1, // requires dismissal to hide + }, + error: { + icon: 'gitea-exclamation', + background: 'var(--color-red)', + duration: -1, // requires dismissal to hide + }, +}; + +// See https://github.com/apvarun/toastify-js#api for options +async function showToast(message, level, {gravity, position, duration, ...other} = {}) { + if (!message) return; + + const {default: Toastify} = await import(/* webpackChunkName: 'toastify' */'toastify-js'); + const {icon, background, duration: levelDuration} = levels[level ?? 'info']; + + const toast = Toastify({ + text: ` +
${svg(icon)}
+
${htmlEscape(message)}
+ + `, + escapeMarkup: false, + gravity: gravity ?? 'top', + position: position ?? 'center', + duration: duration ?? levelDuration, + style: {background}, + ...other, + }); + + toast.showToast(); + + toast.toastElement.querySelector('.toast-close').addEventListener('click', () => { + toast.removeElement(toast.toastElement); + }); +} + +export async function showInfoToast(message, opts) { + return await showToast(message, 'info', opts); +} + +export async function showWarningToast(message, opts) { + return await showToast(message, 'warning', opts); +} + +export async function showErrorToast(message, opts) { + return await showToast(message, 'error', opts); +} diff --git a/web_src/js/modules/toast.test.js b/web_src/js/modules/toast.test.js new file mode 100644 index 0000000000000..b691aaebb634a --- /dev/null +++ b/web_src/js/modules/toast.test.js @@ -0,0 +1,17 @@ +import {test, expect} from 'vitest'; +import {showInfoToast, showErrorToast, showWarningToast} from './toast.js'; + +test('showInfoToast', async () => { + await showInfoToast('success 😀', {duration: -1}); + expect(document.querySelector('.toastify')).toBeTruthy(); +}); + +test('showWarningToast', async () => { + await showWarningToast('warning 😐', {duration: -1}); + expect(document.querySelector('.toastify')).toBeTruthy(); +}); + +test('showErrorToast', async () => { + await showErrorToast('error 🙁', {duration: -1}); + expect(document.querySelector('.toastify')).toBeTruthy(); +}); diff --git a/web_src/js/standalone/devtest.js b/web_src/js/standalone/devtest.js new file mode 100644 index 0000000000000..d0ca511c0f36a --- /dev/null +++ b/web_src/js/standalone/devtest.js @@ -0,0 +1,11 @@ +import {showInfoToast, showWarningToast, showErrorToast} from '../modules/toast.js'; + +document.getElementById('info-toast').addEventListener('click', () => { + showInfoToast('success 😀'); +}); +document.getElementById('warning-toast').addEventListener('click', () => { + showWarningToast('warning 😐'); +}); +document.getElementById('error-toast').addEventListener('click', () => { + showErrorToast('error 🙁'); +}); diff --git a/webpack.config.js b/webpack.config.js index fb442521e99a6..6070dae24794a 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -73,6 +73,12 @@ export default { 'eventsource.sharedworker': [ fileURLToPath(new URL('web_src/js/features/eventsource.sharedworker.js', import.meta.url)), ], + ...(!isProduction && { + devtest: [ + fileURLToPath(new URL('web_src/js/standalone/devtest.js', import.meta.url)), + fileURLToPath(new URL('web_src/css/standalone/devtest.css', import.meta.url)), + ], + }), ...themes, }, devtool: false, From 322a4608350210716a49b18bf19bd4c2fad6a7c6 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Tue, 27 Jun 2023 16:02:44 +0800 Subject: [PATCH 28/62] Revert "Merge branch 'main' into feature/close_issue_with_state" This reverts commit c1d088c7e978bc6b95918ed16f15757cd3a60208. --- .eslintrc.yaml | 7 +- Makefile | 9 +- .../doc/administration/command-line.en-us.md | 8 - main.go | 15 +- models/actions/run.go | 13 +- models/migrations/migrations.go | 2 - models/migrations/v1_21/v262.go | 11 +- models/migrations/v1_21/v263.go | 19 --- modules/actions/github.go | 38 ++--- modules/actions/github_test.go | 26 ++-- modules/actions/workflows.go | 20 +-- modules/actions/workflows_test.go | 22 +-- modules/notification/base/notifier.go | 1 - modules/notification/base/null.go | 4 - modules/notification/indexer/indexer.go | 4 - modules/notification/notification.go | 7 - options/locale/locale_en-US.ini | 1 - options/locale/locale_ja-JP.ini | 2 +- options/locale/locale_ru-RU.ini | 11 -- package-lock.json | 14 +- package.json | 3 +- poetry.lock | 8 +- pyproject.toml | 2 +- routers/api/actions/runner/utils.go | 15 +- routers/web/auth/auth.go | 2 +- services/actions/notifier_helper.go | 52 +------ services/repository/adopt.go | 24 ++- templates/base/head_navbar.tmpl | 4 +- templates/devtest/gitea-ui.tmpl | 69 ++++----- templates/repo/commit_page.tmpl | 3 +- templates/repo/diff/compare.tmpl | 2 +- templates/repo/migrate/migrate.tmpl | 4 +- templates/user/settings/account.tmpl | 4 - tests/integration/actions_trigger_test.go | 144 ------------------ tests/integration/signout_test.go | 2 +- web_src/css/admin.css | 3 + web_src/css/base.css | 11 -- web_src/css/index.css | 1 - web_src/css/modules/toast.css | 78 ---------- web_src/css/repo.css | 25 +-- web_src/css/standalone/devtest.css | 16 -- web_src/js/features/common-global.js | 5 +- .../js/features/comp/ComboMarkdownEditor.js | 3 +- web_src/js/features/repo-issue-content.js | 5 +- web_src/js/features/repo-issue-list.js | 3 +- web_src/js/modules/toast.js | 60 -------- web_src/js/modules/toast.test.js | 17 --- web_src/js/standalone/devtest.js | 11 -- webpack.config.js | 6 - 49 files changed, 152 insertions(+), 664 deletions(-) delete mode 100644 models/migrations/v1_21/v263.go delete mode 100644 tests/integration/actions_trigger_test.go delete mode 100644 web_src/css/modules/toast.css delete mode 100644 web_src/css/standalone/devtest.css delete mode 100644 web_src/js/modules/toast.js delete mode 100644 web_src/js/modules/toast.test.js delete mode 100644 web_src/js/standalone/devtest.js diff --git a/.eslintrc.yaml b/.eslintrc.yaml index 71d8dc38148db..ea85ab12981f1 100644 --- a/.eslintrc.yaml +++ b/.eslintrc.yaml @@ -25,11 +25,10 @@ env: es2022: true node: true +globals: + __webpack_public_path__: true + overrides: - - files: ["web_src/**/*"] - globals: - __webpack_public_path__: true - process: false # https://github.com/webpack/webpack/issues/15833 - files: ["web_src/**/*", "docs/**/*"] env: browser: true diff --git a/Makefile b/Makefile index e2b7013d2f85f..e9c908de4aead 100644 --- a/Makefile +++ b/Makefile @@ -926,18 +926,11 @@ node_modules: package-lock.json .PHONY: npm-update npm-update: node-check | node_modules - npx updates -u -f package.json + npx updates -cu rm -rf node_modules package-lock.json npm install --package-lock @touch node_modules -.PHONY: poetry-update -poetry-update: node-check | node_modules - npx updates -u -f pyproject.toml - rm -rf .venv poetry.lock - poetry install - @touch .venv - .PHONY: fomantic fomantic: rm -rf $(FOMANTIC_WORK_DIR)/build diff --git a/docs/content/doc/administration/command-line.en-us.md b/docs/content/doc/administration/command-line.en-us.md index d7e74ee24df98..37ba0c04da61b 100644 --- a/docs/content/doc/administration/command-line.en-us.md +++ b/docs/content/doc/administration/command-line.en-us.md @@ -108,14 +108,6 @@ Admin operations: - `--all`, `-A`: Force a password change for all users - `--exclude username`, `-e username`: Exclude the given user. Can be set multiple times. - `--unset`: Revoke forced password change for the given users - - `generate-access-token`: - - Options: - - `--username value`, `-u value`: Username. Required. - - `--token-name value`, `-t value`: Token name. Required. - - `--scopes value`: Comma-separated list of scopes. Scopes follow the format `[read|write]:` or `all` where `` is one of the available visual groups you can see when opening the API page showing the available routes (for example `repo`). - - Examples: - - `gitea admin user generate-access-token --username myname --token-name mytoken` - - `gitea admin user generate-access-token --help` - `regenerate` - Options: - `hooks`: Regenerate Git Hooks for all repositories diff --git a/main.go b/main.go index 7b447e7533f0d..1c87824c83ce7 100644 --- a/main.go +++ b/main.go @@ -47,9 +47,7 @@ func init() { // ./gitea -h // ./gitea web help // ./gitea web -h (due to cli lib limitation, this won't call our cmdHelp, so no extra info) -// ./gitea admin -// ./gitea admin help -// ./gitea admin auth help +// ./gitea admin help auth // ./gitea -c /tmp/app.ini -h // ./gitea -c /tmp/app.ini help // ./gitea help -c /tmp/app.ini @@ -158,7 +156,11 @@ func prepareSubcommands(command *cli.Command, defaultFlags []cli.Flag) { // prepareWorkPathAndCustomConf wraps the Action to prepare the work path and custom config // It can't use "Before", because each level's sub-command's Before will be called one by one, so the "init" would be done multiple times -func prepareWorkPathAndCustomConf(action any) func(ctx *cli.Context) error { +func prepareWorkPathAndCustomConf(a any) func(ctx *cli.Context) error { + if a == nil { + return nil + } + action := a.(func(*cli.Context) error) return func(ctx *cli.Context) error { var args setting.ArgWorkPathAndCustomConf curCtx := ctx @@ -175,11 +177,10 @@ func prepareWorkPathAndCustomConf(action any) func(ctx *cli.Context) error { curCtx = curCtx.Parent() } setting.InitWorkPathAndCommonConfig(os.Getenv, args) - if ctx.Bool("help") || action == nil { - // the default behavior of "urfave/cli": "nil action" means "show help" + if ctx.Bool("help") { return cmdHelp.Action.(func(ctx *cli.Context) error)(ctx) } - return action.(func(*cli.Context) error)(ctx) + return action(ctx) } } diff --git a/models/actions/run.go b/models/actions/run.go index 7b62ff884f4ca..0654809900c6c 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -36,13 +36,12 @@ type ActionRun struct { TriggerUser *user_model.User `xorm:"-"` Ref string CommitSHA string - IsForkPullRequest bool // If this is triggered by a PR from a forked repository or an untrusted user, we need to check if it is approved and limit permissions when running the workflow. - NeedApproval bool // may need approval if it's a fork pull request - ApprovedBy int64 `xorm:"index"` // who approved - Event webhook_module.HookEventType // the webhook event that causes the workflow to run - EventPayload string `xorm:"LONGTEXT"` - TriggerEvent string // the trigger event defined in the `on` configuration of the triggered workflow - Status Status `xorm:"index"` + IsForkPullRequest bool // If this is triggered by a PR from a forked repository or an untrusted user, we need to check if it is approved and limit permissions when running the workflow. + NeedApproval bool // may need approval if it's a fork pull request + ApprovedBy int64 `xorm:"index"` // who approved + Event webhook_module.HookEventType + EventPayload string `xorm:"LONGTEXT"` + Status Status `xorm:"index"` Started timeutil.TimeStamp Stopped timeutil.TimeStamp Created timeutil.TimeStamp `xorm:"created"` diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 95d0977fa0469..783fef12dae60 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -506,8 +506,6 @@ var migrations = []Migration{ // v261 -> v262 NewMigration("Add variable table", v1_21.CreateVariableTable), // v262 -> v263 - NewMigration("Add TriggerEvent to action_run table", v1_21.AddTriggerEventToActionRun), - // v263 -> v264 NewMigration("Add column of closed_status and duplicate_issue_id to issue table", v1_21.AddClosedStatusAndDuplicateIssueIDToIssue), } diff --git a/models/migrations/v1_21/v262.go b/models/migrations/v1_21/v262.go index 23e900572a223..464f277987743 100644 --- a/models/migrations/v1_21/v262.go +++ b/models/migrations/v1_21/v262.go @@ -4,13 +4,16 @@ package v1_21 //nolint import ( + issues_model "code.gitea.io/gitea/models/issues" + "xorm.io/xorm" ) -func AddTriggerEventToActionRun(x *xorm.Engine) error { - type ActionRun struct { - TriggerEvent string +func AddClosedStatusAndDuplicateIssueIDToIssue(x *xorm.Engine) error { + type Issue struct { + ClosedStatus issues_model.IssueClosedStatus `xorm:"INDEX NOT NULL DEFAULT 0"` + DuplicateIssueID int64 `xorm:"NOT NULL DEFAULT 0"` } - return x.Sync(new(ActionRun)) + return x.Sync(new(Issue)) } diff --git a/models/migrations/v1_21/v263.go b/models/migrations/v1_21/v263.go deleted file mode 100644 index 464f277987743..0000000000000 --- a/models/migrations/v1_21/v263.go +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2023 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package v1_21 //nolint - -import ( - issues_model "code.gitea.io/gitea/models/issues" - - "xorm.io/xorm" -) - -func AddClosedStatusAndDuplicateIssueIDToIssue(x *xorm.Engine) error { - type Issue struct { - ClosedStatus issues_model.IssueClosedStatus `xorm:"INDEX NOT NULL DEFAULT 0"` - DuplicateIssueID int64 `xorm:"NOT NULL DEFAULT 0"` - } - - return x.Sync(new(Issue)) -} diff --git a/modules/actions/github.go b/modules/actions/github.go index 71f81a89034c5..f3cb335da98c4 100644 --- a/modules/actions/github.go +++ b/modules/actions/github.go @@ -8,33 +8,33 @@ import ( ) const ( - GithubEventPullRequest = "pull_request" - GithubEventPullRequestTarget = "pull_request_target" - GithubEventPullRequestReviewComment = "pull_request_review_comment" - GithubEventPullRequestReview = "pull_request_review" - GithubEventRegistryPackage = "registry_package" - GithubEventCreate = "create" - GithubEventDelete = "delete" - GithubEventFork = "fork" - GithubEventPush = "push" - GithubEventIssues = "issues" - GithubEventIssueComment = "issue_comment" - GithubEventRelease = "release" - GithubEventPullRequestComment = "pull_request_comment" - GithubEventGollum = "gollum" + githubEventPullRequest = "pull_request" + githubEventPullRequestTarget = "pull_request_target" + githubEventPullRequestReviewComment = "pull_request_review_comment" + githubEventPullRequestReview = "pull_request_review" + githubEventRegistryPackage = "registry_package" + githubEventCreate = "create" + githubEventDelete = "delete" + githubEventFork = "fork" + githubEventPush = "push" + githubEventIssues = "issues" + githubEventIssueComment = "issue_comment" + githubEventRelease = "release" + githubEventPullRequestComment = "pull_request_comment" + githubEventGollum = "gollum" ) // canGithubEventMatch check if the input Github event can match any Gitea event. func canGithubEventMatch(eventName string, triggedEvent webhook_module.HookEventType) bool { switch eventName { - case GithubEventRegistryPackage: + case githubEventRegistryPackage: return triggedEvent == webhook_module.HookEventPackage // See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#gollum - case GithubEventGollum: + case githubEventGollum: return triggedEvent == webhook_module.HookEventWiki - case GithubEventIssues: + case githubEventIssues: switch triggedEvent { case webhook_module.HookEventIssues, webhook_module.HookEventIssueAssign, @@ -46,7 +46,7 @@ func canGithubEventMatch(eventName string, triggedEvent webhook_module.HookEvent return false } - case GithubEventPullRequest, GithubEventPullRequestTarget: + case githubEventPullRequest, githubEventPullRequestTarget: switch triggedEvent { case webhook_module.HookEventPullRequest, webhook_module.HookEventPullRequestSync, @@ -58,7 +58,7 @@ func canGithubEventMatch(eventName string, triggedEvent webhook_module.HookEvent return false } - case GithubEventPullRequestReview: + case githubEventPullRequestReview: switch triggedEvent { case webhook_module.HookEventPullRequestReviewApproved, webhook_module.HookEventPullRequestReviewComment, diff --git a/modules/actions/github_test.go b/modules/actions/github_test.go index 4bf55ae03fccd..e7f4158ae2d1e 100644 --- a/modules/actions/github_test.go +++ b/modules/actions/github_test.go @@ -21,85 +21,85 @@ func TestCanGithubEventMatch(t *testing.T) { // registry_package event { "registry_package matches", - GithubEventRegistryPackage, + githubEventRegistryPackage, webhook_module.HookEventPackage, true, }, { "registry_package cannot match", - GithubEventRegistryPackage, + githubEventRegistryPackage, webhook_module.HookEventPush, false, }, // issues event { "issue matches", - GithubEventIssues, + githubEventIssues, webhook_module.HookEventIssueLabel, true, }, { "issue cannot match", - GithubEventIssues, + githubEventIssues, webhook_module.HookEventIssueComment, false, }, // issue_comment event { "issue_comment matches", - GithubEventIssueComment, + githubEventIssueComment, webhook_module.HookEventIssueComment, true, }, { "issue_comment cannot match", - GithubEventIssueComment, + githubEventIssueComment, webhook_module.HookEventIssues, false, }, // pull_request event { "pull_request matches", - GithubEventPullRequest, + githubEventPullRequest, webhook_module.HookEventPullRequestSync, true, }, { "pull_request cannot match", - GithubEventPullRequest, + githubEventPullRequest, webhook_module.HookEventPullRequestComment, false, }, // pull_request_target event { "pull_request_target matches", - GithubEventPullRequest, + githubEventPullRequest, webhook_module.HookEventPullRequest, true, }, { "pull_request_target cannot match", - GithubEventPullRequest, + githubEventPullRequest, webhook_module.HookEventPullRequestComment, false, }, // pull_request_review event { "pull_request_review matches", - GithubEventPullRequestReview, + githubEventPullRequestReview, webhook_module.HookEventPullRequestReviewComment, true, }, { "pull_request_review cannot match", - GithubEventPullRequestReview, + githubEventPullRequestReview, webhook_module.HookEventPullRequestComment, false, }, // other events { "create event", - GithubEventCreate, + githubEventCreate, webhook_module.HookEventCreate, true, }, diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index 3786f2a274ce3..d9459288b183e 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -20,14 +20,6 @@ import ( "gopkg.in/yaml.v3" ) -type DetectedWorkflow struct { - EntryName string - TriggerEvent string - Commit *git.Commit - Ref string - Content []byte -} - func init() { model.OnDecodeNodeError = func(node yaml.Node, out interface{}, err error) { // Log the error instead of panic or fatal. @@ -97,13 +89,13 @@ func GetEventsFromContent(content []byte) ([]*jobparser.Event, error) { return events, nil } -func DetectWorkflows(commit *git.Commit, triggedEvent webhook_module.HookEventType, payload api.Payloader) ([]*DetectedWorkflow, error) { +func DetectWorkflows(commit *git.Commit, triggedEvent webhook_module.HookEventType, payload api.Payloader) (map[string][]byte, error) { entries, err := ListWorkflows(commit) if err != nil { return nil, err } - workflows := make([]*DetectedWorkflow, 0, len(entries)) + workflows := make(map[string][]byte, len(entries)) for _, entry := range entries { content, err := GetContentFromEntry(entry) if err != nil { @@ -117,13 +109,7 @@ func DetectWorkflows(commit *git.Commit, triggedEvent webhook_module.HookEventTy for _, evt := range events { log.Trace("detect workflow %q for event %#v matching %q", entry.Name(), evt, triggedEvent) if detectMatched(commit, triggedEvent, payload, evt) { - dwf := &DetectedWorkflow{ - EntryName: entry.Name(), - TriggerEvent: evt.Name, - Commit: commit, - Content: content, - } - workflows = append(workflows, dwf) + workflows[entry.Name()] = content } } } diff --git a/modules/actions/workflows_test.go b/modules/actions/workflows_test.go index 2c374d2c0d0fc..6ef5d59942298 100644 --- a/modules/actions/workflows_test.go +++ b/modules/actions/workflows_test.go @@ -23,77 +23,77 @@ func TestDetectMatched(t *testing.T) { expected bool }{ { - desc: "HookEventCreate(create) matches GithubEventCreate(create)", + desc: "HookEventCreate(create) matches githubEventCreate(create)", triggedEvent: webhook_module.HookEventCreate, payload: nil, yamlOn: "on: create", expected: true, }, { - desc: "HookEventIssues(issues) `opened` action matches GithubEventIssues(issues)", + desc: "HookEventIssues(issues) `opened` action matches githubEventIssues(issues)", triggedEvent: webhook_module.HookEventIssues, payload: &api.IssuePayload{Action: api.HookIssueOpened}, yamlOn: "on: issues", expected: true, }, { - desc: "HookEventIssues(issues) `milestoned` action matches GithubEventIssues(issues)", + desc: "HookEventIssues(issues) `milestoned` action matches githubEventIssues(issues)", triggedEvent: webhook_module.HookEventIssues, payload: &api.IssuePayload{Action: api.HookIssueMilestoned}, yamlOn: "on: issues", expected: true, }, { - desc: "HookEventPullRequestSync(pull_request_sync) matches GithubEventPullRequest(pull_request)", + desc: "HookEventPullRequestSync(pull_request_sync) matches githubEventPullRequest(pull_request)", triggedEvent: webhook_module.HookEventPullRequestSync, payload: &api.PullRequestPayload{Action: api.HookIssueSynchronized}, yamlOn: "on: pull_request", expected: true, }, { - desc: "HookEventPullRequest(pull_request) `label_updated` action doesn't match GithubEventPullRequest(pull_request) with no activity type", + desc: "HookEventPullRequest(pull_request) `label_updated` action doesn't match githubEventPullRequest(pull_request) with no activity type", triggedEvent: webhook_module.HookEventPullRequest, payload: &api.PullRequestPayload{Action: api.HookIssueLabelUpdated}, yamlOn: "on: pull_request", expected: false, }, { - desc: "HookEventPullRequest(pull_request) `label_updated` action matches GithubEventPullRequest(pull_request) with `label` activity type", + desc: "HookEventPullRequest(pull_request) `label_updated` action matches githubEventPullRequest(pull_request) with `label` activity type", triggedEvent: webhook_module.HookEventPullRequest, payload: &api.PullRequestPayload{Action: api.HookIssueLabelUpdated}, yamlOn: "on:\n pull_request:\n types: [labeled]", expected: true, }, { - desc: "HookEventPullRequestReviewComment(pull_request_review_comment) matches GithubEventPullRequestReviewComment(pull_request_review_comment)", + desc: "HookEventPullRequestReviewComment(pull_request_review_comment) matches githubEventPullRequestReviewComment(pull_request_review_comment)", triggedEvent: webhook_module.HookEventPullRequestReviewComment, payload: &api.PullRequestPayload{Action: api.HookIssueReviewed}, yamlOn: "on:\n pull_request_review_comment:\n types: [created]", expected: true, }, { - desc: "HookEventPullRequestReviewRejected(pull_request_review_rejected) doesn't match GithubEventPullRequestReview(pull_request_review) with `dismissed` activity type (we don't support `dismissed` at present)", + desc: "HookEventPullRequestReviewRejected(pull_request_review_rejected) doesn't match githubEventPullRequestReview(pull_request_review) with `dismissed` activity type (we don't support `dismissed` at present)", triggedEvent: webhook_module.HookEventPullRequestReviewRejected, payload: &api.PullRequestPayload{Action: api.HookIssueReviewed}, yamlOn: "on:\n pull_request_review:\n types: [dismissed]", expected: false, }, { - desc: "HookEventRelease(release) `published` action matches GithubEventRelease(release) with `published` activity type", + desc: "HookEventRelease(release) `published` action matches githubEventRelease(release) with `published` activity type", triggedEvent: webhook_module.HookEventRelease, payload: &api.ReleasePayload{Action: api.HookReleasePublished}, yamlOn: "on:\n release:\n types: [published]", expected: true, }, { - desc: "HookEventPackage(package) `created` action doesn't match GithubEventRegistryPackage(registry_package) with `updated` activity type", + desc: "HookEventPackage(package) `created` action doesn't match githubEventRegistryPackage(registry_package) with `updated` activity type", triggedEvent: webhook_module.HookEventPackage, payload: &api.PackagePayload{Action: api.HookPackageCreated}, yamlOn: "on:\n registry_package:\n types: [updated]", expected: false, }, { - desc: "HookEventWiki(wiki) matches GithubEventGollum(gollum)", + desc: "HookEventWiki(wiki) matches githubEventGollum(gollum)", triggedEvent: webhook_module.HookEventWiki, payload: nil, yamlOn: "on: gollum", diff --git a/modules/notification/base/notifier.go b/modules/notification/base/notifier.go index be4d774a8b05a..e1762bb1ee9a2 100644 --- a/modules/notification/base/notifier.go +++ b/modules/notification/base/notifier.go @@ -17,7 +17,6 @@ import ( // Notifier defines an interface to notify receiver type Notifier interface { Run() - NotifyAdoptRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) NotifyCreateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) NotifyMigrateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) NotifyDeleteRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository) diff --git a/modules/notification/base/null.go b/modules/notification/base/null.go index 56a25394f995e..338790b356426 100644 --- a/modules/notification/base/null.go +++ b/modules/notification/base/null.go @@ -145,10 +145,6 @@ func (*NullNotifier) NotifyIssueChangeLabels(ctx context.Context, doer *user_mod func (*NullNotifier) NotifyCreateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) { } -// NotifyAdoptRepository places a place holder function -func (*NullNotifier) NotifyAdoptRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) { -} - // NotifyDeleteRepository places a place holder function func (*NullNotifier) NotifyDeleteRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository) { } diff --git a/modules/notification/indexer/indexer.go b/modules/notification/indexer/indexer.go index bb652e39426be..0661c2c1ab49d 100644 --- a/modules/notification/indexer/indexer.go +++ b/modules/notification/indexer/indexer.go @@ -29,10 +29,6 @@ func NewNotifier() base.Notifier { return &indexerNotifier{} } -func (r *indexerNotifier) NotifyAdoptRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) { - r.NotifyMigrateRepository(ctx, doer, u, repo) -} - func (r *indexerNotifier) NotifyCreateIssueComment(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, issue *issues_model.Issue, comment *issues_model.Comment, mentions []*user_model.User, ) { diff --git a/modules/notification/notification.go b/modules/notification/notification.go index 99e1a06ebda47..6153c9e3d6870 100644 --- a/modules/notification/notification.go +++ b/modules/notification/notification.go @@ -274,13 +274,6 @@ func NotifyCreateRepository(ctx context.Context, doer, u *user_model.User, repo } } -// NotifyAdoptRepository notifies the adoption of a repository to notifiers -func NotifyAdoptRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) { - for _, notifier := range notifiers { - notifier.NotifyAdoptRepository(ctx, doer, u, repo) - } -} - // NotifyMigrateRepository notifies create repository to notifiers func NotifyMigrateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) { for _, notifier := range notifiers { diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ea7eaeef7f6b5..9d449fee1e5ac 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -701,7 +701,6 @@ requires_activation = Requires activation primary_email = Make Primary activate_email = Send Activation activations_pending = Activations Pending -can_not_add_email_activations_pending = There is a pending activation, try again in a few minutes if you want to add a new email. delete_email = Remove email_deletion = Remove Email Address email_deletion_desc = The email address and related information will be removed from your account. Git commits by this email address will remain unchanged. Continue? diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini index 75971caa903ce..1818343f92fa6 100644 --- a/options/locale/locale_ja-JP.ini +++ b/options/locale/locale_ja-JP.ini @@ -3122,7 +3122,7 @@ notices.delete_success=システム通知を削除しました。 [action] create_repo=がリポジトリ %s を作成しました -rename_repo=がリポジトリ名を %[1]s から %[3]s へ変更しました +rename_repo=がリポジトリ名を %[1]s から [3]s へ変更しました commit_repo=が %[4]s の %[3]s にプッシュしました create_issue=`がイシュー %[3]s#%[2]s をオープンしました` close_issue=`がイシュー %[3]s#%[2]s をクローズしました` diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index 3688a42d71fc2..72226f0a8b5d5 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -136,8 +136,6 @@ footer.software=О программе footer.links=Ссылки [heatmap] -number_of_contributions_in_the_last_12_months=Принимал(а) участие %s раз за последние 12 месяцев -no_contributions=Не принимал(а) участия less=Меньше more=Больше @@ -1015,7 +1013,6 @@ template.one_item=Необходимо выбрать хотя бы один э template.invalid=Необходимо выбрать хранилище шаблонов archive.title=Это репозиторий в архиве. Вы можете его клонировать или просматривать файлы, но не вносить изменения или открывать задачи/запросы на слияние. -archive.title_date=Этот репозиторий архивирован %s. Вы можете смотреть файлы или клонировать его, но не можете вносить изменения, открывать задачи или делать запросы на слияние. archive.issue.nocomment=Этот репозиторий в архиве. Вы не можете комментировать задачи. archive.pull.nocomment=Это репозиторий в архиве. Вы не можете комментировать запросы на слияние. @@ -1711,7 +1708,6 @@ pulls.rebase_conflict=Слияние не удалось: Произошел к pulls.rebase_conflict_summary=Сообщение об ошибке pulls.unrelated_histories=Слияние не удалось: У источника и цели слияния нет общей истории. Совет: попробуйте другую стратегию pulls.merge_out_of_date=Ошибка слияния: при создании слияния база данных была обновлена. Подсказка: попробуйте ещё раз. -pulls.head_out_of_date=Ошибка слияния: во время слияния головной коммит был обновлён. Попробуйте ещё раз. pulls.push_rejected=Слияние не удалось: отправка была отклонена. Проверьте Git-хуки для этого репозитория. pulls.push_rejected_summary=Полная ошибка отклонения pulls.push_rejected_no_message=Слияние не удалось: отправка была отклонена, но сервер не указал причину.
Проверьте Git-хуки для этого репозитория @@ -1916,10 +1912,6 @@ settings.githooks=Git-хуки settings.basic_settings=Основные параметры settings.mirror_settings=Настройки зеркалирования settings.mirror_settings.docs.disabled_push_mirror.pull_mirror_warning=В настоящее время это можно сделать только в меню «Новая миграция». Для получения дополнительной информации, пожалуйста, ознакомьтесь: -settings.mirror_settings.docs.no_new_mirrors=Ваш репозиторий зеркалирует изменения в другой репозиторий или из него. Пожалуйста, имейте в виду, что в данный момент невозможно создавать новые зеркала. -settings.mirror_settings.docs.can_still_use=Хотя вы не можете изменять существующие зеркала или создавать новые, вы можете по-прежнему использовать существующее зеркало. -settings.mirror_settings.docs.pull_mirror_instructions=Чтобы настроить pull-зеркало, пожалуйста, ознакомьтесь: -settings.mirror_settings.docs.doc_link_title=Как зеркалировать репозитории? settings.mirror_settings.docs.pulling_remote_title=Получение из удалённого репозитория settings.mirror_settings.mirrored_repository=Синхронизированное хранилище settings.mirror_settings.direction=Направление @@ -2033,7 +2025,6 @@ settings.delete_notices_2=- Эта операция навсегда удали settings.delete_notices_fork_1=- Все форки станут независимыми репозиториями после удаления. settings.deletion_success=Репозиторий удалён. settings.update_settings_success=Настройки репозитория обновлены. -settings.update_settings_no_unit=Должно быть разрешено хоть какое-то взаимодействие с репозиторием. settings.confirm_delete=Удалить репозиторий settings.add_collaborator=Добавить соавтора settings.add_collaborator_success=Соавтор добавлен. @@ -2133,7 +2124,6 @@ settings.event_pull_request_sync=Синхронизация запроса на settings.event_pull_request_sync_desc=Запрос на слияние синхронизирован. settings.event_pull_request_review_request=Запрошена рецензия для запроса на слияние settings.event_pull_request_review_request_desc=Создан или удалён запрос на рецензию для запроса на слияние. -settings.event_pull_request_approvals=Утверждения запросов на слияние settings.event_package=Пакеты settings.event_package_desc=Пакет создан или удален в репозитории. settings.branch_filter=Фильтр веток @@ -2208,7 +2198,6 @@ settings.protect_merge_whitelist_committers_desc=Разрешить приним settings.protect_merge_whitelist_users=Пользователи с правом на слияние: settings.protect_merge_whitelist_teams=Команды, члены которых обладают правом на слияние: settings.protect_check_status_contexts=Включить проверку статуса -settings.protect_status_check_patterns=Шаблоны проверки состояния: settings.protect_check_status_contexts_desc=Требуется пройти проверку состояния перед слиянием. Выберите, какие проверки состояния должны быть пройдены, прежде чем ветви можно будет объединить в ветвь, соответствующую этому правилу. Если этот параметр включен, коммиты сначала должны быть перемещены в другую ветвь, а затем объединены или перемещены непосредственно в ветвь, соответствующую этому правилу, после прохождения проверки состояния. Если контексты не выбраны, то последняя фиксация должна быть успешной независимо от контекста. settings.protect_check_status_contexts_list=Проверки состояния за последнюю неделю для этого репозитория settings.protect_invalid_status_check_pattern=Неверный шаблон проверки состояния: «%s». diff --git a/package-lock.json b/package-lock.json index dcda7d2fed390..11638d4d7f66d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,6 @@ "swagger-ui-dist": "5.0.0", "throttle-debounce": "5.0.0", "tippy.js": "6.3.7", - "toastify-js": "1.12.0", "tributejs": "5.1.3", "uint8-to-base64": "0.2.0", "vue": "3.3.4", @@ -78,7 +77,7 @@ "stylelint-declaration-strict-value": "1.9.2", "stylelint-stylistic": "0.4.2", "svgo": "3.0.2", - "updates": "14.2.8", + "updates": "14.2.4", "vitest": "0.32.2" }, "engines": { @@ -10123,11 +10122,6 @@ "node": ">=8.0" } }, - "node_modules/toastify-js": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/toastify-js/-/toastify-js-1.12.0.tgz", - "integrity": "sha512-HeMHCO9yLPvP9k0apGSdPUWrUbLnxUKNFzgUoZp1PHCLploIX/4DSQ7V8H25ef+h4iO9n0he7ImfcndnN6nDrQ==" - }, "node_modules/toidentifier": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", @@ -10369,9 +10363,9 @@ } }, "node_modules/updates": { - "version": "14.2.8", - "resolved": "https://registry.npmjs.org/updates/-/updates-14.2.8.tgz", - "integrity": "sha512-Ca+M1vKKBBRiQSi3yrN8OdncmP9osIf1oJM/HpEIHeDvyGLs/noTi9X2LS4zl50VXRTSCqssF5CZN0XWzSPigg==", + "version": "14.2.4", + "resolved": "https://registry.npmjs.org/updates/-/updates-14.2.4.tgz", + "integrity": "sha512-r54h4Q12lUAmQ9dENy7BnY22AnTfW4YGEZw73gv6RvNEWgcZ3qS88jPLc1ckPAzt/8TPKWwLkSVpbEpgGwglJw==", "dev": true, "bin": { "updates": "bin/updates.js" diff --git a/package.json b/package.json index 9659771212c27..fd68c1d341863 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,6 @@ "swagger-ui-dist": "5.0.0", "throttle-debounce": "5.0.0", "tippy.js": "6.3.7", - "toastify-js": "1.12.0", "tributejs": "5.1.3", "uint8-to-base64": "0.2.0", "vue": "3.3.4", @@ -77,7 +76,7 @@ "stylelint-declaration-strict-value": "1.9.2", "stylelint-stylistic": "0.4.2", "svgo": "3.0.2", - "updates": "14.2.8", + "updates": "14.2.4", "vitest": "0.32.2" }, "browserslist": [ diff --git a/poetry.lock b/poetry.lock index 7d106e15519ea..69258f749c99f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -42,13 +42,13 @@ six = ">=1.13.0" [[package]] name = "djlint" -version = "1.31.1" +version = "1.31.0" description = "HTML Template Linter and Formatter" optional = false python-versions = ">=3.8.0,<4.0.0" files = [ - {file = "djlint-1.31.1-py3-none-any.whl", hash = "sha256:9b2e2fc3a059a8e5a62f309edea15c1aeee331a279ab2699b9fb51a31d8c0934"}, - {file = "djlint-1.31.1.tar.gz", hash = "sha256:a11739e2f919f760b3986eb13d06e00171f3bd342b8d88e9bd914a4260eaa8ce"}, + {file = "djlint-1.31.0-py3-none-any.whl", hash = "sha256:2b9200c67103b79835b7547ff732e910888d1f0ef684f5b329eb64b14d09c046"}, + {file = "djlint-1.31.0.tar.gz", hash = "sha256:8acb4b751b429c5aabb1aef5b6007bdf53224eceda25c5fbe04c42cc57c0a7ba"}, ] [package.dependencies] @@ -328,4 +328,4 @@ telegram = ["requests"] [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "f03ad8e7c4f6e797ac3c04630db8cc16438cd59642653c26fd401633cd62d696" +content-hash = "22c4af11eadd8784b613951d6160d67be0f33500238a450741c3d75beb218dad" diff --git a/pyproject.toml b/pyproject.toml index 7a30f5914066e..ce5f475b272fa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ authors = [] python = "^3.8" [tool.poetry.group.dev.dependencies] -djlint = "1.31.1" +djlint = "1.31.0" [tool.djlint] profile="golang" diff --git a/routers/api/actions/runner/utils.go b/routers/api/actions/runner/utils.go index ab70f622b39b7..cc9c06ab455cc 100644 --- a/routers/api/actions/runner/utils.go +++ b/routers/api/actions/runner/utils.go @@ -9,7 +9,6 @@ import ( actions_model "code.gitea.io/gitea/models/actions" secret_model "code.gitea.io/gitea/models/secret" - actions_module "code.gitea.io/gitea/modules/actions" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" @@ -55,10 +54,8 @@ func pickTask(ctx context.Context, runner *actions_model.ActionRunner) (*runnerv func getSecretsOfTask(ctx context.Context, task *actions_model.ActionTask) map[string]string { secrets := map[string]string{} - if task.Job.Run.IsForkPullRequest && task.Job.Run.TriggerEvent != actions_module.GithubEventPullRequestTarget { + if task.Job.Run.IsForkPullRequest { // ignore secrets for fork pull request - // for the tasks triggered by pull_request_target event, they could access the secrets because they will run in the context of the base branch - // see the documentation: https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target return secrets } @@ -119,14 +116,6 @@ func generateTaskContext(t *actions_model.ActionTask) *structpb.Struct { event := map[string]interface{}{} _ = json.Unmarshal([]byte(t.Job.Run.EventPayload), &event) - // TriggerEvent is added in https://github.com/go-gitea/gitea/pull/25229 - // This fallback is for the old ActionRun that doesn't have the TriggerEvent field - // and should be removed in 1.22 - eventName := t.Job.Run.TriggerEvent - if eventName == "" { - eventName = t.Job.Run.Event.Event() - } - baseRef := "" headRef := "" if pullPayload, err := t.Job.Run.GetPullRequestEventPayload(); err == nil && pullPayload.PullRequest != nil && pullPayload.PullRequest.Base != nil && pullPayload.PullRequest.Head != nil { @@ -148,7 +137,7 @@ func generateTaskContext(t *actions_model.ActionTask) *structpb.Struct { "base_ref": baseRef, // string, The base_ref or target branch of the pull request in a workflow run. This property is only available when the event that triggers a workflow run is either pull_request or pull_request_target. "env": "", // string, Path on the runner to the file that sets environment variables from workflow commands. This file is unique to the current step and is a different file for each step in a job. For more information, see "Workflow commands for GitHub Actions." "event": event, // object, The full event webhook payload. You can access individual properties of the event using this context. This object is identical to the webhook payload of the event that triggered the workflow run, and is different for each event. The webhooks for each GitHub Actions event is linked in "Events that trigger workflows." For example, for a workflow run triggered by the push event, this object contains the contents of the push webhook payload. - "event_name": eventName, // string, The name of the event that triggered the workflow run. + "event_name": t.Job.Run.Event.Event(), // string, The name of the event that triggered the workflow run. "event_path": "", // string, The path to the file on the runner that contains the full event webhook payload. "graphql_url": "", // string, The URL of the GitHub GraphQL API. "head_ref": headRef, // string, The head_ref or source branch of the pull request in a workflow run. This property is only available when the event that triggers a workflow run is either pull_request or pull_request_target. diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go index bc8f6d58c9270..e0883a2696564 100644 --- a/routers/web/auth/auth.go +++ b/routers/web/auth/auth.go @@ -383,7 +383,7 @@ func SignOut(ctx *context.Context) { }) } HandleSignOut(ctx) - ctx.JSONRedirect(setting.AppSubURL + "/") + ctx.Redirect(setting.AppSubURL + "/") } // SignUp render the register page diff --git a/services/actions/notifier_helper.go b/services/actions/notifier_helper.go index 8e6cdcf680d1b..69c23656f2919 100644 --- a/services/actions/notifier_helper.go +++ b/services/actions/notifier_helper.go @@ -142,46 +142,13 @@ func notify(ctx context.Context, input *notifyInput) error { return fmt.Errorf("gitRepo.GetCommit: %w", err) } - var detectedWorkflows []*actions_module.DetectedWorkflow workflows, err := actions_module.DetectWorkflows(commit, input.Event, input.Payload) if err != nil { return fmt.Errorf("DetectWorkflows: %w", err) } + if len(workflows) == 0 { log.Trace("repo %s with commit %s couldn't find workflows", input.Repo.RepoPath(), commit.ID) - } else { - for _, wf := range workflows { - if wf.TriggerEvent != actions_module.GithubEventPullRequestTarget { - wf.Ref = ref - detectedWorkflows = append(detectedWorkflows, wf) - } - } - } - - if input.PullRequest != nil { - // detect pull_request_target workflows - baseRef := git.BranchPrefix + input.PullRequest.BaseBranch - baseCommit, err := gitRepo.GetCommit(baseRef) - if err != nil { - return fmt.Errorf("gitRepo.GetCommit: %w", err) - } - baseWorkflows, err := actions_module.DetectWorkflows(baseCommit, input.Event, input.Payload) - if err != nil { - return fmt.Errorf("DetectWorkflows: %w", err) - } - if len(baseWorkflows) == 0 { - log.Trace("repo %s with commit %s couldn't find pull_request_target workflows", input.Repo.RepoPath(), baseCommit.ID) - } else { - for _, wf := range baseWorkflows { - if wf.TriggerEvent == actions_module.GithubEventPullRequestTarget { - wf.Ref = baseRef - detectedWorkflows = append(detectedWorkflows, wf) - } - } - } - } - - if len(detectedWorkflows) == 0 { return nil } @@ -205,19 +172,18 @@ func notify(ctx context.Context, input *notifyInput) error { } } - for _, dwf := range detectedWorkflows { + for id, content := range workflows { run := &actions_model.ActionRun{ Title: strings.SplitN(commit.CommitMessage, "\n", 2)[0], RepoID: input.Repo.ID, OwnerID: input.Repo.OwnerID, - WorkflowID: dwf.EntryName, + WorkflowID: id, TriggerUserID: input.Doer.ID, - Ref: dwf.Ref, - CommitSHA: dwf.Commit.ID.String(), + Ref: ref, + CommitSHA: commit.ID.String(), IsForkPullRequest: isForkPullRequest, Event: input.Event, EventPayload: string(p), - TriggerEvent: dwf.TriggerEvent, Status: actions_model.StatusWaiting, } if need, err := ifNeedApproval(ctx, run, input.Repo, input.Doer); err != nil { @@ -227,7 +193,7 @@ func notify(ctx context.Context, input *notifyInput) error { run.NeedApproval = need } - jobs, err := jobparser.Parse(dwf.Content) + jobs, err := jobparser.Parse(content) if err != nil { log.Error("jobparser.Parse: %v", err) continue @@ -293,10 +259,8 @@ func notifyPackage(ctx context.Context, sender *user_model.User, pd *packages_mo } func ifNeedApproval(ctx context.Context, run *actions_model.ActionRun, repo *repo_model.Repository, user *user_model.User) (bool, error) { - // 1. don't need approval if it's not a fork PR - // 2. don't need approval if the event is `pull_request_target` since the workflow will run in the context of base branch - // see https://docs.github.com/en/actions/managing-workflow-runs/approving-workflow-runs-from-public-forks#about-workflow-runs-from-public-forks - if !run.IsForkPullRequest || run.TriggerEvent == actions_module.GithubEventPullRequestTarget { + // don't need approval if it's not a fork PR + if !run.IsForkPullRequest { return false, nil } diff --git a/services/repository/adopt.go b/services/repository/adopt.go index e07ff35041915..55e77a78a78a9 100644 --- a/services/repository/adopt.go +++ b/services/repository/adopt.go @@ -70,17 +70,9 @@ func AdoptRepository(ctx context.Context, doer, u *user_model.User, opts repo_mo if err := repo_module.CreateRepositoryByExample(ctx, doer, u, repo, true, false); err != nil { return err } - - // Re-fetch the repository from database before updating it (else it would - // override changes that were done earlier with sql) - if repo, err = repo_model.GetRepositoryByID(ctx, repo.ID); err != nil { - return fmt.Errorf("getRepositoryByID: %w", err) - } - - if err := adoptRepository(ctx, repoPath, doer, repo, opts.DefaultBranch); err != nil { + if err := adoptRepository(ctx, repoPath, doer, repo, opts); err != nil { return fmt.Errorf("createDelegateHooks: %w", err) } - if err := repo_module.CheckDaemonExportOK(ctx, repo); err != nil { return fmt.Errorf("checkDaemonExportOK: %w", err) } @@ -103,12 +95,12 @@ func AdoptRepository(ctx context.Context, doer, u *user_model.User, opts repo_mo return nil, err } - notification.NotifyAdoptRepository(ctx, doer, u, repo) + notification.NotifyCreateRepository(ctx, doer, u, repo) return repo, nil } -func adoptRepository(ctx context.Context, repoPath string, u *user_model.User, repo *repo_model.Repository, defaultBranch string) (err error) { +func adoptRepository(ctx context.Context, repoPath string, u *user_model.User, repo *repo_model.Repository, opts repo_module.CreateRepoOptions) (err error) { isExist, err := util.IsExist(repoPath) if err != nil { log.Error("Unable to check if %s exists. Error: %v", repoPath, err) @@ -122,6 +114,12 @@ func adoptRepository(ctx context.Context, repoPath string, u *user_model.User, r return fmt.Errorf("createDelegateHooks: %w", err) } + // Re-fetch the repository from database before updating it (else it would + // override changes that were done earlier with sql) + if repo, err = repo_model.GetRepositoryByID(ctx, repo.ID); err != nil { + return fmt.Errorf("getRepositoryByID: %w", err) + } + repo.IsEmpty = false // Don't bother looking this repo in the context it won't be there @@ -131,8 +129,8 @@ func adoptRepository(ctx context.Context, repoPath string, u *user_model.User, r } defer gitRepo.Close() - if len(defaultBranch) > 0 { - repo.DefaultBranch = defaultBranch + if len(opts.DefaultBranch) > 0 { + repo.DefaultBranch = opts.DefaultBranch if err = gitRepo.SetDefaultBranch(repo.DefaultBranch); err != nil { return fmt.Errorf("setDefaultBranch: %w", err) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 3898c98ac9b77..a2be0187d9c40 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -68,7 +68,7 @@

- + {{svg "octicon-sign-out"}} {{.locale.Tr "sign_out"}} @@ -186,7 +186,7 @@ {{end}}
- + {{svg "octicon-sign-out"}} {{.locale.Tr "sign_out"}} diff --git a/templates/devtest/gitea-ui.tmpl b/templates/devtest/gitea-ui.tmpl index 8b31957f2e0c4..0da443aade128 100644 --- a/templates/devtest/gitea-ui.tmpl +++ b/templates/devtest/gitea-ui.tmpl @@ -1,5 +1,4 @@ {{template "base/head" .}} -

Button

@@ -15,6 +14,11 @@
+

  • General purpose:

    @@ -161,6 +165,13 @@
    item
+
+ button dropdown + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
+
item
+
+
search ... @@ -201,57 +212,33 @@
- mini dropdown - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
-
- tiny dropdown - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
-
- button dropdown - {{svg "octicon-triangle-down" 14 "dropdown icon"}} + small dropdown + {{svg "octicon-triangle-down" 12 "dropdown icon"}} +
+
item
+
large dropdown - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
-
- -
-
- mini compact - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
-
- tiny compact - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
-
- button compact - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
-
- large compact - {{svg "octicon-triangle-down" 14 "dropdown icon"}} + {{svg "octicon-triangle-down" 18 "dropdown icon"}} +
+
item
+
-
-

Toast

-
- - - -
-
-

ComboMarkdownEditor

ps: no JS code attached, so just a layout
{{template "shared/combomarkdowneditor" .}}
- + +
{{template "base/footer" .}} diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 8f8e9fa0e81b8..2e8732b40b806 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -26,8 +26,7 @@ {{.locale.Tr "repo.diff.browse_source"}} {{if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}{{- /* */ -}} -
- {{.locale.Tr "repo.commit.operations"}} +
{{.locale.Tr "repo.commit.operations"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{.locale.Tr "repo.commit.operations"}}
diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 4387e8907182f..4efe81682ce19 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -192,7 +192,7 @@ {{if .HasPullRequest}}
- {{.locale.Tr "repo.pulls.has_pull_request" (print (Escape $.RepoLink) "/pulls/" .PullRequest.Issue.Index) (Escape $.RepoRelPath) .PullRequest.Index | Safe}} + {{.locale.Tr "repo.pulls.has_pull_request" (Escape $.RepoLink) (Escape $.RepoRelPath) .PullRequest.Index | Safe}}

{{RenderIssueTitle $.Context .PullRequest.Issue.Title $.RepoLink $.Repository.ComposeMetas}} #{{.PullRequest.Issue.Index}} diff --git a/templates/repo/migrate/migrate.tmpl b/templates/repo/migrate/migrate.tmpl index 0e15da84255ba..01245322f8656 100644 --- a/templates/repo/migrate/migrate.tmpl +++ b/templates/repo/migrate/migrate.tmpl @@ -3,9 +3,9 @@
{{template "repo/migrate/helper" .}} -
+
{{range .Services}} - + {{if eq .Name "github"}} {{svg "octicon-mark-github" 184 "gt-p-4"}} {{else if eq .Name "gitlab"}} diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 01f70e4cc2e5c..97c35fc7dc965 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -128,10 +128,6 @@ {{.locale.Tr "settings.add_email"}} - {{/* if ActivationsPending is false, then CanAddEmails must be true, so if CanAddEmails is false, ActivationsPending must be true */}} - {{if not .CanAddEmails}} -
{{.locale.Tr "settings.can_not_add_email_activations_pending"}}
- {{end}}

diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go deleted file mode 100644 index bbf7ad302e08f..0000000000000 --- a/tests/integration/actions_trigger_test.go +++ /dev/null @@ -1,144 +0,0 @@ -// Copyright 2023 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "net/url" - "testing" - "time" - - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/git" - repo_module "code.gitea.io/gitea/modules/repository" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - - "github.com/stretchr/testify/assert" -) - -func TestPullRequestTargetEvent(t *testing.T) { - onGiteaRun(t, func(t *testing.T, u *url.URL) { - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the base repo - user3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3}) // owner of the forked repo - - // create the base repo - baseRepo, err := repo_service.CreateRepository(db.DefaultContext, user2, user2, repo_module.CreateRepoOptions{ - Name: "repo-pull-request-target", - Description: "test pull-request-target event", - AutoInit: true, - Gitignores: "Go", - License: "MIT", - Readme: "Default", - DefaultBranch: "main", - IsPrivate: false, - }) - assert.NoError(t, err) - assert.NotEmpty(t, baseRepo) - - // enable actions - err = repo_model.UpdateRepositoryUnits(baseRepo, []repo_model.RepoUnit{{ - RepoID: baseRepo.ID, - Type: unit_model.TypeActions, - }}, nil) - assert.NoError(t, err) - - // create the forked repo - forkedRepo, err := repo_service.ForkRepository(git.DefaultContext, user2, user3, repo_service.ForkRepoOptions{ - BaseRepo: baseRepo, - Name: "forked-repo-pull-request-target", - Description: "test pull-request-target event", - }) - assert.NoError(t, err) - assert.NotEmpty(t, forkedRepo) - - // add workflow file to the base repo - addWorkflowToBaseResp, err := files_service.ChangeRepoFiles(git.DefaultContext, baseRepo, user2, &files_service.ChangeRepoFilesOptions{ - Files: []*files_service.ChangeRepoFile{ - { - Operation: "create", - TreePath: ".gitea/workflows/pr.yml", - Content: "name: test\non: pull_request_target\njobs:\n test:\n runs-on: ubuntu-latest\n steps:\n - run: echo helloworld\n", - }, - }, - Message: "add workflow", - OldBranch: "main", - NewBranch: "main", - Author: &files_service.IdentityOptions{ - Name: user2.Name, - Email: user2.Email, - }, - Committer: &files_service.IdentityOptions{ - Name: user2.Name, - Email: user2.Email, - }, - Dates: &files_service.CommitDateOptions{ - Author: time.Now(), - Committer: time.Now(), - }, - }) - assert.NoError(t, err) - assert.NotEmpty(t, addWorkflowToBaseResp) - - // add a new file to the forked repo - addFileToForkedResp, err := files_service.ChangeRepoFiles(git.DefaultContext, forkedRepo, user3, &files_service.ChangeRepoFilesOptions{ - Files: []*files_service.ChangeRepoFile{ - { - Operation: "create", - TreePath: "file_1.txt", - Content: "file1", - }, - }, - Message: "add file1", - OldBranch: "main", - NewBranch: "fork-branch-1", - Author: &files_service.IdentityOptions{ - Name: user3.Name, - Email: user3.Email, - }, - Committer: &files_service.IdentityOptions{ - Name: user3.Name, - Email: user3.Email, - }, - Dates: &files_service.CommitDateOptions{ - Author: time.Now(), - Committer: time.Now(), - }, - }) - assert.NoError(t, err) - assert.NotEmpty(t, addFileToForkedResp) - - // create Pull - pullIssue := &issues_model.Issue{ - RepoID: baseRepo.ID, - Title: "Test pull-request-target-event", - PosterID: user3.ID, - Poster: user3, - IsPull: true, - } - pullRequest := &issues_model.PullRequest{ - HeadRepoID: forkedRepo.ID, - BaseRepoID: baseRepo.ID, - HeadBranch: "fork-branch-1", - BaseBranch: "main", - HeadRepo: forkedRepo, - BaseRepo: baseRepo, - Type: issues_model.PullRequestGitea, - } - err = pull_service.NewPullRequest(git.DefaultContext, baseRepo, pullIssue, nil, nil, pullRequest, nil) - assert.NoError(t, err) - - // load and compare ActionRun - actionRun := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{RepoID: baseRepo.ID}) - assert.Equal(t, addWorkflowToBaseResp.Commit.SHA, actionRun.CommitSHA) - assert.Equal(t, actions_module.GithubEventPullRequestTarget, actionRun.TriggerEvent) - }) -} diff --git a/tests/integration/signout_test.go b/tests/integration/signout_test.go index 7fd0b5c64a017..0e822ac04e96c 100644 --- a/tests/integration/signout_test.go +++ b/tests/integration/signout_test.go @@ -16,7 +16,7 @@ func TestSignOut(t *testing.T) { session := loginUser(t, "user2") req := NewRequest(t, "POST", "/user/logout") - session.MakeRequest(t, req, http.StatusOK) + session.MakeRequest(t, req, http.StatusSeeOther) // try to view a private repo, should fail req = NewRequest(t, "GET", "/user2/repo2") diff --git a/web_src/css/admin.css b/web_src/css/admin.css index 0a2a88f143e29..792b76d3e2868 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -35,6 +35,9 @@ font-weight: var(--font-weight-semibold); width: 220px; margin-right: 5px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } @media (max-width: 767.98px) { diff --git a/web_src/css/base.css b/web_src/css/base.css index 2d649cb511627..23930403963ae 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -2192,17 +2192,6 @@ table th[data-sortt-desc] .svg { - "> .ui.label > .delete.icon": the "x" icon for removing a label item in multiple selection dropdown */ -.ui.dropdown.mini.button, -.ui.dropdown.tiny.button { - padding-right: 20px; -} -.ui.dropdown.button { - padding-right: 22px; -} -.ui.dropdown.large.button { - padding-right: 24px; -} - /* Gitea uses SVG images instead of Fomantic builtin "" font icons, so we need to reset the icon styles */ .ui.ui.dropdown > .icon.icon { position: initial; /* plain dropdown and button dropdown use flex layout for icons */ diff --git a/web_src/css/index.css b/web_src/css/index.css index d7ac9f453d7d4..66a1a9ffd3a1d 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -8,7 +8,6 @@ @import "./modules/card.css"; @import "./modules/comment.css"; @import "./modules/navbar.css"; -@import "./modules/toast.css"; @import "./shared/issuelist.css"; @import "./shared/milestone.css"; diff --git a/web_src/css/modules/toast.css b/web_src/css/modules/toast.css deleted file mode 100644 index c96521f2736b9..0000000000000 --- a/web_src/css/modules/toast.css +++ /dev/null @@ -1,78 +0,0 @@ -.toastify { - color: var(--color-white); - position: fixed; - opacity: 0; - transition: all .2s ease; - z-index: 500; - border-radius: 4px; - box-shadow: 0 8px 24px var(--color-shadow); - display: flex; - max-width: 50vw; - min-width: 300px; - padding: 4px; -} - -.toastify.on { - opacity: 1; -} - -.toast-body { - flex: 1; - padding: 5px 0; - overflow-wrap: anywhere; -} - -.toast-close, -.toast-icon { - color: currentcolor; - border-radius: 3px; - background: transparent; - border: none; - display: inline-block; - display: flex; - width: 30px; - height: 30px; - justify-content: center; - align-items: center; -} - -.toast-close:hover { - background: var(--color-hover); -} - -.toast-close:active { - background: var(--color-active); -} - -.toastify-right { - right: 15px; -} - -.toastify-left { - left: 15px; -} - -.toastify-top { - top: -150px; -} - -.toastify-bottom { - bottom: -150px; -} - -.toastify-center { - margin-left: auto; - margin-right: auto; - left: 0; - right: 0; -} - -@media (max-width: 360px) { - .toastify-right, .toastify-left { - margin-left: auto; - margin-right: auto; - left: 0; - right: 0; - max-width: fit-content; - } -} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 8c339b1179b63..3a685a106d4ac 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -3091,37 +3091,18 @@ tbody.commit-list { } } -.migrate-entries { - display: grid !important; - grid-template-columns: repeat(3, 1fr); - gap: 25px; - margin: 0 !important; -} - -@media (max-width: 767.98px) { - .migrate-entries { - grid-template-columns: repeat(1, 1fr); - } -} - -.migrate-entry { +.repository.migrate .card { transition: all 0.1s ease-in-out; box-shadow: none !important; border: 1px solid var(--color-secondary); - color: var(--color-text) !important; - width: auto !important; - margin: 0 !important; + color: var(--color-text); } -.migrate-entry:hover { +.repository.migrate .card:hover { transform: scale(105%); box-shadow: 0 0.5rem 1rem var(--color-shadow) !important; } -.migrate-entry .description { - text-wrap: balance; -} - @media (max-width: 767.98px) { .repository.file.list #repo-files-table .entry, .repository.file.list #repo-files-table .commit-list { diff --git a/web_src/css/standalone/devtest.css b/web_src/css/standalone/devtest.css deleted file mode 100644 index a7b00e1e56181..0000000000000 --- a/web_src/css/standalone/devtest.css +++ /dev/null @@ -1,16 +0,0 @@ -.button-sample-groups { - margin: 0; padding: 0; -} - -.button-sample-groups .sample-group { - list-style: none; margin: 0; padding: 0; -} - -.button-sample-groups .sample-group .ui.button { - margin-bottom: 5px; -} - -h1, h2 { - margin: 0; - padding: 10px 0; -} diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js index a99b29141d3f8..8bbf202eff8b4 100644 --- a/web_src/js/features/common-global.js +++ b/web_src/js/features/common-global.js @@ -9,7 +9,6 @@ import {hideElem, showElem, toggleElem} from '../utils/dom.js'; import {htmlEscape} from 'escape-goat'; import {createTippy} from '../modules/tippy.js'; import {confirmModal} from './comp/ConfirmModal.js'; -import {showErrorToast} from '../modules/toast.js'; const {appUrl, appSubUrl, csrfToken, i18n} = window.config; @@ -396,6 +395,8 @@ function initGlobalShowModal() { if (colorPickers.length > 0) { initCompColorPicker(); // FIXME: this might cause duplicate init } + // all non-"ok" buttons which do not have "type" should not submit the form, should not be triggered by "Enter" + $modal.find('form button:not(.ok):not([type])').attr('type', 'button'); $modal.modal('setting', { onApprove: () => { // "form-fetch-action" can handle network errors gracefully, @@ -440,7 +441,7 @@ export function initGlobalButtons() { return; } // should never happen, otherwise there is a bug in code - showErrorToast('Nothing to hide'); + alert('Nothing to hide'); }); initGlobalShowModal(); diff --git a/web_src/js/features/comp/ComboMarkdownEditor.js b/web_src/js/features/comp/ComboMarkdownEditor.js index 3d696be75b86d..103e71daae473 100644 --- a/web_src/js/features/comp/ComboMarkdownEditor.js +++ b/web_src/js/features/comp/ComboMarkdownEditor.js @@ -8,7 +8,6 @@ import {handleGlobalEnterQuickSubmit} from './QuickSubmit.js'; import {renderPreviewPanelContent} from '../repo-editor.js'; import {easyMDEToolbarActions} from './EasyMDEToolbarActions.js'; import {initTextExpander} from './TextExpander.js'; -import {showErrorToast} from '../../modules/toast.js'; let elementIdCounter = 0; @@ -27,7 +26,7 @@ export function validateTextareaNonEmpty($textarea) { $form[0]?.reportValidity(); } else { // The alert won't hurt users too much, because we are dropping the EasyMDE and the check only occurs in a few places. - showErrorToast('Require non-empty content'); + alert('Require non-empty content'); } return false; } diff --git a/web_src/js/features/repo-issue-content.js b/web_src/js/features/repo-issue-content.js index fc916aea1920a..d66f6ad4a4dbb 100644 --- a/web_src/js/features/repo-issue-content.js +++ b/web_src/js/features/repo-issue-content.js @@ -1,6 +1,5 @@ import $ from 'jquery'; import {svg} from '../svg.js'; -import {showErrorToast} from '../modules/toast.js'; const {appSubUrl, csrfToken} = window.config; let i18nTextEdited; @@ -40,12 +39,12 @@ function showContentHistoryDetail(issueBaseUrl, commentId, historyId, itemTitleH if (resp.ok) { $dialog.modal('hide'); } else { - showErrorToast(resp.message); + alert(resp.message); } }); } } else { // required by eslint - showErrorToast(`unknown option item: ${optionItem}`); + window.alert(`unknown option item: ${optionItem}`); } }, onHide() { diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index 5402f958f2a47..4d61de0ce59b4 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -4,7 +4,6 @@ import {toggleElem} from '../utils/dom.js'; import {htmlEscape} from 'escape-goat'; import {Sortable} from 'sortablejs'; import {confirmModal} from './comp/ConfirmModal.js'; -import {showErrorToast} from '../modules/toast.js'; function initRepoIssueListCheckboxes() { const $issueSelectAll = $('.issue-checkbox-all'); @@ -76,7 +75,7 @@ function initRepoIssueListCheckboxes() { ).then(() => { window.location.reload(); }).catch((reason) => { - showErrorToast(reason.responseJSON.error); + window.alert(reason.responseJSON.error); }); }); } diff --git a/web_src/js/modules/toast.js b/web_src/js/modules/toast.js deleted file mode 100644 index b0d02dc64470e..0000000000000 --- a/web_src/js/modules/toast.js +++ /dev/null @@ -1,60 +0,0 @@ -import {htmlEscape} from 'escape-goat'; -import {svg} from '../svg.js'; - -const levels = { - info: { - icon: 'octicon-check', - background: 'var(--color-green)', - duration: 2500, - }, - warning: { - icon: 'gitea-exclamation', - background: 'var(--color-orange)', - duration: -1, // requires dismissal to hide - }, - error: { - icon: 'gitea-exclamation', - background: 'var(--color-red)', - duration: -1, // requires dismissal to hide - }, -}; - -// See https://github.com/apvarun/toastify-js#api for options -async function showToast(message, level, {gravity, position, duration, ...other} = {}) { - if (!message) return; - - const {default: Toastify} = await import(/* webpackChunkName: 'toastify' */'toastify-js'); - const {icon, background, duration: levelDuration} = levels[level ?? 'info']; - - const toast = Toastify({ - text: ` -
${svg(icon)}
-
${htmlEscape(message)}
- - `, - escapeMarkup: false, - gravity: gravity ?? 'top', - position: position ?? 'center', - duration: duration ?? levelDuration, - style: {background}, - ...other, - }); - - toast.showToast(); - - toast.toastElement.querySelector('.toast-close').addEventListener('click', () => { - toast.removeElement(toast.toastElement); - }); -} - -export async function showInfoToast(message, opts) { - return await showToast(message, 'info', opts); -} - -export async function showWarningToast(message, opts) { - return await showToast(message, 'warning', opts); -} - -export async function showErrorToast(message, opts) { - return await showToast(message, 'error', opts); -} diff --git a/web_src/js/modules/toast.test.js b/web_src/js/modules/toast.test.js deleted file mode 100644 index b691aaebb634a..0000000000000 --- a/web_src/js/modules/toast.test.js +++ /dev/null @@ -1,17 +0,0 @@ -import {test, expect} from 'vitest'; -import {showInfoToast, showErrorToast, showWarningToast} from './toast.js'; - -test('showInfoToast', async () => { - await showInfoToast('success 😀', {duration: -1}); - expect(document.querySelector('.toastify')).toBeTruthy(); -}); - -test('showWarningToast', async () => { - await showWarningToast('warning 😐', {duration: -1}); - expect(document.querySelector('.toastify')).toBeTruthy(); -}); - -test('showErrorToast', async () => { - await showErrorToast('error 🙁', {duration: -1}); - expect(document.querySelector('.toastify')).toBeTruthy(); -}); diff --git a/web_src/js/standalone/devtest.js b/web_src/js/standalone/devtest.js deleted file mode 100644 index d0ca511c0f36a..0000000000000 --- a/web_src/js/standalone/devtest.js +++ /dev/null @@ -1,11 +0,0 @@ -import {showInfoToast, showWarningToast, showErrorToast} from '../modules/toast.js'; - -document.getElementById('info-toast').addEventListener('click', () => { - showInfoToast('success 😀'); -}); -document.getElementById('warning-toast').addEventListener('click', () => { - showWarningToast('warning 😐'); -}); -document.getElementById('error-toast').addEventListener('click', () => { - showErrorToast('error 🙁'); -}); diff --git a/webpack.config.js b/webpack.config.js index 6070dae24794a..fb442521e99a6 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -73,12 +73,6 @@ export default { 'eventsource.sharedworker': [ fileURLToPath(new URL('web_src/js/features/eventsource.sharedworker.js', import.meta.url)), ], - ...(!isProduction && { - devtest: [ - fileURLToPath(new URL('web_src/js/standalone/devtest.js', import.meta.url)), - fileURLToPath(new URL('web_src/css/standalone/devtest.css', import.meta.url)), - ], - }), ...themes, }, devtool: false, From 1514c444c4eabd96d7a5828a154425ee455adcfd Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Wed, 28 Jun 2023 13:33:41 +0800 Subject: [PATCH 29/62] fix api --- routers/api/v1/repo/issue.go | 6 ++++++ routers/web/repo/issue.go | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index e745a33b86f38..712b822288926 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -840,6 +840,12 @@ func EditIssue(ctx *context.APIContext) { if statusChangeComment != nil { notification.NotifyIssueChangeStatus(ctx, ctx.Doer, "", issue, statusChangeComment, issue.IsClosed) + if issue.ClosedStatus == issues_model.IssueClosedStatusDuplicate && issue.DuplicateIssueID > 0 { + if err := issues_model.TransferWatchersToDuplicateIssue(ctx, issue); err != nil { + ctx.Error(http.StatusInternalServerError, "TransferWatchersToDuplicateIssue", err) + return + } + } } // Refetch from database to assign some automatic values diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 3423cee2c8deb..75ae25f38b13e 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -1354,11 +1354,11 @@ func ViewIssue(ctx *context.Context) { ctx.Data["PageIsIssueList"] = true ctx.Data["NewIssueChooseTemplate"] = issue_service.HasTemplatesOrContactLinks(ctx.Repo.Repository, ctx.Repo.GitRepo) - // assemble data for close/reopen button + // assemble data for close/reopen issue dropdown. var btnItems []IssueCloseBtnItem for _, item := range issueCloseBtnItems { if !issue.IsClosed && item.Value == issues_model.IssueClosedStatus(-1) { - // if issue is open, do not append "reopen" btn item + // if issue is open, do not append "reopen" btn item. continue } if issue.IsClosed && item.Value == issue.ClosedStatus { From 6fcc8f73253ec867741e697eb9a4b736ae5da0e5 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Wed, 28 Jun 2023 14:48:27 +0800 Subject: [PATCH 30/62] delete merged --- models/issues/issue.go | 9 +++------ options/locale/locale_en-US.ini | 2 -- routers/web/repo/issue.go | 11 +++-------- templates/mail/issue/default.tmpl | 6 ++---- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/models/issues/issue.go b/models/issues/issue.go index 0179d9cd50991..a5f294d07edf1 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -100,21 +100,18 @@ const ( IssueClosedStatusArchived // IssueClosedStatusResolved close issue as resolved. IssueClosedStatusResolved - // IssueClosedStatusMerged close issue as merged. - IssueClosedStatusMerged - // IssueClosedStatusDuplicate close issue as duplicate. - IssueClosedStatusDuplicate // IssueClosedStatusStale close issue as stale. IssueClosedStatusStale + // IssueClosedStatusDuplicate close issue as duplicate. + IssueClosedStatusDuplicate ) var issueClosedCommentTrMap = map[IssueClosedStatus]string{ IssueClosedStatusCommonClose: "repo.issues.closed_at", IssueClosedStatusArchived: "repo.issues.closed_as_archived_at", IssueClosedStatusResolved: "repo.issues.closed_as_resolved_at", - IssueClosedStatusMerged: "repo.issues.closed_as_merged_at", - IssueClosedStatusDuplicate: "repo.issues.closed_as_duplicate_at", IssueClosedStatusStale: "repo.issues.closed_as_stale_at", + IssueClosedStatusDuplicate: "repo.issues.closed_as_duplicate_at", } type ClosedIssueCommentContent struct { diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ea7eaeef7f6b5..3f070709b3f01 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -452,7 +452,6 @@ issue.action.push_n = @%[1]s pushed %[3]d commits to %[2]s issue.action.close = @%[1]s closed #%[2]d. issue.action.close_as_archived = @%[1]s closed as archived #%[2]d. issue.action.close_as_resolved = @%[1]s closed as resolved #%[2]d. -issue.action.close_as_merged = @%[1]s closed as merged #%[2]d. issue.action.close_as_duplicate = @%[1]s closed as duplicate #%[2]d. issue.action.close_as_stale = @%[1]s closed as stale #%[2]d. issue.action.reopen = @%[1]s reopened #%[2]d. @@ -1459,7 +1458,6 @@ issues.create_comment = Comment issues.closed_at = `closed this issue %[2]s` issues.closed_as_archived_at = `closed this issue as archived %[2]s` issues.closed_as_resolved_at = `closed this issue as resolved %[2]s` -issues.closed_as_merged_at = `closed this issue as merged %[2]s` issues.closed_as_duplicate_at = `closed this issue as duplicate %[2]s` issues.closed_as_stale_at = `closed this issue as stale %[2]s` issues.reopened_at = `reopened this issue %[2]s` diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 75ae25f38b13e..ffba90372ca06 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -1277,20 +1277,15 @@ var issueCloseBtnItems = []IssueCloseBtnItem{ StatusAndComment: "repo.issues.comment_and_close_as.resolved", }, { - Value: issues_model.IssueClosedStatusMerged, - Status: "repo.issues.close_as.merged", - StatusAndComment: "repo.issues.comment_and_close_as.merged", + Value: issues_model.IssueClosedStatusStale, + Status: "repo.issues.close_as.stale", + StatusAndComment: "repo.issues.comment_and_close_as.stale", }, { Value: issues_model.IssueClosedStatusDuplicate, Status: "repo.issues.close_as.duplicate", StatusAndComment: "repo.issues.comment_and_close_as.duplicate", }, - { - Value: issues_model.IssueClosedStatusStale, - Status: "repo.issues.close_as.stale", - StatusAndComment: "repo.issues.comment_and_close_as.stale", - }, } // ViewIssue render issue view page diff --git a/templates/mail/issue/default.tmpl b/templates/mail/issue/default.tmpl index db7c9bc7fef76..6f6c9b31303a9 100644 --- a/templates/mail/issue/default.tmpl +++ b/templates/mail/issue/default.tmpl @@ -42,11 +42,9 @@ {{else if eq .Issue.ClosedStatus 2}} {{$closeTrans = "mail.issue.action.close_as_resolved"}} {{else if eq .Issue.ClosedStatus 3}} - {{$closeTrans = "mail.issue.action.close_as_merged"}} - {{else if eq .Issue.ClosedStatus 4}} - {{$closeTrans = "mail.issue.action.close_as_duplicate"}} - {{else if eq .Issue.ClosedStatus 5}} {{$closeTrans = "mail.issue.action.close_as_stale"}} + {{else if eq .Issue.ClosedStatus 4}} + {{$closeTrans = "mail.issue.action.close_as_duplicate"}} {{end}} {{.locale.Tr $closeTrans (Escape .Doer.Name) .Issue.Index | Str2html}} {{else if eq .ActionName "reopen"}} From a2a2c74b0a6982e4e8677279f4168431eed2fbc3 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Wed, 28 Jun 2023 15:02:09 +0800 Subject: [PATCH 31/62] fix lint --- options/locale/locale_en-US.ini | 2 -- templates/mail/issue/default.tmpl | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 3f070709b3f01..73cf9e87d4bca 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1473,14 +1473,12 @@ issues.close_as.reopen = Reopen issues.close_as.common = Close Issue issues.close_as.archived = Close as archived issues.close_as.resolved = Close as resolved -issues.close_as.merged = Close as merged issues.close_as.duplicate = Close as duplicate issues.close_as.stale = Close as stale issues.comment_and_close_as.reopen = Comment and Reopen issues.comment_and_close_as.common = Comment and Close Issue issues.comment_and_close_as.archived = Comment and Close as archived issues.comment_and_close_as.resolved = Comment and Close as resolved -issues.comment_and_close_as.merged = Comment and Close as merged issues.comment_and_close_as.duplicate = Comment and Close as duplicate issues.comment_and_close_as.stale = Comment and Close as stale issues.duplicate.header = Select the duplicate issue diff --git a/templates/mail/issue/default.tmpl b/templates/mail/issue/default.tmpl index 6f6c9b31303a9..b7a60620532ef 100644 --- a/templates/mail/issue/default.tmpl +++ b/templates/mail/issue/default.tmpl @@ -44,7 +44,7 @@ {{else if eq .Issue.ClosedStatus 3}} {{$closeTrans = "mail.issue.action.close_as_stale"}} {{else if eq .Issue.ClosedStatus 4}} - {{$closeTrans = "mail.issue.action.close_as_duplicate"}} + {{$closeTrans = "mail.issue.action.close_as_duplicate"}} {{end}} {{.locale.Tr $closeTrans (Escape .Doer.Name) .Issue.Index | Str2html}} {{else if eq .ActionName "reopen"}} From 944287bad7a741c13f79bd88791923447003afba Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Thu, 29 Jun 2023 10:06:15 +0800 Subject: [PATCH 32/62] fix --- models/migrations/v1_21/v264.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 models/migrations/v1_21/v264.go diff --git a/models/migrations/v1_21/v264.go b/models/migrations/v1_21/v264.go new file mode 100644 index 0000000000000..464f277987743 --- /dev/null +++ b/models/migrations/v1_21/v264.go @@ -0,0 +1,19 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package v1_21 //nolint + +import ( + issues_model "code.gitea.io/gitea/models/issues" + + "xorm.io/xorm" +) + +func AddClosedStatusAndDuplicateIssueIDToIssue(x *xorm.Engine) error { + type Issue struct { + ClosedStatus issues_model.IssueClosedStatus `xorm:"INDEX NOT NULL DEFAULT 0"` + DuplicateIssueID int64 `xorm:"NOT NULL DEFAULT 0"` + } + + return x.Sync(new(Issue)) +} From 1757d03280b4dbf6fdf6372285594d7ec9a91096 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Mon, 10 Jul 2023 15:35:15 +0800 Subject: [PATCH 33/62] pass element instead of selector --- web_src/js/features/repo-issue.js | 54 +++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index f85cacd062746..42929976a688e 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -87,7 +87,7 @@ export function initRepoIssueDue() { } export function initRepoIssueSidebarList() { - initIssueSearchDropdown('#new-dependency-drop-list'); + initIssueSearchDropdown($('#new-dependency-drop-list')); function excludeLabel(item) { const href = $(item).attr('href'); @@ -119,7 +119,7 @@ export function initRepoIssueSidebarList() { $('.ui.dropdown.label-filter, .ui.dropdown.select-label').dropdown('setting', {'hideDividers': 'empty'}).dropdown('refreshItems'); } -function initIssueSearchDropdown(selector) { +function initIssueSearchDropdown($list) { const repolink = $('#repolink').val(); const repoId = $('#repoId').val(); const crossRepoSearch = $('#crossRepoSearch').val(); @@ -129,32 +129,31 @@ function initIssueSearchDropdown(selector) { if (crossRepoSearch === 'true') { issueSearchUrl = `${appSubUrl}/issues/search?q={query}&priority_repo_id=${repoId}&type=${tp}&state=${state}`; } - $(selector) - .dropdown({ - apiSettings: { - url: issueSearchUrl, - onResponse(response) { - const filteredResponse = {success: true, results: []}; - const currIssueId = $(selector).data('issue-id'); - // Parse the response from the api to work with our dropdown - $.each(response, (_i, issue) => { - // Don't list current issue in the dependency list. - if (issue.id === currIssueId) { - return; - } - filteredResponse.results.push({ - name: `#${issue.number} ${htmlEscape(issue.title) - }
${htmlEscape(issue.repository.full_name)}
`, - value: issue.id, - }); + $list.dropdown({ + apiSettings: { + url: issueSearchUrl, + onResponse(response) { + const filteredResponse = {success: true, results: []}; + const currIssueId = $list.data('issue-id'); + // Parse the response from the api to work with our dropdown + $.each(response, (_i, issue) => { + // Don't list current issue in the dependency list. + if (issue.id === currIssueId) { + return; + } + filteredResponse.results.push({ + name: `#${issue.number} ${htmlEscape(issue.title) + }
${htmlEscape(issue.repository.full_name)}
`, + value: issue.id, }); - return filteredResponse; - }, - cache: false, + }); + return filteredResponse; }, + cache: false, + }, - fullTextSearch: true, - }); + fullTextSearch: true, + }); } export function initRepoIssueCommentDelete() { @@ -706,12 +705,13 @@ function initRepoIssueStateButton() { // temporarily reset the input value $('#type').val('issue'); $('#state').val('all'); - initIssueSearchDropdown('#duplicate-issues-list'); + const $duplicateDropdown = $('#duplicate-issues-list'); + initIssueSearchDropdown($duplicateDropdown); const $duplicateModal = $('#duplicate-issue-modal'); $duplicateModal.modal({ onHidden() { // close modal // clear selected item in the dropdown - $('#duplicate-issues-list').dropdown('set exactly', []); + $duplicateDropdown.dropdown('set exactly', []); // restore the value of "type" and "state" input $('#type').val(originalType); $('#state').val(originalSate); From 0f5be3a4c2a2e65789f0fe5d2506dcfda726cd8f Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Mon, 10 Jul 2023 15:58:34 +0800 Subject: [PATCH 34/62] do not use keycode --- web_src/js/features/repo-issue.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 42929976a688e..f500254c3bf54 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -109,7 +109,7 @@ export function initRepoIssueSidebarList() { }); $('.menu .ui.dropdown.label-filter').on('keydown', (e) => { - if (e.altKey && e.keyCode === 13) { + if (e.altKey && e.key === 'Enter') { const selectedItems = $('.menu .ui.dropdown.label-filter .menu .item.selected'); if (selectedItems.length > 0) { excludeLabel($(selectedItems[0])); From edd9408dd6d50ed9c7eb55aaa5d0384679cda0e4 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Mon, 10 Jul 2023 17:49:49 +0800 Subject: [PATCH 35/62] add test for excludeLabel func --- web_src/js/features/repo-issue.js | 28 +++++++++++++++----------- web_src/js/features/repo-issue.test.js | 12 +++++++++++ 2 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 web_src/js/features/repo-issue.test.js diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index f500254c3bf54..f8f28d0f20463 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -86,24 +86,24 @@ export function initRepoIssueDue() { }); } +export function excludeLabel(href, labelId) { + const regStr = `labels=((?:-?[0-9]+%2c)*)(${labelId})((?:%2c-?[0-9]+)*)&`; + const newStr = 'labels=$1-$2$3&'; + return href.replace(new RegExp(regStr), newStr); +} + export function initRepoIssueSidebarList() { initIssueSearchDropdown($('#new-dependency-drop-list')); - function excludeLabel(item) { - const href = $(item).attr('href'); - const id = $(item).data('label-id'); - - const regStr = `labels=((?:-?[0-9]+%2c)*)(${id})((?:%2c-?[0-9]+)*)&`; - const newStr = 'labels=$1-$2$3&'; - - window.location = href.replace(new RegExp(regStr), newStr); - } - $('.menu a.label-filter-item').each(function () { $(this).on('click', function (e) { if (e.altKey) { e.preventDefault(); - excludeLabel(this); + const href = $(this).attr('href'); + const id = $(this).data('label-id'); + console.log('output', excludeLabel(href, id)); + debugger + window.location = excludeLabel(href, id); } }); }); @@ -112,7 +112,11 @@ export function initRepoIssueSidebarList() { if (e.altKey && e.key === 'Enter') { const selectedItems = $('.menu .ui.dropdown.label-filter .menu .item.selected'); if (selectedItems.length > 0) { - excludeLabel($(selectedItems[0])); + const href = $(selectedItems[0]).attr('href'); + const id = $(selectedItems[0]).attr('label-id'); + console.log('output', excludeLabel(href, id)); + debugger + window.location = excludeLabel(href, id); } } }); diff --git a/web_src/js/features/repo-issue.test.js b/web_src/js/features/repo-issue.test.js new file mode 100644 index 0000000000000..bdd82bd55c6db --- /dev/null +++ b/web_src/js/features/repo-issue.test.js @@ -0,0 +1,12 @@ +import {describe, expect, test} from 'vitest'; +import {excludeLabel} from './repo-issue.js'; + +describe('Repo Issue', () => { + test('excludeLabel', () => { + expect(excludeLabel('?&labels=1&assignee=0', 1)).toEqual('?&labels=-1&assignee=0'); + expect(excludeLabel('?q=&labels=7%2c1&assignee=0', 1)).toEqual('?q=&labels=7%2c-1&assignee=0'); + expect(excludeLabel('?q=&labels=7%2c-3%2c4&poster=0', 4)).toEqual('?q=&labels=7%2c-3%2c-4&poster=0'); + expect(excludeLabel('?q=&labels=15%2c4&poster=0', 5)).toEqual('?q=&labels=15%2c4&poster=0'); // labelId does not exist in href + }); +}); + From ded55c9ec0337b06a52788ef573bf903cc44ae0d Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Mon, 10 Jul 2023 17:50:54 +0800 Subject: [PATCH 36/62] fix --- web_src/js/features/repo-issue.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index f8f28d0f20463..262a0c288a14a 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -101,8 +101,6 @@ export function initRepoIssueSidebarList() { e.preventDefault(); const href = $(this).attr('href'); const id = $(this).data('label-id'); - console.log('output', excludeLabel(href, id)); - debugger window.location = excludeLabel(href, id); } }); @@ -114,8 +112,6 @@ export function initRepoIssueSidebarList() { if (selectedItems.length > 0) { const href = $(selectedItems[0]).attr('href'); const id = $(selectedItems[0]).attr('label-id'); - console.log('output', excludeLabel(href, id)); - debugger window.location = excludeLabel(href, id); } } From 2725dd22b7afaa72a9ab761def037a875b7812f9 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Mon, 10 Jul 2023 19:05:20 +0800 Subject: [PATCH 37/62] lint --- models/issues/comment.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/models/issues/comment.go b/models/issues/comment.go index a92233bde5208..015445fdd1fff 100644 --- a/models/issues/comment.go +++ b/models/issues/comment.go @@ -1252,19 +1252,19 @@ func (c *Comment) HasOriginalAuthor() bool { func (c *Comment) LoadClosedIssueCommentContent(ctx context.Context) (err error) { if c.Type != CommentTypeClose || c.Content == "" { - return + return nil } var ctnt ClosedIssueCommentContent if err = json.Unmarshal([]byte(c.Content), &ctnt); err != nil { - return + return err } c.ClosedTranslation = ctnt.Tr if ctnt.DuplicateIssueID <= 0 { - return + return nil } if c.DuplicateIssue, err = GetIssueByID(ctx, ctnt.DuplicateIssueID); err != nil { - return + return err } return c.DuplicateIssue.LoadRepo((ctx)) } From a69853398ee37cc056ffee06d69ea6fad1e99dc1 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Tue, 11 Jul 2023 19:09:35 +0800 Subject: [PATCH 38/62] update the ui of select duplicate issue --- templates/repo/issue/view_content.tmpl | 10 ++- web_src/js/features/repo-issue.js | 94 ++++++++++++++++---------- 2 files changed, 68 insertions(+), 36 deletions(-) diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 8475bb461b4bd..25c26875b22fa 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -4,10 +4,15 @@ - - + + + + + + + {{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}}
@@ -101,6 +106,7 @@
{{template "repo/issue/comment_tab" .}} {{.CsrfTokenHtml}} +
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .DisableStatusChange)}} diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 262a0c288a14a..c088ae9eaee89 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -123,11 +123,10 @@ function initIssueSearchDropdown($list) { const repolink = $('#repolink').val(); const repoId = $('#repoId').val(); const crossRepoSearch = $('#crossRepoSearch').val(); - const tp = $('#type').val(); const state = $('#state').val(); - let issueSearchUrl = `${appSubUrl}/${repolink}/issues/search?q={query}&type=${tp}&state=${state}`; + let issueSearchUrl = `${appSubUrl}/${repolink}/issues/search?q={query}&state=${state}`; if (crossRepoSearch === 'true') { - issueSearchUrl = `${appSubUrl}/issues/search?q={query}&priority_repo_id=${repoId}&type=${tp}&state=${state}`; + issueSearchUrl = `${appSubUrl}/issues/search?q={query}&priority_repo_id=${repoId}&state=${state}`; } $list.dropdown({ apiSettings: { @@ -143,7 +142,7 @@ function initIssueSearchDropdown($list) { } filteredResponse.results.push({ name: `#${issue.number} ${htmlEscape(issue.title) - }
${htmlEscape(issue.repository.full_name)}
`, + }
${htmlEscape(issue.repository.full_name)}
`, value: issue.id, }); }); @@ -154,6 +153,19 @@ function initIssueSearchDropdown($list) { fullTextSearch: true, }); + + if (state !== 'all') return; + const onSearchDropdownChanged = (val, _text, $selectedItem) => { + if (!$selectedItem) return; + const $innerItem = $selectedItem.find('.text.small.dont-break-out'); + if ($innerItem.length && $('#duplicate_repo_id').length) { + $('#duplicate_repo_id').val($innerItem.data('repo-id')); + $('#duplicate_repo_full_name').val($innerItem.data('repo-full-name')); + $('#duplicate_issue_number').val($innerItem.data('issue-number')); + $('#duplicate_issue_id').val(val); + } + }; + $list.dropdown('setting', {selectOnKeydown: false, onChange: onSearchDropdownChanged}); } export function initRepoIssueCommentDelete() { @@ -695,43 +707,57 @@ function initRepoIssueStateButton() { const $statusDropdown = $('#status-dropdown'); const selectedValue = $statusDropdown.find('input[type=hidden]').val(); - $statusButton.on('click', (e) => { - if ($statusDropdown.find('input[type=hidden]').val() !== '4') return; - // if click the button of "close as duplicate", show modal to let users select issue firstly. - e.preventDefault(); - // save the original value of "type" and "state" input - const originalType = $('#type').val(); - const originalSate = $('#state').val(); - // temporarily reset the input value - $('#type').val('issue'); - $('#state').val('all'); - const $duplicateDropdown = $('#duplicate-issues-list'); - initIssueSearchDropdown($duplicateDropdown); - const $duplicateModal = $('#duplicate-issue-modal'); - $duplicateModal.modal({ - onHidden() { // close modal - // clear selected item in the dropdown - $duplicateDropdown.dropdown('set exactly', []); - // restore the value of "type" and "state" input - $('#type').val(originalType); - $('#state').val(originalSate); - }, - onApprove() { - $('#duplicate_issue_id').val($duplicateModal.find('input[type=hidden]').val()); - const $form = $('#comment-form'); - $form[0].dispatchEvent(new SubmitEvent('submit', {bubbles: true, cancelable: true, submitter: $statusButton[0]})); - }, - }).modal('show'); - }); - const onCloseStatusChanged = (val) => { const editor = getComboMarkdownEditor($('#comment-form .combo-markdown-editor')); const buttonText = $statusDropdown.dropdown('get item').data(editor.value().trim() ? 'status-and-comment' : 'status'); $statusButton.text(buttonText); $statusButton.attr('value', val === '-1' ? 'reopen' : 'close'); $statusDropdown.find('input[type=hidden]').val(val); + + if (val === '4') { + // if click the item of "close as duplicate" in dropdown, show modal to let users select issue firstly. + // save the original value of "state" input + const originalSate = $('#state').val(); + // temporarily reset the input value + $('#type').val('issue'); + $('#state').val('all'); + const $duplicateDropdown = $('#duplicate-issues-list'); + initIssueSearchDropdown($duplicateDropdown); + const $duplicateModal = $('#duplicate-issue-modal'); + $duplicateModal.modal({ + onHidden() { // close modal or click cancel + // restore the value of "state" input + $('#state').val(originalSate); + // get first item of the "statusDropdown" + const $defaultItem = $statusDropdown.find('.item').first(); + const btnText = $defaultItem.data(editor.value().trim() ? 'status-and-comment' : 'status'); + $statusButton.text(btnText); + $statusButton.attr('value', $defaultItem.data('value') === '-1' ? 'reopen' : 'close'); + $statusDropdown.dropdown('set selected', $defaultItem.data('value')); + }, + onApprove() { + const currentRepoId = $('#repoId').val(); + const duplicateRepoId = $('#duplicate_repo_id').val(); + const duplicateRepoFullName = $('#duplicate_repo_full_name').val(); + const duplicateIssueNumber = $('#duplicate_issue_number').val(); + const issueText = `(${duplicateRepoId === currentRepoId ? '' : duplicateRepoFullName}#${duplicateIssueNumber})`; + $statusButton.text(buttonText + issueText); + $('#duplicate_issue_id').val(); + }, + }).modal('show'); + } else { + // clear some data + $('#duplicate_repo_id').val(''); + $('#duplicate_repo_full_name').val(''); + $('#duplicate_issue_number').val(''); + $('#duplicate_issue_id').val(''); + } }; - $statusDropdown.dropdown('setting', {selectOnKeydown: false, onChange: onCloseStatusChanged}); + $statusDropdown.dropdown('setting', { + selectOnKeydown: false, + allowReselection: true, // make user can re-select duplicate issue. + onChange: onCloseStatusChanged, + }); $statusDropdown.dropdown('set selected', selectedValue); onCloseStatusChanged(selectedValue); } From 9f433b98bf0db23810b8455392105d7f441bc33e Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Mon, 17 Jul 2023 10:41:48 +0800 Subject: [PATCH 39/62] the subscribers of the orignal issue won't cancel subscribe --- models/issues/issue_update.go | 8 ++------ routers/api/v1/repo/issue.go | 4 ++-- services/issue/status.go | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/models/issues/issue_update.go b/models/issues/issue_update.go index 273484aaaf1ca..1955d21ec4588 100644 --- a/models/issues/issue_update.go +++ b/models/issues/issue_update.go @@ -138,9 +138,8 @@ func doChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.Use }) } -// TransferWatchersToDuplicateIssue transfer the watchers (including users who participated in the comments) of the original issue to the duplicate issue. -// It can only be called after notification -func TransferWatchersToDuplicateIssue(ctx context.Context, issue *Issue) error { +// CopyWatchersToDuplicateIssue copy the watchers (including users who participated in the comments) of the original issue to the duplicate issue. +func CopyWatchersToDuplicateIssue(ctx context.Context, issue *Issue) error { if issue.DuplicateIssueID <= 0 { return errors.New("the ID of duplicate issue cannot be zero") } @@ -159,9 +158,6 @@ func TransferWatchersToDuplicateIssue(ctx context.Context, issue *Issue) error { if err := CreateOrUpdateIssueWatch(sid, issue.DuplicateIssueID, true); err != nil { return err } - if err := CreateOrUpdateIssueWatch(sid, issue.ID, false); err != nil { - return err - } } return nil } diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index e52c23402029c..eefde0b77cdd6 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -841,8 +841,8 @@ func EditIssue(ctx *context.APIContext) { if statusChangeComment != nil { notification.NotifyIssueChangeStatus(ctx, ctx.Doer, "", issue, statusChangeComment, issue.IsClosed) if issue.ClosedStatus == issues_model.IssueClosedStatusDuplicate && issue.DuplicateIssueID > 0 { - if err := issues_model.TransferWatchersToDuplicateIssue(ctx, issue); err != nil { - ctx.Error(http.StatusInternalServerError, "TransferWatchersToDuplicateIssue", err) + if err := issues_model.CopyWatchersToDuplicateIssue(ctx, issue); err != nil { + ctx.Error(http.StatusInternalServerError, "CopyWatchersToDuplicateIssue", err) return } } diff --git a/services/issue/status.go b/services/issue/status.go index 3a150443a3dbc..69aa5e98e6f25 100644 --- a/services/issue/status.go +++ b/services/issue/status.go @@ -40,7 +40,7 @@ func changeStatusCtx(ctx context.Context, issue *issues_model.Issue, doer *user_ notification.NotifyIssueChangeStatus(ctx, doer, commitID, issue, comment, issue.IsClosed) if issue.ClosedStatus == issues_model.IssueClosedStatusDuplicate && issue.DuplicateIssueID > 0 { - if err := issues_model.TransferWatchersToDuplicateIssue(ctx, issue); err != nil { + if err := issues_model.CopyWatchersToDuplicateIssue(ctx, issue); err != nil { return err } } From 88d9f11feb64ea9120f339072e263cdd51d726dd Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Mon, 24 Jul 2023 18:01:57 +0800 Subject: [PATCH 40/62] clean --- models/issues/comment.go | 10 +--- models/issues/issue.go | 7 +-- models/issues/issue_update.go | 31 +--------- models/migrations/migrations.go | 2 +- models/migrations/v1_21/v268.go | 5 +- modules/structs/issue.go | 7 +-- modules/util/slice.go | 20 ------- modules/util/string_test.go | 57 ------------------- options/locale/locale_en-US.ini | 6 -- routers/api/v1/repo/issue.go | 7 --- routers/web/repo/issue.go | 6 -- services/forms/repo_form.go | 9 ++- services/issue/status.go | 6 -- templates/mail/issue/default.tmpl | 2 - templates/repo/issue/view_content.tmpl | 24 -------- .../repo/issue/view_content/comments.tmpl | 14 ----- templates/swagger/v1_json.tmpl | 7 +-- vitest.config.js | 7 +++ web_src/js/features/repo-issue.js | 54 +----------------- 19 files changed, 22 insertions(+), 259 deletions(-) diff --git a/models/issues/comment.go b/models/issues/comment.go index 015445fdd1fff..e7c49ab7006ec 100644 --- a/models/issues/comment.go +++ b/models/issues/comment.go @@ -300,7 +300,6 @@ type Comment struct { IsForcePush bool `xorm:"-"` ClosedTranslation string `xorm:"-"` - DuplicateIssue *Issue `xorm:"-"` } func init() { @@ -1259,12 +1258,5 @@ func (c *Comment) LoadClosedIssueCommentContent(ctx context.Context) (err error) return err } c.ClosedTranslation = ctnt.Tr - if ctnt.DuplicateIssueID <= 0 { - return nil - } - - if c.DuplicateIssue, err = GetIssueByID(ctx, ctnt.DuplicateIssueID); err != nil { - return err - } - return c.DuplicateIssue.LoadRepo((ctx)) + return nil } diff --git a/models/issues/issue.go b/models/issues/issue.go index dfa5d24edb6f8..1c9827b0d3011 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -102,8 +102,6 @@ const ( IssueClosedStatusResolved // IssueClosedStatusStale close issue as stale. IssueClosedStatusStale - // IssueClosedStatusDuplicate close issue as duplicate. - IssueClosedStatusDuplicate ) var issueClosedCommentTrMap = map[IssueClosedStatus]string{ @@ -111,12 +109,10 @@ var issueClosedCommentTrMap = map[IssueClosedStatus]string{ IssueClosedStatusArchived: "repo.issues.closed_as_archived_at", IssueClosedStatusResolved: "repo.issues.closed_as_resolved_at", IssueClosedStatusStale: "repo.issues.closed_as_stale_at", - IssueClosedStatusDuplicate: "repo.issues.closed_as_duplicate_at", } type ClosedIssueCommentContent struct { - Tr string `json:"tr"` - DuplicateIssueID int64 `json:"duplicate_issue_id"` + Tr string `json:"tr"` } // Issue represents an issue or pull request of repository. @@ -141,7 +137,6 @@ type Issue struct { Assignee *user_model.User `xorm:"-"` IsClosed bool `xorm:"INDEX"` ClosedStatus IssueClosedStatus `xorm:"INDEX NOT NULL DEFAULT 0"` - DuplicateIssueID int64 `xorm:"NOT NULL DEFAULT 0"` IsRead bool `xorm:"-"` IsPull bool `xorm:"INDEX"` // Indicates whether is a pull request or not. PullRequest *PullRequest `xorm:"-"` diff --git a/models/issues/issue_update.go b/models/issues/issue_update.go index 1955d21ec4588..c63be6840f987 100644 --- a/models/issues/issue_update.go +++ b/models/issues/issue_update.go @@ -5,7 +5,6 @@ package issues import ( "context" - "errors" "fmt" "strings" @@ -23,7 +22,6 @@ import ( "code.gitea.io/gitea/modules/references" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" "xorm.io/builder" ) @@ -80,7 +78,7 @@ func doChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.Use issue.ClosedUnix = 0 } - if err := UpdateIssueCols(ctx, issue, "is_closed", "closed_status", "duplicate_issue_id", "closed_unix"); err != nil { + if err := UpdateIssueCols(ctx, issue, "is_closed", "closed_status", "closed_unix"); err != nil { return nil, err } @@ -113,9 +111,6 @@ func doChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.Use c := &ClosedIssueCommentContent{ Tr: issueClosedCommentTrMap[issue.ClosedStatus], } - if issue.ClosedStatus == IssueClosedStatusDuplicate { - c.DuplicateIssueID = issue.DuplicateIssueID - } data, err := json.Marshal(c) if err != nil { return nil, err @@ -138,30 +133,6 @@ func doChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.Use }) } -// CopyWatchersToDuplicateIssue copy the watchers (including users who participated in the comments) of the original issue to the duplicate issue. -func CopyWatchersToDuplicateIssue(ctx context.Context, issue *Issue) error { - if issue.DuplicateIssueID <= 0 { - return errors.New("the ID of duplicate issue cannot be zero") - } - // participants of the origianl issue - participatingUserIDs, err := issue.GetParticipantIDsByIssue(ctx) - if err != nil { - return err - } - // watchers of the original issue - iws, err := GetIssueWatchersIDs(ctx, issue.ID, true) - if err != nil { - return err - } - subscribers := util.SliceUnion(participatingUserIDs, iws) - for _, sid := range subscribers { - if err := CreateOrUpdateIssueWatch(sid, issue.DuplicateIssueID, true); err != nil { - return err - } - } - return nil -} - // ChangeIssueStatus changes issue status to open or closed. func ChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.User) (*Comment, error) { if err := issue.LoadRepo(ctx); err != nil { diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 4bfec818c84f7..a2b6fa5a230be 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -518,7 +518,7 @@ var migrations = []Migration{ // v267 -> v268 NewMigration("Add action_tasks_version table", v1_21.CreateActionTasksVersionTable), // v268 -> v269 - NewMigration("Add column of closed_status and duplicate_issue_id to issue table", v1_21.AddClosedStatusAndDuplicateIssueIDToIssue), + NewMigration("Add column of closed_status to issue table", v1_21.AddClosedStatusToIssue), } // GetCurrentDBVersion returns the current db version diff --git a/models/migrations/v1_21/v268.go b/models/migrations/v1_21/v268.go index 464f277987743..e79cf3079f658 100644 --- a/models/migrations/v1_21/v268.go +++ b/models/migrations/v1_21/v268.go @@ -9,10 +9,9 @@ import ( "xorm.io/xorm" ) -func AddClosedStatusAndDuplicateIssueIDToIssue(x *xorm.Engine) error { +func AddClosedStatusToIssue(x *xorm.Engine) error { type Issue struct { - ClosedStatus issues_model.IssueClosedStatus `xorm:"INDEX NOT NULL DEFAULT 0"` - DuplicateIssueID int64 `xorm:"NOT NULL DEFAULT 0"` + ClosedStatus issues_model.IssueClosedStatus `xorm:"INDEX NOT NULL DEFAULT 0"` } return x.Sync(new(Issue)) diff --git a/modules/structs/issue.go b/modules/structs/issue.go index 56317cc178b38..2f1216b5fdd93 100644 --- a/modules/structs/issue.go +++ b/modules/structs/issue.go @@ -108,10 +108,9 @@ type EditIssueOption struct { Milestone *int64 `json:"milestone"` State *string `json:"state"` // swagger:strfmt date-time - Deadline *time.Time `json:"due_date"` - RemoveDeadline *bool `json:"unset_due_date"` - ClosedStatus int8 `json:"closed_status"` - DuplicateIssueID int64 `json:"duplicate_issue_id"` + Deadline *time.Time `json:"due_date"` + RemoveDeadline *bool `json:"unset_due_date"` + ClosedStatus int8 `json:"closed_status"` } // EditDeadlineOption options for creating a deadline diff --git a/modules/util/slice.go b/modules/util/slice.go index 263a54daf116c..74356f5496205 100644 --- a/modules/util/slice.go +++ b/modules/util/slice.go @@ -88,23 +88,3 @@ func SliceRemoveAllFunc[T comparable](slice []T, targetFunc func(T) bool) []T { } return slice[:idx] } - -// SliceRemoveAll returns the union of the slices -func SliceUnion[T comparable](inputs ...[]T) []T { - m := make(map[T]struct{}) - - for i := range inputs { - for j := range inputs[i] { - m[inputs[i][j]] = struct{}{} - } - } - - output := make([]T, len(m)) - i := 0 - for k := range m { - output[i] = k - i++ - } - - return output -} diff --git a/modules/util/string_test.go b/modules/util/string_test.go index f86415e3a2bdb..0a4a8bbcfbf9d 100644 --- a/modules/util/string_test.go +++ b/modules/util/string_test.go @@ -4,8 +4,6 @@ package util import ( - "fmt" - "sort" "testing" "github.com/stretchr/testify/assert" @@ -47,58 +45,3 @@ func TestToSnakeCase(t *testing.T) { assert.Equal(t, expected, ToSnakeCase(input)) } } - -type ( - testSliceUnionInput[T string | int] [][]T - testSliceUnionOutput[T string | int] []T - testUnionItem[T string | int] struct { - input testSliceUnionInput[T] - expected testSliceUnionOutput[T] - } -) - -func TestSliceUnion(t *testing.T) { - intTests := []testUnionItem[int]{ - { - input: testSliceUnionInput[int]{ - []int{1, 2, 2, 3}, - []int{2, 4, 7}, - }, - expected: []int{1, 2, 3, 4, 7}, - }, - { - input: testSliceUnionInput[int]{ - []int{7, 8, 1}, - []int{1, 2, 3}, - []int{3, 4, 5}, - }, - expected: []int{1, 2, 3, 4, 5, 7, 8}, - }, - } - for i, test := range intTests { - t.Run(fmt.Sprintf("int test: %d", i), func(t *testing.T) { - actual := SliceUnion(test.input...) - // sort - sort.Ints(actual) - assert.EqualValues(t, test.expected, actual, actual) - }) - } - - stringTests := []testUnionItem[string]{ - { - input: testSliceUnionInput[string]{ - []string{"a", "c"}, - []string{"c", "d", "a", "b"}, - }, - expected: []string{"a", "b", "c", "d"}, - }, - } - for i, test := range stringTests { - t.Run(fmt.Sprintf("string test: %d", i), func(t *testing.T) { - actual := SliceUnion(test.input...) - // sort - sort.Strings(actual) - assert.EqualValues(t, test.expected, actual, actual) - }) - } -} diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index bbc48b61a4d13..033864bb58c13 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -455,7 +455,6 @@ issue.action.push_n = @%[1]s pushed %[3]d commits to %[2]s issue.action.close = @%[1]s closed #%[2]d. issue.action.close_as_archived = @%[1]s closed as archived #%[2]d. issue.action.close_as_resolved = @%[1]s closed as resolved #%[2]d. -issue.action.close_as_duplicate = @%[1]s closed as duplicate #%[2]d. issue.action.close_as_stale = @%[1]s closed as stale #%[2]d. issue.action.reopen = @%[1]s reopened #%[2]d. issue.action.merge = @%[1]s merged #%[2]d into %[3]s. @@ -1463,7 +1462,6 @@ issues.create_comment = Comment issues.closed_at = `closed this issue %[2]s` issues.closed_as_archived_at = `closed this issue as archived %[2]s` issues.closed_as_resolved_at = `closed this issue as resolved %[2]s` -issues.closed_as_duplicate_at = `closed this issue as duplicate %[2]s` issues.closed_as_stale_at = `closed this issue as stale %[2]s` issues.reopened_at = `reopened this issue %[2]s` issues.commit_ref_at = `referenced this issue from a commit %[2]s` @@ -1478,16 +1476,12 @@ issues.close_as.reopen = Reopen issues.close_as.common = Close Issue issues.close_as.archived = Close as archived issues.close_as.resolved = Close as resolved -issues.close_as.duplicate = Close as duplicate issues.close_as.stale = Close as stale issues.comment_and_close_as.reopen = Comment and Reopen issues.comment_and_close_as.common = Comment and Close Issue issues.comment_and_close_as.archived = Comment and Close as archived issues.comment_and_close_as.resolved = Comment and Close as resolved -issues.comment_and_close_as.duplicate = Comment and Close as duplicate issues.comment_and_close_as.stale = Comment and Close as stale -issues.duplicate.header = Select the duplicate issue -issues.duplicate.label = Duplicate Issue issues.poster = Poster issues.collaborator = Collaborator issues.owner = Owner diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index f2767862200f5..3943d71578e8a 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -819,7 +819,6 @@ func EditIssue(ctx *context.APIContext) { } issue.IsClosed = api.StateClosed == api.StateType(*form.State) issue.ClosedStatus = issues_model.IssueClosedStatus(0) - issue.DuplicateIssueID = form.DuplicateIssueID if issue.IsClosed { issue.ClosedStatus = issues_model.IssueClosedStatus(form.ClosedStatus) } @@ -840,12 +839,6 @@ func EditIssue(ctx *context.APIContext) { if statusChangeComment != nil { notification.NotifyIssueChangeStatus(ctx, ctx.Doer, "", issue, statusChangeComment, issue.IsClosed) - if issue.ClosedStatus == issues_model.IssueClosedStatusDuplicate && issue.DuplicateIssueID > 0 { - if err := issues_model.CopyWatchersToDuplicateIssue(ctx, issue); err != nil { - ctx.Error(http.StatusInternalServerError, "CopyWatchersToDuplicateIssue", err) - return - } - } } // Refetch from database to assign some automatic values diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 5bfbe9d467d2b..c01b45c01bd6a 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -1286,11 +1286,6 @@ var issueCloseBtnItems = []IssueCloseBtnItem{ Status: "repo.issues.close_as.stale", StatusAndComment: "repo.issues.comment_and_close_as.stale", }, - { - Value: issues_model.IssueClosedStatusDuplicate, - Status: "repo.issues.close_as.duplicate", - StatusAndComment: "repo.issues.comment_and_close_as.duplicate", - }, } // ViewIssue render issue view page @@ -3008,7 +3003,6 @@ func closeOrReopenIssue(ctx *context.Context, form *forms.CreateCommentForm, iss } else { issue.IsClosed = form.Status == "close" issue.ClosedStatus = issues_model.IssueClosedStatus(0) - issue.DuplicateIssueID = form.DuplicateIssueID if issue.IsClosed { issue.ClosedStatus = form.ClosedStatus } diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index 1a74c9a43bbde..62f605818dc80 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -455,11 +455,10 @@ func (f *CreateIssueForm) Validate(req *http.Request, errs binding.Errors) bindi // CreateCommentForm form for creating comment type CreateCommentForm struct { - Content string - Status string `binding:"OmitEmpty;In(reopen,close)"` - Files []string - ClosedStatus issues_model.IssueClosedStatus - DuplicateIssueID int64 + Content string + Status string `binding:"OmitEmpty;In(reopen,close)"` + Files []string + ClosedStatus issues_model.IssueClosedStatus } // Validate validates the fields diff --git a/services/issue/status.go b/services/issue/status.go index 8d9db963298e6..15bc19370b263 100644 --- a/services/issue/status.go +++ b/services/issue/status.go @@ -32,11 +32,5 @@ func ChangeStatus(ctx context.Context, issue *issues_model.Issue, doer *user_mod notification.NotifyIssueChangeStatus(ctx, doer, commitID, issue, comment, issue.IsClosed) - if issue.ClosedStatus == issues_model.IssueClosedStatusDuplicate && issue.DuplicateIssueID > 0 { - if err := issues_model.CopyWatchersToDuplicateIssue(ctx, issue); err != nil { - return err - } - } - return nil } diff --git a/templates/mail/issue/default.tmpl b/templates/mail/issue/default.tmpl index b7a60620532ef..0974fcbbd044a 100644 --- a/templates/mail/issue/default.tmpl +++ b/templates/mail/issue/default.tmpl @@ -43,8 +43,6 @@ {{$closeTrans = "mail.issue.action.close_as_resolved"}} {{else if eq .Issue.ClosedStatus 3}} {{$closeTrans = "mail.issue.action.close_as_stale"}} - {{else if eq .Issue.ClosedStatus 4}} - {{$closeTrans = "mail.issue.action.close_as_duplicate"}} {{end}} {{.locale.Tr $closeTrans (Escape .Doer.Name) .Issue.Index | Str2html}} {{else if eq .ActionName "reopen"}} diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 25c26875b22fa..2a1f3e60c6c6f 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -5,14 +5,6 @@ - - - - - - - - {{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}}
@@ -106,7 +98,6 @@ {{template "repo/issue/comment_tab" .}} {{.CsrfTokenHtml}} -
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .DisableStatusChange)}} @@ -136,7 +127,6 @@ {{if not .Issue.IsPull}} - {{template "base/modal_actions_confirm" .}}
- - diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 50c2c1e3342dd..3df92aaf1a2bc 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -120,20 +120,6 @@ {{$.locale.Tr $trans .EventTag $createdStr | Safe}} {{end}} - {{if .DuplicateIssue}} -
- {{svg "octicon-duplicate"}} - - - {{if eq .DuplicateIssue.RepoID .Issue.RepoID}} - #{{.DuplicateIssue.Index}} {{.DuplicateIssue.Title}} - {{else}} - {{.DuplicateIssue.Repo.FullName}}#{{.DuplicateIssue.Index}} - {{.DuplicateIssue.Title}} - {{end}} - - -
- {{end}}
{{else if eq .Type 28}}
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 53be3e0d88541..13bf87bb06eaa 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -17964,11 +17964,6 @@ "format": "date-time", "x-go-name": "Deadline" }, - "duplicate_issue_id": { - "type": "integer", - "format": "int64", - "x-go-name": "DuplicateIssueID" - }, "milestone": { "type": "integer", "format": "int64", @@ -23142,4 +23137,4 @@ "TOTPHeader": [] } ] -} +} \ No newline at end of file diff --git a/vitest.config.js b/vitest.config.js index 49f59ba982869..b40bb30f1143d 100644 --- a/vitest.config.js +++ b/vitest.config.js @@ -12,6 +12,13 @@ export default defineConfig({ allowOnly: true, passWithNoTests: true, watch: false, + alias: [ + { + find: /^monaco-editor$/, + replacement: + __dirname + "/node_modules/monaco-editor/esm/vs/editor/editor.api", + }, + ], }, plugins: [ stringPlugin(), diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index c088ae9eaee89..b36756aac7d83 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -142,7 +142,7 @@ function initIssueSearchDropdown($list) { } filteredResponse.results.push({ name: `#${issue.number} ${htmlEscape(issue.title) - }
${htmlEscape(issue.repository.full_name)}
`, + }
${htmlEscape(issue.repository.full_name)}
`, value: issue.id, }); }); @@ -153,19 +153,6 @@ function initIssueSearchDropdown($list) { fullTextSearch: true, }); - - if (state !== 'all') return; - const onSearchDropdownChanged = (val, _text, $selectedItem) => { - if (!$selectedItem) return; - const $innerItem = $selectedItem.find('.text.small.dont-break-out'); - if ($innerItem.length && $('#duplicate_repo_id').length) { - $('#duplicate_repo_id').val($innerItem.data('repo-id')); - $('#duplicate_repo_full_name').val($innerItem.data('repo-full-name')); - $('#duplicate_issue_number').val($innerItem.data('issue-number')); - $('#duplicate_issue_id').val(val); - } - }; - $list.dropdown('setting', {selectOnKeydown: false, onChange: onSearchDropdownChanged}); } export function initRepoIssueCommentDelete() { @@ -713,45 +700,6 @@ function initRepoIssueStateButton() { $statusButton.text(buttonText); $statusButton.attr('value', val === '-1' ? 'reopen' : 'close'); $statusDropdown.find('input[type=hidden]').val(val); - - if (val === '4') { - // if click the item of "close as duplicate" in dropdown, show modal to let users select issue firstly. - // save the original value of "state" input - const originalSate = $('#state').val(); - // temporarily reset the input value - $('#type').val('issue'); - $('#state').val('all'); - const $duplicateDropdown = $('#duplicate-issues-list'); - initIssueSearchDropdown($duplicateDropdown); - const $duplicateModal = $('#duplicate-issue-modal'); - $duplicateModal.modal({ - onHidden() { // close modal or click cancel - // restore the value of "state" input - $('#state').val(originalSate); - // get first item of the "statusDropdown" - const $defaultItem = $statusDropdown.find('.item').first(); - const btnText = $defaultItem.data(editor.value().trim() ? 'status-and-comment' : 'status'); - $statusButton.text(btnText); - $statusButton.attr('value', $defaultItem.data('value') === '-1' ? 'reopen' : 'close'); - $statusDropdown.dropdown('set selected', $defaultItem.data('value')); - }, - onApprove() { - const currentRepoId = $('#repoId').val(); - const duplicateRepoId = $('#duplicate_repo_id').val(); - const duplicateRepoFullName = $('#duplicate_repo_full_name').val(); - const duplicateIssueNumber = $('#duplicate_issue_number').val(); - const issueText = `(${duplicateRepoId === currentRepoId ? '' : duplicateRepoFullName}#${duplicateIssueNumber})`; - $statusButton.text(buttonText + issueText); - $('#duplicate_issue_id').val(); - }, - }).modal('show'); - } else { - // clear some data - $('#duplicate_repo_id').val(''); - $('#duplicate_repo_full_name').val(''); - $('#duplicate_issue_number').val(''); - $('#duplicate_issue_id').val(''); - } }; $statusDropdown.dropdown('setting', { selectOnKeydown: false, From a4a458c28a4b6918a51c8471c26bea3f43df7330 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Mon, 24 Jul 2023 18:19:52 +0800 Subject: [PATCH 41/62] delete comment --- web_src/js/features/repo-issue.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index b36756aac7d83..e38a37b0ed494 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -703,7 +703,7 @@ function initRepoIssueStateButton() { }; $statusDropdown.dropdown('setting', { selectOnKeydown: false, - allowReselection: true, // make user can re-select duplicate issue. + allowReselection: true, onChange: onCloseStatusChanged, }); $statusDropdown.dropdown('set selected', selectedValue); From 11ca184a1c174a9d105cbde4ea3e33ff04db03f8 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Mon, 24 Jul 2023 18:36:40 +0800 Subject: [PATCH 42/62] lint --- templates/swagger/v1_json.tmpl | 2 +- vitest.config.js | 3 +-- web_src/js/features/repo-issue.js | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 13bf87bb06eaa..b4a6c5e520e1b 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -23137,4 +23137,4 @@ "TOTPHeader": [] } ] -} \ No newline at end of file +} diff --git a/vitest.config.js b/vitest.config.js index b40bb30f1143d..96211f6e7591a 100644 --- a/vitest.config.js +++ b/vitest.config.js @@ -15,8 +15,7 @@ export default defineConfig({ alias: [ { find: /^monaco-editor$/, - replacement: - __dirname + "/node_modules/monaco-editor/esm/vs/editor/editor.api", + replacement: __dirname + '/node_modules/monaco-editor/esm/vs/editor/editor.api', }, ], }, diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index e38a37b0ed494..d17b0b8807699 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -703,7 +703,7 @@ function initRepoIssueStateButton() { }; $statusDropdown.dropdown('setting', { selectOnKeydown: false, - allowReselection: true, + allowReselection: true, onChange: onCloseStatusChanged, }); $statusDropdown.dropdown('set selected', selectedValue); From 0890e4bf8ffc9c7231051d32ccd00195cfe72d5e Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Thu, 27 Jul 2023 14:22:24 +0800 Subject: [PATCH 43/62] frontend lint --- vitest.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vitest.config.js b/vitest.config.js index 96211f6e7591a..0769b43eb4887 100644 --- a/vitest.config.js +++ b/vitest.config.js @@ -15,7 +15,7 @@ export default defineConfig({ alias: [ { find: /^monaco-editor$/, - replacement: __dirname + '/node_modules/monaco-editor/esm/vs/editor/editor.api', + replacement: 'node_modules/monaco-editor/esm/vs/editor/editor.api', }, ], }, From c6aa9938fbe1e910b8f00a6820cb69c1dd9ca30d Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Thu, 27 Jul 2023 15:13:11 +0800 Subject: [PATCH 44/62] fix --- models/issues/issue_update.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/models/issues/issue_update.go b/models/issues/issue_update.go index c63be6840f987..917c82caebd2c 100644 --- a/models/issues/issue_update.go +++ b/models/issues/issue_update.go @@ -43,15 +43,13 @@ func changeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.User, // Nothing should be performed if current status is same as target status if currentIssue.IsClosed == issue.IsClosed { - if issue.IsPull { - return nil, ErrPullWasClosed{ + if !issue.IsPull { + return nil, ErrIssueWasClosed{ ID: issue.ID, } } - if currentIssue.ClosedStatus == issue.ClosedStatus { - return nil, ErrIssueIsClosed{ - ID: issue.ID, - } + return nil, ErrPullWasClosed{ + ID: issue.ID, } } From 5bf1e17f5aadbbe7eb318bdfd3cf845daffeb44c Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Tue, 1 Aug 2023 09:56:41 +0800 Subject: [PATCH 45/62] fix --- models/issues/issue_update.go | 10 ++-- templates/repo/issue/view_content.tmpl | 2 +- web_src/css/repo.css | 2 +- web_src/js/features/repo-issue.js | 71 ++++++++++++-------------- 4 files changed, 42 insertions(+), 43 deletions(-) diff --git a/models/issues/issue_update.go b/models/issues/issue_update.go index 917c82caebd2c..03fc53f27fd91 100644 --- a/models/issues/issue_update.go +++ b/models/issues/issue_update.go @@ -43,13 +43,15 @@ func changeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.User, // Nothing should be performed if current status is same as target status if currentIssue.IsClosed == issue.IsClosed { - if !issue.IsPull { - return nil, ErrIssueWasClosed{ + if issue.IsPull { + return nil, ErrPullWasClosed{ ID: issue.ID, } } - return nil, ErrPullWasClosed{ - ID: issue.ID, + if currentIssue.ClosedStatus == issue.ClosedStatus { + return nil, ErrIssueWasClosed{ + ID: issue.ID, + } } } diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 2a1f3e60c6c6f..72c4320b3f633 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -145,7 +145,7 @@ {{end}}
{{end}} -
diff --git a/web_src/css/repo.css b/web_src/css/repo.css index b4c7d05f7c733..7a14d5cd84e6a 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1009,7 +1009,7 @@ width: 100%; margin: 0; } - .repository.view.issue .comment-list .comment .content .form .button:not(:last-child) { + .repository.view.issue .comment-list .comment .content .form .button:not(.comment-button) { margin-bottom: 1rem; } } diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index d17b0b8807699..303f7c7145859 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -93,7 +93,40 @@ export function excludeLabel(href, labelId) { } export function initRepoIssueSidebarList() { - initIssueSearchDropdown($('#new-dependency-drop-list')); + const repolink = $('#repolink').val(); + const repoId = $('#repoId').val(); + const crossRepoSearch = $('#crossRepoSearch').val(); + const state = $('#state').val(); + let issueSearchUrl = `${appSubUrl}/${repolink}/issues/search?q={query}&state=${state}`; + if (crossRepoSearch === 'true') { + issueSearchUrl = `${appSubUrl}/issues/search?q={query}&priority_repo_id=${repoId}&state=${state}`; + } + $('#new-dependency-drop-list') + .dropdown({ + apiSettings: { + url: issueSearchUrl, + onResponse(response) { + const filteredResponse = {success: true, results: []}; + const currIssueId = $list.data('issue-id'); + // Parse the response from the api to work with our dropdown + $.each(response, (_i, issue) => { + // Don't list current issue in the dependency list. + if (issue.id === currIssueId) { + return; + } + filteredResponse.results.push({ + name: `#${issue.number} ${htmlEscape(issue.title) + }
${htmlEscape(issue.repository.full_name)}
`, + value: issue.id, + }); + }); + return filteredResponse; + }, + cache: false, + }, + + fullTextSearch: true, + }); $('.menu a.label-filter-item').each(function () { $(this).on('click', function (e) { @@ -119,42 +152,6 @@ export function initRepoIssueSidebarList() { $('.ui.dropdown.label-filter, .ui.dropdown.select-label').dropdown('setting', {'hideDividers': 'empty'}).dropdown('refreshItems'); } -function initIssueSearchDropdown($list) { - const repolink = $('#repolink').val(); - const repoId = $('#repoId').val(); - const crossRepoSearch = $('#crossRepoSearch').val(); - const state = $('#state').val(); - let issueSearchUrl = `${appSubUrl}/${repolink}/issues/search?q={query}&state=${state}`; - if (crossRepoSearch === 'true') { - issueSearchUrl = `${appSubUrl}/issues/search?q={query}&priority_repo_id=${repoId}&state=${state}`; - } - $list.dropdown({ - apiSettings: { - url: issueSearchUrl, - onResponse(response) { - const filteredResponse = {success: true, results: []}; - const currIssueId = $list.data('issue-id'); - // Parse the response from the api to work with our dropdown - $.each(response, (_i, issue) => { - // Don't list current issue in the dependency list. - if (issue.id === currIssueId) { - return; - } - filteredResponse.results.push({ - name: `#${issue.number} ${htmlEscape(issue.title) - }
${htmlEscape(issue.repository.full_name)}
`, - value: issue.id, - }); - }); - return filteredResponse; - }, - cache: false, - }, - - fullTextSearch: true, - }); -} - export function initRepoIssueCommentDelete() { // Delete comment $(document).on('click', '.delete-comment', function () { From 2e2bbcac31135a6cf458d856899431d7d21b4527 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Tue, 1 Aug 2023 10:11:25 +0800 Subject: [PATCH 46/62] fix --- web_src/js/features/repo-issue.js | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 303f7c7145859..1414378917310 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -86,20 +86,14 @@ export function initRepoIssueDue() { }); } -export function excludeLabel(href, labelId) { - const regStr = `labels=((?:-?[0-9]+%2c)*)(${labelId})((?:%2c-?[0-9]+)*)&`; - const newStr = 'labels=$1-$2$3&'; - return href.replace(new RegExp(regStr), newStr); -} - export function initRepoIssueSidebarList() { const repolink = $('#repolink').val(); const repoId = $('#repoId').val(); const crossRepoSearch = $('#crossRepoSearch').val(); - const state = $('#state').val(); - let issueSearchUrl = `${appSubUrl}/${repolink}/issues/search?q={query}&state=${state}`; + const tp = $('#type').val(); + let issueSearchUrl = `${appSubUrl}/${repolink}/issues/search?q={query}&type=${tp}`; if (crossRepoSearch === 'true') { - issueSearchUrl = `${appSubUrl}/issues/search?q={query}&priority_repo_id=${repoId}&state=${state}`; + issueSearchUrl = `${appSubUrl}/issues/search?q={query}&priority_repo_id=${repoId}&type=${tp}`; } $('#new-dependency-drop-list') .dropdown({ @@ -107,7 +101,7 @@ export function initRepoIssueSidebarList() { url: issueSearchUrl, onResponse(response) { const filteredResponse = {success: true, results: []}; - const currIssueId = $list.data('issue-id'); + const currIssueId = $('#new-dependency-drop-list').data('issue-id'); // Parse the response from the api to work with our dropdown $.each(response, (_i, issue) => { // Don't list current issue in the dependency list. @@ -127,14 +121,22 @@ export function initRepoIssueSidebarList() { fullTextSearch: true, }); + + function excludeLabel(item) { + const href = $(item).attr('href'); + const id = $(item).data('label-id'); + + const regStr = `labels=((?:-?[0-9]+%2c)*)(${id})((?:%2c-?[0-9]+)*)&`; + const newStr = 'labels=$1-$2$3&'; + + window.location = href.replace(new RegExp(regStr), newStr); + } $('.menu a.label-filter-item').each(function () { $(this).on('click', function (e) { if (e.altKey) { e.preventDefault(); - const href = $(this).attr('href'); - const id = $(this).data('label-id'); - window.location = excludeLabel(href, id); + excludeLabel(this); } }); }); @@ -143,9 +145,7 @@ export function initRepoIssueSidebarList() { if (e.altKey && e.key === 'Enter') { const selectedItems = $('.menu .ui.dropdown.label-filter .menu .item.selected'); if (selectedItems.length > 0) { - const href = $(selectedItems[0]).attr('href'); - const id = $(selectedItems[0]).attr('label-id'); - window.location = excludeLabel(href, id); + excludeLabel($(selectedItems[0])); } } }); From a239bee4b8ba9841a163054fdd4c92c1fe7823ae Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Tue, 1 Aug 2023 10:16:06 +0800 Subject: [PATCH 47/62] fix --- vitest.config.js | 6 ------ web_src/js/features/repo-issue.js | 3 +-- web_src/js/features/repo-issue.test.js | 12 ------------ 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 web_src/js/features/repo-issue.test.js diff --git a/vitest.config.js b/vitest.config.js index 0769b43eb4887..49f59ba982869 100644 --- a/vitest.config.js +++ b/vitest.config.js @@ -12,12 +12,6 @@ export default defineConfig({ allowOnly: true, passWithNoTests: true, watch: false, - alias: [ - { - find: /^monaco-editor$/, - replacement: 'node_modules/monaco-editor/esm/vs/editor/editor.api', - }, - ], }, plugins: [ stringPlugin(), diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 1414378917310..dbe9327c5ef0d 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -101,7 +101,7 @@ export function initRepoIssueSidebarList() { url: issueSearchUrl, onResponse(response) { const filteredResponse = {success: true, results: []}; - const currIssueId = $('#new-dependency-drop-list').data('issue-id'); + const currIssueId = $('#new-dependency-drop-list').data('issue-id'); // Parse the response from the api to work with our dropdown $.each(response, (_i, issue) => { // Don't list current issue in the dependency list. @@ -121,7 +121,6 @@ export function initRepoIssueSidebarList() { fullTextSearch: true, }); - function excludeLabel(item) { const href = $(item).attr('href'); const id = $(item).data('label-id'); diff --git a/web_src/js/features/repo-issue.test.js b/web_src/js/features/repo-issue.test.js deleted file mode 100644 index bdd82bd55c6db..0000000000000 --- a/web_src/js/features/repo-issue.test.js +++ /dev/null @@ -1,12 +0,0 @@ -import {describe, expect, test} from 'vitest'; -import {excludeLabel} from './repo-issue.js'; - -describe('Repo Issue', () => { - test('excludeLabel', () => { - expect(excludeLabel('?&labels=1&assignee=0', 1)).toEqual('?&labels=-1&assignee=0'); - expect(excludeLabel('?q=&labels=7%2c1&assignee=0', 1)).toEqual('?q=&labels=7%2c-1&assignee=0'); - expect(excludeLabel('?q=&labels=7%2c-3%2c4&poster=0', 4)).toEqual('?q=&labels=7%2c-3%2c-4&poster=0'); - expect(excludeLabel('?q=&labels=15%2c4&poster=0', 5)).toEqual('?q=&labels=15%2c4&poster=0'); // labelId does not exist in href - }); -}); - From ef2318a58c85470686ccbda89c104c61b46dc36b Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Tue, 1 Aug 2023 11:12:53 +0800 Subject: [PATCH 48/62] fix misalignment --- templates/repo/issue/view_content.tmpl | 4 ++-- web_src/css/repo.css | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 72c4320b3f633..938f00720e793 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -116,7 +116,7 @@ {{end}}
{{if not .Issue.IsPull}} -