diff --git a/modules/templates/helper.go b/modules/templates/helper.go index efaa10624bd87..3ef11772dc7d7 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -31,6 +31,7 @@ func NewFuncMap() template.FuncMap { "ctx": func() any { return nil }, // template context function "DumpVar": dumpVar, + "NIL": func() any { return nil }, // ----------------------------------------------------------------- // html/template related functions diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go index 9a7d3dfbf653c..a5fdba3fde696 100644 --- a/routers/web/repo/compare.go +++ b/routers/web/repo/compare.go @@ -788,19 +788,11 @@ func CompareDiff(ctx *context.Context) { if !nothingToCompare { // Setup information for new form. - retrieveRepoMetasForIssueWriter(ctx, ctx.Repo.Repository, true) + pageMetaData := retrieveRepoIssueMetaData(ctx, ctx.Repo.Repository, nil, true) if ctx.Written() { return } - labelsData := retrieveRepoLabels(ctx, ctx.Repo.Repository, 0, true) - if ctx.Written() { - return - } - RetrieveRepoReviewers(ctx, ctx.Repo.Repository, nil, true) - if ctx.Written() { - return - } - _, templateErrs := setTemplateIfExists(ctx, pullRequestTemplateKey, pullRequestTemplateCandidates, labelsData) + _, templateErrs := setTemplateIfExists(ctx, pullRequestTemplateKey, pullRequestTemplateCandidates, pageMetaData) if len(templateErrs) > 0 { ctx.Flash.Warning(renderErrorOfTemplates(ctx, templateErrs), true) } diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index a4e2fd8cea310..b605272002a39 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -431,7 +431,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt return 0 } - retrieveProjects(ctx, repo) + retrieveProjectsForIssueList(ctx, repo) if ctx.Written() { return } @@ -556,37 +556,141 @@ func renderMilestones(ctx *context.Context) { ctx.Data["ClosedMilestones"] = closedMilestones } -// RetrieveRepoMilestonesAndAssignees find all the milestones and assignees of a repository -func RetrieveRepoMilestonesAndAssignees(ctx *context.Context, repo *repo_model.Repository) { +type issueSidebarMilestoneData struct { + SelectedMilestoneID int64 + OpenMilestones []*issues_model.Milestone + ClosedMilestones []*issues_model.Milestone +} + +type issueSidebarAssigneesData struct { + SelectedAssigneeIDs string + CandidateAssignees []*user_model.User +} + +type IssuePageMetaData struct { + RepoLink string + Repository *repo_model.Repository + Issue *issues_model.Issue + IsPullRequest bool + + ReviewersData *issueSidebarReviewersData + LabelsData *issueSidebarLabelsData + MilestonesData *issueSidebarMilestoneData + ProjectsData *issueSidebarProjectsData + AssigneesData *issueSidebarAssigneesData +} + +func retrieveRepoIssueMetaData(ctx *context.Context, repo *repo_model.Repository, issue *issues_model.Issue, isPull bool) *IssuePageMetaData { + data := &IssuePageMetaData{ + RepoLink: ctx.Repo.RepoLink, + Repository: repo, + Issue: issue, + IsPullRequest: isPull, + + ReviewersData: &issueSidebarReviewersData{}, + LabelsData: &issueSidebarLabelsData{}, + MilestonesData: &issueSidebarMilestoneData{}, + ProjectsData: &issueSidebarProjectsData{}, + AssigneesData: &issueSidebarAssigneesData{}, + } + ctx.Data["IssuePageMetaData"] = data + + if isPull { + data.retrieveReviewersData(ctx) + if ctx.Written() { + return data + } + } + data.retrieveLabelsData(ctx) + if ctx.Written() { + return data + } + if !ctx.Repo.CanWriteIssuesOrPulls(isPull) { + return data + } + + data.retrieveAssigneesDataForIssueWriter(ctx) + if ctx.Written() { + return data + } + + data.retrieveMilestonesDataForIssueWriter(ctx) + if ctx.Written() { + return data + } + + data.retrieveProjectsDataForIssueWriter(ctx) + if ctx.Written() { + return data + } + + PrepareBranchList(ctx) + if ctx.Written() { + return data + } + + ctx.Data["CanCreateIssueDependencies"] = ctx.Repo.CanCreateIssueDependencies(ctx, ctx.Doer, isPull) + return data +} + +func (d *IssuePageMetaData) retrieveMilestonesDataForIssueWriter(ctx *context.Context) { var err error - ctx.Data["OpenMilestones"], err = db.Find[issues_model.Milestone](ctx, issues_model.FindMilestoneOptions{ - RepoID: repo.ID, + if d.Issue != nil { + d.MilestonesData.SelectedMilestoneID = d.Issue.MilestoneID + } + d.MilestonesData.OpenMilestones, err = db.Find[issues_model.Milestone](ctx, issues_model.FindMilestoneOptions{ + RepoID: d.Repository.ID, IsClosed: optional.Some(false), }) if err != nil { ctx.ServerError("GetMilestones", err) return } - ctx.Data["ClosedMilestones"], err = db.Find[issues_model.Milestone](ctx, issues_model.FindMilestoneOptions{ - RepoID: repo.ID, + d.MilestonesData.ClosedMilestones, err = db.Find[issues_model.Milestone](ctx, issues_model.FindMilestoneOptions{ + RepoID: d.Repository.ID, IsClosed: optional.Some(true), }) if err != nil { ctx.ServerError("GetMilestones", err) return } +} - assigneeUsers, err := repo_model.GetRepoAssignees(ctx, repo) +func (d *IssuePageMetaData) retrieveAssigneesDataForIssueWriter(ctx *context.Context) { + var err error + d.AssigneesData.CandidateAssignees, err = repo_model.GetRepoAssignees(ctx, d.Repository) if err != nil { ctx.ServerError("GetRepoAssignees", err) return } - ctx.Data["Assignees"] = shared_user.MakeSelfOnTop(ctx.Doer, assigneeUsers) - + d.AssigneesData.CandidateAssignees = shared_user.MakeSelfOnTop(ctx.Doer, d.AssigneesData.CandidateAssignees) + if d.Issue != nil { + _ = d.Issue.LoadAssignees(ctx) + ids := make([]string, 0, len(d.Issue.Assignees)) + for _, a := range d.Issue.Assignees { + ids = append(ids, strconv.FormatInt(a.ID, 10)) + } + d.AssigneesData.SelectedAssigneeIDs = strings.Join(ids, ",") + } + // FIXME: this is a tricky part which writes ctx.Data["Mentionable*"] handleTeamMentions(ctx) } -func retrieveProjects(ctx *context.Context, repo *repo_model.Repository) { +func retrieveProjectsForIssueList(ctx *context.Context, repo *repo_model.Repository) { + ctx.Data["OpenProjects"], ctx.Data["ClosedProjects"] = retrieveProjectsInternal(ctx, repo) +} + +type issueSidebarProjectsData struct { + SelectedProjectID int64 + OpenProjects []*project_model.Project + ClosedProjects []*project_model.Project +} + +func (d *IssuePageMetaData) retrieveProjectsDataForIssueWriter(ctx *context.Context) { + d.ProjectsData.OpenProjects, d.ProjectsData.ClosedProjects = retrieveProjectsInternal(ctx, ctx.Repo.Repository) +} + +func retrieveProjectsInternal(ctx *context.Context, repo *repo_model.Repository) (open, closed []*project_model.Project) { // Distinguish whether the owner of the repository // is an individual or an organization repoOwnerType := project_model.TypeIndividual @@ -647,9 +751,7 @@ func retrieveProjects(ctx *context.Context, repo *repo_model.Repository) { } closedProjects = append(closedProjects, closedProjects2...) } - - ctx.Data["OpenProjects"] = openProjects - ctx.Data["ClosedProjects"] = closedProjects + return openProjects, closedProjects } // repoReviewerSelection items to bee shown @@ -665,10 +767,6 @@ type repoReviewerSelection struct { } type issueSidebarReviewersData struct { - Repository *repo_model.Repository - RepoOwnerName string - RepoLink string - IssueID int64 CanChooseReviewer bool OriginalReviews issues_model.ReviewList TeamReviewers []*repoReviewerSelection @@ -677,41 +775,44 @@ type issueSidebarReviewersData struct { } // RetrieveRepoReviewers find all reviewers of a repository. If issue is nil, it means the doer is creating a new PR. -func RetrieveRepoReviewers(ctx *context.Context, repo *repo_model.Repository, issue *issues_model.Issue, canChooseReviewer bool) { - data := &issueSidebarReviewersData{} - data.RepoLink = ctx.Repo.RepoLink - data.Repository = repo - data.RepoOwnerName = repo.OwnerName - data.CanChooseReviewer = canChooseReviewer +func (d *IssuePageMetaData) retrieveReviewersData(ctx *context.Context) { + data := d.ReviewersData + repo := d.Repository + if ctx.Doer != nil && ctx.IsSigned { + if d.Issue == nil { + data.CanChooseReviewer = true + } else { + data.CanChooseReviewer = issue_service.CanDoerChangeReviewRequests(ctx, ctx.Doer, repo, d.Issue) + } + } var posterID int64 var isClosed bool var reviews issues_model.ReviewList - if issue == nil { + if d.Issue == nil { posterID = ctx.Doer.ID } else { - posterID = issue.PosterID - if issue.OriginalAuthorID > 0 { + posterID = d.Issue.PosterID + if d.Issue.OriginalAuthorID > 0 { posterID = 0 // for migrated PRs, no poster ID } - data.IssueID = issue.ID - isClosed = issue.IsClosed || issue.PullRequest.HasMerged + isClosed = d.Issue.IsClosed || d.Issue.PullRequest.HasMerged - originalAuthorReviews, err := issues_model.GetReviewersFromOriginalAuthorsByIssueID(ctx, issue.ID) + originalAuthorReviews, err := issues_model.GetReviewersFromOriginalAuthorsByIssueID(ctx, d.Issue.ID) if err != nil { ctx.ServerError("GetReviewersFromOriginalAuthorsByIssueID", err) return } data.OriginalReviews = originalAuthorReviews - reviews, err = issues_model.GetReviewsByIssueID(ctx, issue.ID) + reviews, err = issues_model.GetReviewsByIssueID(ctx, d.Issue.ID) if err != nil { ctx.ServerError("GetReviewersByIssueID", err) return } - if len(reviews) == 0 && !canChooseReviewer { + if len(reviews) == 0 && !data.CanChooseReviewer { return } } @@ -724,7 +825,7 @@ func RetrieveRepoReviewers(ctx *context.Context, repo *repo_model.Repository, is reviewers []*user_model.User ) - if canChooseReviewer { + if data.CanChooseReviewer { var err error reviewers, err = repo_model.GetReviewers(ctx, repo, ctx.Doer.ID, posterID) if err != nil { @@ -760,7 +861,7 @@ func RetrieveRepoReviewers(ctx *context.Context, repo *repo_model.Repository, is tmp.ItemID = -review.ReviewerTeamID } - if canChooseReviewer { + if data.CanChooseReviewer { // Users who can choose reviewers can also remove review requests tmp.CanChange = true } else if ctx.Doer != nil && ctx.Doer.ID == review.ReviewerID && review.Type == issues_model.ReviewTypeRequest { @@ -770,7 +871,7 @@ func RetrieveRepoReviewers(ctx *context.Context, repo *repo_model.Repository, is pullReviews = append(pullReviews, tmp) - if canChooseReviewer { + if data.CanChooseReviewer { if tmp.IsTeam { teamReviewersResult = append(teamReviewersResult, tmp) } else { @@ -811,7 +912,7 @@ func RetrieveRepoReviewers(ctx *context.Context, repo *repo_model.Repository, is data.CurrentPullReviewers = currentPullReviewers } - if canChooseReviewer && reviewersResult != nil { + if data.CanChooseReviewer && reviewersResult != nil { preadded := len(reviewersResult) for _, reviewer := range reviewers { found := false @@ -839,7 +940,7 @@ func RetrieveRepoReviewers(ctx *context.Context, repo *repo_model.Repository, is data.Reviewers = reviewersResult } - if canChooseReviewer && teamReviewersResult != nil { + if data.CanChooseReviewer && teamReviewersResult != nil { preadded := len(teamReviewersResult) for _, team := range teamReviewers { found := false @@ -866,15 +967,9 @@ func RetrieveRepoReviewers(ctx *context.Context, repo *repo_model.Repository, is data.TeamReviewers = teamReviewersResult } - - ctx.Data["IssueSidebarReviewersData"] = data } type issueSidebarLabelsData struct { - Repository *repo_model.Repository - RepoLink string - IssueID int64 - IsPullRequest bool AllLabels []*issues_model.Label RepoLabels []*issues_model.Label OrgLabels []*issues_model.Label @@ -922,60 +1017,30 @@ func (d *issueSidebarLabelsData) SetSelectedLabelIDs(labelIDs []int64) { ) } -func retrieveRepoLabels(ctx *context.Context, repo *repo_model.Repository, issueID int64, isPull bool) *issueSidebarLabelsData { - labelsData := &issueSidebarLabelsData{ - Repository: repo, - RepoLink: ctx.Repo.RepoLink, - IssueID: issueID, - IsPullRequest: isPull, - } - ctx.Data["IssueSidebarLabelsData"] = labelsData +func (d *IssuePageMetaData) retrieveLabelsData(ctx *context.Context) { + repo := d.Repository + labelsData := d.LabelsData labels, err := issues_model.GetLabelsByRepoID(ctx, repo.ID, "", db.ListOptions{}) if err != nil { ctx.ServerError("GetLabelsByRepoID", err) - return nil + return } labelsData.RepoLabels = labels if repo.Owner.IsOrganization() { orgLabels, err := issues_model.GetLabelsByOrgID(ctx, repo.Owner.ID, ctx.FormString("sort"), db.ListOptions{}) if err != nil { - return nil + return } labelsData.OrgLabels = orgLabels } labelsData.AllLabels = append(labelsData.AllLabels, labelsData.RepoLabels...) labelsData.AllLabels = append(labelsData.AllLabels, labelsData.OrgLabels...) - return labelsData -} - -// retrieveRepoMetasForIssueWriter finds some the meta information of a repository for an issue/pr writer -func retrieveRepoMetasForIssueWriter(ctx *context.Context, repo *repo_model.Repository, isPull bool) { - if !ctx.Repo.CanWriteIssuesOrPulls(isPull) { - return - } - - RetrieveRepoMilestonesAndAssignees(ctx, repo) - if ctx.Written() { - return - } - - retrieveProjects(ctx, repo) - if ctx.Written() { - return - } - - PrepareBranchList(ctx) - if ctx.Written() { - return - } - // Contains true if the user can create issue dependencies - ctx.Data["CanCreateIssueDependencies"] = ctx.Repo.CanCreateIssueDependencies(ctx, ctx.Doer, isPull) } // Tries to load and set an issue template. The first return value indicates if a template was loaded. -func setTemplateIfExists(ctx *context.Context, ctxDataKey string, possibleFiles []string, labelsData *issueSidebarLabelsData) (bool, map[string]error) { +func setTemplateIfExists(ctx *context.Context, ctxDataKey string, possibleFiles []string, metaData *IssuePageMetaData) (bool, map[string]error) { commit, err := ctx.Repo.GitRepo.GetBranchCommit(ctx.Repo.Repository.DefaultBranch) if err != nil { return false, nil @@ -1013,24 +1078,22 @@ func setTemplateIfExists(ctx *context.Context, ctxDataKey string, possibleFiles ctx.Data["TemplateFile"] = template.FileName } - labelsData.SetSelectedLabelNames(template.Labels) + metaData.LabelsData.SetSelectedLabelNames(template.Labels) selectedAssigneeIDs := make([]int64, 0, len(template.Assignees)) selectedAssigneeIDStrings := make([]string, 0, len(template.Assignees)) - if userIDs, err := user_model.GetUserIDsByNames(ctx, template.Assignees, false); err == nil { + if userIDs, err := user_model.GetUserIDsByNames(ctx, template.Assignees, true); err == nil { for _, userID := range userIDs { selectedAssigneeIDs = append(selectedAssigneeIDs, userID) selectedAssigneeIDStrings = append(selectedAssigneeIDStrings, strconv.FormatInt(userID, 10)) } } + metaData.AssigneesData.SelectedAssigneeIDs = strings.Join(selectedAssigneeIDStrings, ",") if template.Ref != "" && !strings.HasPrefix(template.Ref, "refs/") { // Assume that the ref intended is always a branch - for tags users should use refs/tags/ template.Ref = git.BranchPrefix + template.Ref } - ctx.Data["HasSelectedAssignee"] = len(selectedAssigneeIDs) > 0 - ctx.Data["assignee_ids"] = strings.Join(selectedAssigneeIDStrings, ",") - ctx.Data["SelectedAssigneeIDs"] = selectedAssigneeIDs ctx.Data["Reference"] = template.Ref ctx.Data["RefEndName"] = git.RefName(template.Ref).ShortName() return true, templateErrs @@ -1057,42 +1120,19 @@ func NewIssue(ctx *context.Context) { ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled upload.AddUploadContext(ctx, "comment") - milestoneID := ctx.FormInt64("milestone") - if milestoneID > 0 { - milestone, err := issues_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, milestoneID) - if err != nil { - log.Error("GetMilestoneByID: %d: %v", milestoneID, err) - } else { - ctx.Data["milestone_id"] = milestoneID - ctx.Data["Milestone"] = milestone - } + pageMetaData := retrieveRepoIssueMetaData(ctx, ctx.Repo.Repository, nil, false) + if ctx.Written() { + return } - projectID := ctx.FormInt64("project") - if projectID > 0 && isProjectsEnabled { - project, err := project_model.GetProjectByID(ctx, projectID) - if err != nil { - log.Error("GetProjectByID: %d: %v", projectID, err) - } else if project.RepoID != ctx.Repo.Repository.ID { - log.Error("GetProjectByID: %d: %v", projectID, fmt.Errorf("project[%d] not in repo [%d]", project.ID, ctx.Repo.Repository.ID)) - } else { - ctx.Data["project_id"] = projectID - ctx.Data["Project"] = project - } - + pageMetaData.MilestonesData.SelectedMilestoneID = ctx.FormInt64("milestone") + pageMetaData.ProjectsData.SelectedProjectID = ctx.FormInt64("project") + if pageMetaData.ProjectsData.SelectedProjectID > 0 { if len(ctx.Req.URL.Query().Get("project")) > 0 { ctx.Data["redirect_after_creation"] = "project" } } - retrieveRepoMetasForIssueWriter(ctx, ctx.Repo.Repository, false) - if ctx.Written() { - return - } - labelsData := retrieveRepoLabels(ctx, ctx.Repo.Repository, 0, false) - if ctx.Written() { - return - } tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID) if err != nil { ctx.ServerError("GetTagNamesByRepoID", err) @@ -1101,7 +1141,7 @@ func NewIssue(ctx *context.Context) { ctx.Data["Tags"] = tags ret := issue_service.ParseTemplatesFromDefaultBranch(ctx.Repo.Repository, ctx.Repo.GitRepo) - templateLoaded, errs := setTemplateIfExists(ctx, issueTemplateKey, IssueTemplateCandidates, labelsData) + templateLoaded, errs := setTemplateIfExists(ctx, issueTemplateKey, IssueTemplateCandidates, pageMetaData) for k, v := range errs { ret.TemplateErrors[k] = v } @@ -1196,8 +1236,8 @@ func DeleteIssue(ctx *context.Context) { ctx.Redirect(fmt.Sprintf("%s/issues", ctx.Repo.Repository.Link()), http.StatusSeeOther) } -// ValidateRepoMetas check and returns repository's meta information -func ValidateRepoMetas(ctx *context.Context, form forms.CreateIssueForm, isPull bool) (ret struct { +// ValidateRepoMetasForNewIssue check and returns repository's meta information +func ValidateRepoMetasForNewIssue(ctx *context.Context, form forms.CreateIssueForm, isPull bool) (ret struct { LabelIDs, AssigneeIDs []int64 MilestoneID, ProjectID int64 @@ -1205,16 +1245,10 @@ func ValidateRepoMetas(ctx *context.Context, form forms.CreateIssueForm, isPull TeamReviewers []*organization.Team }, ) { - var ( - repo = ctx.Repo.Repository - err error - ) + var err error + repo := ctx.Repo.Repository - retrieveRepoMetasForIssueWriter(ctx, ctx.Repo.Repository, isPull) - if ctx.Written() { - return ret - } - labelsData := retrieveRepoLabels(ctx, ctx.Repo.Repository, 0, isPull) + pageMetaData := retrieveRepoIssueMetaData(ctx, repo, nil, isPull) if ctx.Written() { return ret } @@ -1226,7 +1260,7 @@ func ValidateRepoMetas(ctx *context.Context, form forms.CreateIssueForm, isPull if err != nil { return ret } - labelsData.SetSelectedLabelIDs(labelIDs) + pageMetaData.LabelsData.SetSelectedLabelIDs(labelIDs) } // Check milestone. @@ -1344,7 +1378,7 @@ func NewIssuePost(ctx *context.Context) { attachments []string ) - validateRet := ValidateRepoMetas(ctx, *form, false) + validateRet := ValidateRepoMetasForNewIssue(ctx, *form, false) if ctx.Written() { return } @@ -1619,37 +1653,11 @@ func ViewIssue(ctx *context.Context) { } } - retrieveRepoMetasForIssueWriter(ctx, repo, issue.IsPull) + pageMetaData := retrieveRepoIssueMetaData(ctx, repo, issue, issue.IsPull) if ctx.Written() { return } - labelsData := retrieveRepoLabels(ctx, repo, issue.ID, issue.IsPull) - if ctx.Written() { - return - } - labelsData.SetSelectedLabels(issue.Labels) - - // Check milestone and assignee. - if ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) { - RetrieveRepoMilestonesAndAssignees(ctx, repo) - retrieveProjects(ctx, repo) - - if ctx.Written() { - return - } - } - - if issue.IsPull { - canChooseReviewer := false - if ctx.Doer != nil && ctx.IsSigned { - canChooseReviewer = issue_service.CanDoerChangeReviewRequests(ctx, ctx.Doer, repo, issue) - } - - RetrieveRepoReviewers(ctx, repo, issue, canChooseReviewer) - if ctx.Written() { - return - } - } + pageMetaData.LabelsData.SetSelectedLabels(issue.Labels) if ctx.IsSigned { // Update issue-user. diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index dd9671efbe8ad..bb814eab6e70d 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -1269,7 +1269,7 @@ func CompareAndPullRequestPost(ctx *context.Context) { return } - validateRet := ValidateRepoMetas(ctx, *form, true) + validateRet := ValidateRepoMetasForNewIssue(ctx, *form, true) if ctx.Written() { return } diff --git a/templates/repo/issue/milestone/select_menu.tmpl b/templates/repo/issue/milestone/select_menu.tmpl deleted file mode 100644 index 9b0492ce52480..0000000000000 --- a/templates/repo/issue/milestone/select_menu.tmpl +++ /dev/null @@ -1,38 +0,0 @@ -{{if or .OpenMilestones .ClosedMilestones}} -
- {{svg "octicon-search" 16}} - -
-
-{{end}} -
{{ctx.Locale.Tr "repo.issues.new.clear_milestone"}}
-{{if and (not .OpenMilestones) (not .ClosedMilestones)}} -
- {{ctx.Locale.Tr "repo.issues.new.no_items"}} -
-{{else}} - {{if .OpenMilestones}} -
-
- {{ctx.Locale.Tr "repo.issues.new.open_milestone"}} -
- {{range .OpenMilestones}} - - {{svg "octicon-milestone" 16 "tw-mr-1"}} - {{.Name}} - - {{end}} - {{end}} - {{if .ClosedMilestones}} -
-
- {{ctx.Locale.Tr "repo.issues.new.closed_milestone"}} -
- {{range .ClosedMilestones}} - - {{svg "octicon-milestone" 16 "tw-mr-1"}} - {{.Name}} - - {{end}} - {{end}} -{{end}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 65d359e9dcda6..ceaaebc4d5440 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -49,142 +49,22 @@
{{template "repo/issue/branch_selector_field" $}} {{if .PageIsComparePull}} - {{template "repo/issue/sidebar/reviewer_list" $.IssueSidebarReviewersData}} + {{template "repo/issue/sidebar/reviewer_list" $.IssuePageMetaData}}
{{end}} - {{template "repo/issue/sidebar/label_list" $.IssueSidebarLabelsData}} - -
- - -
- - {{ctx.Locale.Tr "repo.issues.new.milestone"}} - {{if .HasIssuesOrPullsWritePermission}} - {{svg "octicon-gear" 16 "tw-ml-1"}} - {{end}} - -
- {{template "repo/issue/milestone/select_menu" .}} -
-
-
- {{ctx.Locale.Tr "repo.issues.new.no_milestone"}} -
- {{if .Milestone}} - - {{svg "octicon-milestone" 18 "tw-mr-2"}} - {{.Milestone.Name}} - - {{end}} -
-
- + {{template "repo/issue/sidebar/label_list" $.IssuePageMetaData}} + {{template "repo/issue/sidebar/milestone_list" $.IssuePageMetaData}} {{if .IsProjectsEnabled}} -
- - -
- - {{ctx.Locale.Tr "repo.issues.new.projects"}} - {{if .HasIssuesOrPullsWritePermission}} - {{svg "octicon-gear" 16 "tw-ml-1"}} - {{end}} - -
- {{if or .OpenProjects .ClosedProjects}} -
- {{svg "octicon-search" 16}} - -
- {{end}} -
{{ctx.Locale.Tr "repo.issues.new.clear_projects"}}
- {{if and (not .OpenProjects) (not .ClosedProjects)}} -
- {{ctx.Locale.Tr "repo.issues.new.no_items"}} -
- {{else}} - {{if .OpenProjects}} -
-
- {{ctx.Locale.Tr "repo.issues.new.open_projects"}} -
- {{range .OpenProjects}} - - {{svg .IconName 18 "tw-mr-2"}}{{.Title}} - - {{end}} - {{end}} - {{if .ClosedProjects}} -
-
- {{ctx.Locale.Tr "repo.issues.new.closed_projects"}} -
- {{range .ClosedProjects}} - - {{svg .IconName 18 "tw-mr-2"}}{{.Title}} - - {{end}} - {{end}} - {{end}} -
-
-
- {{ctx.Locale.Tr "repo.issues.new.no_projects"}} -
- {{if .Project}} - - {{svg .Project.IconName 18 "tw-mr-2"}}{{.Project.Title}} - - {{end}} -
-
+ {{template "repo/issue/sidebar/project_list" $.IssuePageMetaData}} {{end}} -
- -
- - {{ctx.Locale.Tr "repo.issues.new.assignees"}} - {{if .HasIssuesOrPullsWritePermission}} - {{svg "octicon-gear" 16 "tw-ml-1"}} - {{end}} - -
-
- {{svg "octicon-search" 16}} - -
-
{{ctx.Locale.Tr "repo.issues.new.clear_assignees"}}
- {{range .Assignees}} - - {{svg "octicon-check"}} - - {{ctx.AvatarUtils.Avatar . 28 "tw-mr-2"}}{{template "repo/search_name" .}} - - - {{end}} -
-
-
- - {{ctx.Locale.Tr "repo.issues.new.no_assignees"}} - -
- {{range .Assignees}} - - {{ctx.AvatarUtils.Avatar . 28 "tw-mr-2 tw-align-middle"}}{{.GetDisplayName}} - - {{end}} -
-
+ {{template "repo/issue/sidebar/assignee_list" $.IssuePageMetaData}} + {{if and .PageIsComparePull (not (eq .HeadRepo.FullName .BaseCompareRepo.FullName)) .CanWriteToHeadRepo}}
-
-
- - -
+
+ +
{{end}}
diff --git a/templates/repo/issue/sidebar/assignee_list.tmpl b/templates/repo/issue/sidebar/assignee_list.tmpl index 260f7c5be4dae..b5345003039ff 100644 --- a/templates/repo/issue/sidebar/assignee_list.tmpl +++ b/templates/repo/issue/sidebar/assignee_list.tmpl @@ -1,46 +1,37 @@ +{{$pageMeta := .}} +{{$data := .AssigneesData}} +{{$canChange := and ctx.RootData.HasIssuesOrPullsWritePermission (not $pageMeta.Repository.IsArchived)}} +{{$issueAssignees := NIL}} +{{if $pageMeta.Issue}}{{$issueAssignees = $pageMeta.Issue.Assignees}}{{end}}
- -
- - {{ctx.Locale.Tr "repo.issues.new.assignees"}} - {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16 "tw-ml-1"}} - {{end}} - -
-
- {{svg "octicon-search" 16}} - +
+ +
+ + {{ctx.Locale.Tr "repo.issues.new.assignees"}} {{if $canChange}}{{svg "octicon-gear"}}{{end}} + +
+
+ {{svg "octicon-search" 16}} + +
+
{{ctx.Locale.Tr "repo.issues.new.clear_assignees"}}
+ {{range $data.CandidateAssignees}} + + {{svg "octicon-check"}} + {{ctx.AvatarUtils.Avatar . 20}} {{template "repo/search_name" .}} + + {{end}}
-
{{ctx.Locale.Tr "repo.issues.new.clear_assignees"}}
- {{range .Assignees}} - - {{$AssigneeID := .ID}} - - {{$checked := false}} - {{range $.Issue.Assignees}} - {{if eq .ID $AssigneeID}} - {{$checked = true}} - {{end}} - {{end}} - {{svg "octicon-check"}} - - {{ctx.AvatarUtils.Avatar . 20 "tw-mr-2"}}{{template "repo/search_name" .}} - - - {{end}}
-
-
- {{ctx.Locale.Tr "repo.issues.new.no_assignees"}} -
- {{range .Issue.Assignees}} -
- - {{ctx.AvatarUtils.Avatar . 28 "tw-mr-2"}} - {{.GetDisplayName}} - -
+
+ {{ctx.Locale.Tr "repo.issues.new.no_assignees"}} + {{range $issueAssignees}} + + {{ctx.AvatarUtils.Avatar . 28}} {{.GetDisplayName}} + {{end}}
diff --git a/templates/repo/issue/sidebar/label_list.tmpl b/templates/repo/issue/sidebar/label_list.tmpl index e9f4baa43354a..a983667d73685 100644 --- a/templates/repo/issue/sidebar/label_list.tmpl +++ b/templates/repo/issue/sidebar/label_list.tmpl @@ -1,6 +1,9 @@ -{{$data := .}} -{{$canChange := and ctx.RootData.HasIssuesOrPullsWritePermission (not $data.Repository.IsArchived)}} -
+{{$pageMeta := .}} +{{$data := .LabelsData}} +{{$canChange := and ctx.RootData.HasIssuesOrPullsWritePermission (not $pageMeta.Repository.IsArchived)}} +
@@ -16,7 +19,7 @@
{{ctx.Locale.Tr "repo.issues.new.clear_labels"}} {{$previousExclusiveScope := "_no_scope"}} - {{range .RepoLabels}} + {{range $data.RepoLabels}} {{$exclusiveScope := .ExclusiveScope}} {{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
@@ -26,7 +29,7 @@ {{end}}
{{$previousExclusiveScope = "_no_scope"}} - {{range .OrgLabels}} + {{range $data.OrgLabels}} {{$exclusiveScope := .ExclusiveScope}} {{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
@@ -42,7 +45,7 @@ {{ctx.Locale.Tr "repo.issues.new.no_label"}} {{range $data.AllLabels}} {{if .IsChecked}} - + {{- ctx.RenderUtils.RenderLabel . -}} {{end}} diff --git a/templates/repo/issue/sidebar/label_list_item.tmpl b/templates/repo/issue/sidebar/label_list_item.tmpl index ad878e918be16..5c6808d95b21e 100644 --- a/templates/repo/issue/sidebar/label_list_item.tmpl +++ b/templates/repo/issue/sidebar/label_list_item.tmpl @@ -1,5 +1,5 @@ {{$label := .Label}} - {{svg (Iif $label.ExclusiveScope "octicon-dot-fill" "octicon-check")}} diff --git a/templates/repo/issue/sidebar/milestone_list.tmpl b/templates/repo/issue/sidebar/milestone_list.tmpl index e9ca02f77a15a..bbd69b86f1c9b 100644 --- a/templates/repo/issue/sidebar/milestone_list.tmpl +++ b/templates/repo/issue/sidebar/milestone_list.tmpl @@ -1,22 +1,54 @@ +{{$pageMeta := .}} +{{$data := .MilestonesData}} +{{$canChange := and ctx.RootData.HasIssuesOrPullsWritePermission (not $pageMeta.Repository.IsArchived)}} +{{$issueMilestone := NIL}} +{{if and $pageMeta.Issue $pageMeta.Issue.Milestone}}{{$issueMilestone = $pageMeta.Issue.Milestone}}{{end}}
-
- - {{ctx.Locale.Tr "repo.issues.new.milestone"}} - {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16 "tw-ml-1"}} - {{end}} - -
- {{template "repo/issue/milestone/select_menu" .}} +
+ +
+ + {{ctx.Locale.Tr "repo.issues.new.milestone"}} {{if $canChange}}{{svg "octicon-gear"}}{{end}} + +
+ {{if and (not $data.OpenMilestones) (not $data.ClosedMilestones)}} +
{{ctx.Locale.Tr "repo.issues.new.no_items"}}
+ {{else}} +
+ {{svg "octicon-search"}} + +
+
+
{{ctx.Locale.Tr "repo.issues.new.clear_milestone"}}
+ {{if $data.OpenMilestones}} +
+
{{ctx.Locale.Tr "repo.issues.new.open_milestone"}}
+ {{range $data.OpenMilestones}} + + {{svg "octicon-milestone"}} {{.Name}} + + {{end}} + {{end}} + {{if $data.ClosedMilestones}} +
+
{{ctx.Locale.Tr "repo.issues.new.closed_milestone"}}
+ {{range $data.ClosedMilestones}} + + {{svg "octicon-milestone"}} {{.Name}} + + {{end}} + {{end}} + {{end}} +
-
-
- {{ctx.Locale.Tr "repo.issues.new.no_milestone"}} -
- {{if .Issue.Milestone}} - - {{svg "octicon-milestone" 18 "tw-mr-2"}} - {{.Issue.Milestone.Name}} + +
+ {{ctx.Locale.Tr "repo.issues.new.no_milestone"}} + {{if $issueMilestone}} + + {{svg "octicon-milestone" 18}} {{$issueMilestone.Name}} {{end}}
diff --git a/templates/repo/issue/sidebar/project_list.tmpl b/templates/repo/issue/sidebar/project_list.tmpl index ec79f8032f7b0..246e84524c782 100644 --- a/templates/repo/issue/sidebar/project_list.tmpl +++ b/templates/repo/issue/sidebar/project_list.tmpl @@ -1,53 +1,51 @@ -{{if .IsProjectsEnabled}} -
- -
- - {{ctx.Locale.Tr "repo.issues.new.projects"}} - {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16 "tw-ml-1"}} - {{end}} +{{$pageMeta := .}} +{{$data := .ProjectsData}} +{{$canChange := and ctx.RootData.HasIssuesOrPullsWritePermission (not $pageMeta.Repository.IsArchived)}} +{{$issueProject := NIL}} +{{if and $pageMeta.Issue $pageMeta.Issue.Project}}{{$issueProject = $pageMeta.Issue.Project}}{{end}} +
+
+ +
+ + {{ctx.Locale.Tr "repo.issues.new.projects"}} {{if $canChange}}{{svg "octicon-gear"}}{{end}} -
- {{if or .OpenProjects .ClosedProjects}} +
+ {{if or $data.OpenProjects $data.ClosedProjects}}
{{svg "octicon-search" 16}}
{{end}} -
{{ctx.Locale.Tr "repo.issues.new.clear_projects"}}
- {{if .OpenProjects}} +
{{ctx.Locale.Tr "repo.issues.new.clear_projects"}}
+ {{if $data.OpenProjects}}
-
- {{ctx.Locale.Tr "repo.issues.new.open_projects"}} -
- {{range .OpenProjects}} - - {{svg .IconName 18 "tw-mr-2"}}{{.Title}} +
{{ctx.Locale.Tr "repo.issues.new.open_projects"}}
+ {{range $data.OpenProjects}} + + {{svg .IconName 18}} {{.Title}} {{end}} {{end}} - {{if .ClosedProjects}} + {{if $data.ClosedProjects}}
-
- {{ctx.Locale.Tr "repo.issues.new.closed_projects"}} -
- {{range .ClosedProjects}} - - {{svg .IconName 18 "tw-mr-2"}}{{.Title}} +
{{ctx.Locale.Tr "repo.issues.new.closed_projects"}}
+ {{range $data.ClosedProjects}} + + {{svg .IconName 18}} {{.Title}} {{end}} {{end}}
-
- {{ctx.Locale.Tr "repo.issues.new.no_projects"}} -
- {{if .Issue.Project}} - - {{svg .Issue.Project.IconName 18 "tw-mr-2"}}{{.Issue.Project.Title}} - - {{end}} -
+
+ {{ctx.Locale.Tr "repo.issues.new.no_projects"}} + {{if $issueProject}} + + {{svg $issueProject.IconName 18}} {{$issueProject.Title}} + + {{end}}
-{{end}} +
diff --git a/templates/repo/issue/sidebar/reviewer_list.tmpl b/templates/repo/issue/sidebar/reviewer_list.tmpl index cf7b97c02b194..8b6d11081235f 100644 --- a/templates/repo/issue/sidebar/reviewer_list.tmpl +++ b/templates/repo/issue/sidebar/reviewer_list.tmpl @@ -1,10 +1,14 @@ -{{$data := .}} +{{$pageMeta := .}} +{{$data := .ReviewersData}} +{{$repoOwnerName := $pageMeta.Repository.OwnerName}} {{$hasCandidates := or $data.Reviewers $data.TeamReviewers}} -
+
{{/* match CreateIssueForm */}}
- {{ctx.Locale.Tr "repo.issues.review.reviewers"}} {{if and $data.CanChooseReviewer}}{{svg "octicon-gear"}}{{end}} + {{ctx.Locale.Tr "repo.issues.review.reviewers"}} {{if $data.CanChooseReviewer}}{{svg "octicon-gear"}}{{end}}
{{if $hasCandidates}} @@ -29,7 +33,7 @@ {{svg "octicon-check"}} - {{svg "octicon-people" 20}} {{$data.RepoOwnerName}}/{{.Team.Name}} + {{svg "octicon-people" 20}} {{$repoOwnerName}}/{{.Team.Name}} {{end}} {{end}} @@ -47,7 +51,7 @@ {{if .User}} {{ctx.AvatarUtils.Avatar .User 20}} {{.User.GetDisplayName}} {{else if .Team}} - {{svg "octicon-people" 20}} {{$data.RepoOwnerName}}/{{.Team.Name}} + {{svg "octicon-people" 20}} {{$repoOwnerName}}/{{.Team.Name}} {{end}}
@@ -64,13 +68,13 @@ {{if .Requested}} + data-url="{{$pageMeta.RepoLink}}/issues/request_review?action=detach&issue_ids={{$pageMeta.Issue.ID}}&id={{.ItemID}}"> {{svg "octicon-trash"}} {{else}} + data-url="{{$pageMeta.RepoLink}}/issues/request_review?action=attach&issue_ids={{$pageMeta.Issue.ID}}&id={{.ItemID}}"> {{svg "octicon-sync"}} {{end}} @@ -84,8 +88,8 @@ {{range $data.OriginalReviews}}
- {{$originalURLHostname := $data.Repository.GetOriginalURLHostname}} - {{$originalURL := $data.Repository.OriginalURL}} + {{$originalURLHostname := $pageMeta.Repository.GetOriginalURLHostname}} + {{$originalURL := $pageMeta.Repository.OriginalURL}} {{svg (MigrationIcon $originalURLHostname) 20}} {{.OriginalAuthor}} @@ -108,7 +112,7 @@
{{ctx.Locale.Tr "repo.issues.dismiss_review_warning"}}
-
+ {{ctx.RootData.CsrfTokenHtml}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 0fae1e9e1c1a5..02f5d3e2df90f 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -2,16 +2,19 @@ {{template "repo/issue/branch_selector_field" $}} {{if .Issue.IsPull}} - {{template "repo/issue/sidebar/reviewer_list" $.IssueSidebarReviewersData}} + {{template "repo/issue/sidebar/reviewer_list" $.IssuePageMetaData}} {{template "repo/issue/sidebar/wip_switch" $}}
{{end}} - {{template "repo/issue/sidebar/label_list" $.IssueSidebarLabelsData}} + {{template "repo/issue/sidebar/label_list" $.IssuePageMetaData}} + + {{template "repo/issue/sidebar/milestone_list" $.IssuePageMetaData}} + {{if .IsProjectsEnabled}} + {{template "repo/issue/sidebar/project_list" $.IssuePageMetaData}} + {{end}} + {{template "repo/issue/sidebar/assignee_list" $.IssuePageMetaData}} - {{template "repo/issue/sidebar/milestone_list" $}} - {{template "repo/issue/sidebar/project_list" $}} - {{template "repo/issue/sidebar/assignee_list" $}} {{template "repo/issue/sidebar/participant_list" $}} {{template "repo/issue/sidebar/watch_notification" $}} {{template "repo/issue/sidebar/stopwatch_timetracker" $}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index ff8342d29aae7..01ddab97e595c 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2453,12 +2453,6 @@ tbody.commit-list { margin-top: 1em; } -.sidebar-item-link { - display: inline-flex; - align-items: center; - overflow-wrap: anywhere; -} - .diff-file-header { padding: 5px 8px !important; box-shadow: 0 -1px 0 1px var(--color-body); /* prevent borders being visible behind top corners when sticky and scrolled */ diff --git a/web_src/js/features/repo-issue-sidebar-combolist.ts b/web_src/js/features/repo-issue-sidebar-combolist.ts index f408eb43ba0d8..a4c0a9585db7f 100644 --- a/web_src/js/features/repo-issue-sidebar-combolist.ts +++ b/web_src/js/features/repo-issue-sidebar-combolist.ts @@ -3,7 +3,7 @@ import {POST} from '../modules/fetch.ts'; import {queryElemChildren, queryElems, toggleElem} from '../utils/dom.ts'; // if there are draft comments, confirm before reloading, to avoid losing comments -export function issueSidebarReloadConfirmDraftComment() { +function issueSidebarReloadConfirmDraftComment() { const commentTextareas = [ document.querySelector('.edit-content-zone:not(.tw-hidden) textarea'), document.querySelector('#comment-form textarea'), @@ -22,84 +22,138 @@ export function issueSidebarReloadConfirmDraftComment() { window.location.reload(); } -function collectCheckedValues(elDropdown: HTMLElement) { - return Array.from(elDropdown.querySelectorAll('.menu > .item.checked'), (el) => el.getAttribute('data-value')); -} +class IssueSidebarComboList { + updateUrl: string; + updateOn: string; + updateAlgo: string; + elDropdown: HTMLElement; + elList: HTMLElement; + elComboValue: HTMLInputElement; + initialValues: string[]; -export function initIssueSidebarComboList(container: HTMLElement) { - const updateUrl = container.getAttribute('data-update-url'); - const elDropdown = container.querySelector(':scope > .ui.dropdown'); - const elList = container.querySelector(':scope > .ui.list'); - const elComboValue = container.querySelector(':scope > .combo-value'); - let initialValues = collectCheckedValues(elDropdown); + constructor(private container: HTMLElement) { + this.updateUrl = this.container.getAttribute('data-update-url'); + this.updateOn = container.getAttribute('data-update-on'); + this.updateAlgo = container.getAttribute('data-update-algo'); + if (!['click', 'hide'].includes(this.updateOn)) throw new Error(`Invalid data-update-on: ${this.updateOn}`); + if (!['diff', 'all'].includes(this.updateAlgo)) throw new Error(`Invalid data-update-algo: ${this.updateAlgo}`); + this.elDropdown = container.querySelector(':scope > .ui.dropdown'); + this.elList = container.querySelector(':scope > .ui.list'); + this.elComboValue = container.querySelector(':scope > .combo-value'); + } + + collectCheckedValues() { + return Array.from(this.elDropdown.querySelectorAll('.menu > .item.checked'), (el) => el.getAttribute('data-value')); + } + + updateUiList(changedValues) { + const elEmptyTip = this.elList.querySelector('.item.empty-list'); + queryElemChildren(this.elList, '.item:not(.empty-list)', (el) => el.remove()); + for (const value of changedValues) { + const el = this.elDropdown.querySelector(`.menu > .item[data-value="${CSS.escape(value)}"]`); + if (!el) continue; + const listItem = el.cloneNode(true) as HTMLElement; + queryElems(listItem, '.item-check-mark, .item-secondary-info', (el) => el.remove()); + this.elList.append(listItem); + } + const hasItems = Boolean(this.elList.querySelector('.item:not(.empty-list)')); + toggleElem(elEmptyTip, !hasItems); + } + + async updateToBackend(changedValues) { + let changed = false; + if (this.updateAlgo === 'diff') { + for (const value of this.initialValues) { + if (!changedValues.includes(value)) { + await POST(this.updateUrl, {data: new URLSearchParams({action: 'detach', id: value})}); + changed = true; + } + } + for (const value of changedValues) { + if (!this.initialValues.includes(value)) { + await POST(this.updateUrl, {data: new URLSearchParams({action: 'attach', id: value})}); + changed = true; + } + } + } else { + changed = this.initialValues.join(',') !== changedValues.join(','); + if (changed) { + await POST(this.updateUrl, {data: new URLSearchParams({id: changedValues.join(',')})}); + } + } + if (changed) issueSidebarReloadConfirmDraftComment(); + } + + async doUpdate() { + const changedValues = this.collectCheckedValues(); + this.updateUiList(changedValues); + if (this.updateUrl) await this.updateToBackend(changedValues); + this.initialValues = changedValues; + } + + async onChange() { + if (this.updateOn === 'click') { + await this.doUpdate(); + fomanticQuery(this.elDropdown).dropdown('hide'); + } + } - elDropdown.addEventListener('click', (e) => { + async onItemClick(e) { const elItem = (e.target as HTMLElement).closest('.item'); if (!elItem) return; e.preventDefault(); if (elItem.hasAttribute('data-can-change') && elItem.getAttribute('data-can-change') !== 'true') return; if (elItem.matches('.clear-selection')) { - queryElems(elDropdown, '.menu > .item', (el) => el.classList.remove('checked')); - elComboValue.value = ''; + queryElems(this.elDropdown, '.menu > .item', (el) => el.classList.remove('checked')); + this.elComboValue.value = ''; + this.onChange(); return; } const scope = elItem.getAttribute('data-scope'); if (scope) { // scoped items could only be checked one at a time - const elSelected = elDropdown.querySelector(`.menu > .item.checked[data-scope="${CSS.escape(scope)}"]`); + const elSelected = this.elDropdown.querySelector(`.menu > .item.checked[data-scope="${CSS.escape(scope)}"]`); if (elSelected === elItem) { elItem.classList.toggle('checked'); } else { - queryElems(elDropdown, `.menu > .item[data-scope="${CSS.escape(scope)}"]`, (el) => el.classList.remove('checked')); + queryElems(this.elDropdown, `.menu > .item[data-scope="${CSS.escape(scope)}"]`, (el) => el.classList.remove('checked')); elItem.classList.toggle('checked', true); } } else { elItem.classList.toggle('checked'); } - elComboValue.value = collectCheckedValues(elDropdown).join(','); - }); + this.elComboValue.value = this.collectCheckedValues().join(','); + this.onChange(); + } - const updateToBackend = async (changedValues) => { - let changed = false; - for (const value of initialValues) { - if (!changedValues.includes(value)) { - await POST(updateUrl, {data: new URLSearchParams({action: 'detach', id: value})}); - changed = true; - } - } - for (const value of changedValues) { - if (!initialValues.includes(value)) { - await POST(updateUrl, {data: new URLSearchParams({action: 'attach', id: value})}); - changed = true; + async onHide() { + if (this.updateOn === 'hide') this.doUpdate(); + } + + init() { + // init the checked items from initial value + if (this.elComboValue.value && !queryElems(this.elDropdown, `.menu > .item.checked`).length) { + const values = this.elComboValue.value.split(','); + for (const value of values) { + const elItem = this.elDropdown.querySelector(`.menu > .item[data-value="${CSS.escape(value)}"]`); + elItem?.classList.add('checked'); } + this.updateUiList(values); } - if (changed) issueSidebarReloadConfirmDraftComment(); - }; + this.initialValues = this.collectCheckedValues(); - const syncUiList = (changedValues) => { - const elEmptyTip = elList.querySelector('.item.empty-list'); - queryElemChildren(elList, '.item:not(.empty-list)', (el) => el.remove()); - for (const value of changedValues) { - const el = elDropdown.querySelector(`.menu > .item[data-value="${CSS.escape(value)}"]`); - const listItem = el.cloneNode(true) as HTMLElement; - queryElems(listItem, '.item-check-mark, .item-secondary-info', (el) => el.remove()); - elList.append(listItem); - } - const hasItems = Boolean(elList.querySelector('.item:not(.empty-list)')); - toggleElem(elEmptyTip, !hasItems); - }; - - fomanticQuery(elDropdown).dropdown('setting', { - action: 'nothing', // do not hide the menu if user presses Enter - fullTextSearch: 'exact', - async onHide() { - // TODO: support "Esc" to cancel the selection. Use partial page loading to avoid losing inputs. - const changedValues = collectCheckedValues(elDropdown); - syncUiList(changedValues); - if (updateUrl) await updateToBackend(changedValues); - initialValues = changedValues; - }, - }); + this.elDropdown.addEventListener('click', (e) => this.onItemClick(e)); + + fomanticQuery(this.elDropdown).dropdown('setting', { + action: 'nothing', // do not hide the menu if user presses Enter + fullTextSearch: 'exact', + onHide: () => this.onHide(), + }); + } +} + +export function initIssueSidebarComboList(container: HTMLElement) { + new IssueSidebarComboList(container).init(); } diff --git a/web_src/js/features/repo-issue-sidebar.ts b/web_src/js/features/repo-issue-sidebar.ts index 52878848e8cb3..45cd38d533d33 100644 --- a/web_src/js/features/repo-issue-sidebar.ts +++ b/web_src/js/features/repo-issue-sidebar.ts @@ -1,10 +1,7 @@ import $ from 'jquery'; import {POST} from '../modules/fetch.ts'; -import {updateIssuesMeta} from './repo-common.ts'; -import {svg} from '../svg.ts'; -import {htmlEscape} from 'escape-goat'; import {queryElems, toggleElem} from '../utils/dom.ts'; -import {initIssueSidebarComboList, issueSidebarReloadConfirmDraftComment} from './repo-issue-sidebar-combolist.ts'; +import {initIssueSidebarComboList} from './repo-issue-sidebar-combolist.ts'; function initBranchSelector() { const elSelectBranch = document.querySelector('.ui.dropdown.select-branch'); @@ -34,212 +31,6 @@ function initBranchSelector() { }); } -// List submits -function initListSubmits(selector, outerSelector) { - const $list = $(`.ui.${outerSelector}.list`); - const $noSelect = $list.find('.no-select'); - const $listMenu = $(`.${selector} .menu`); - let hasUpdateAction = $listMenu.data('action') === 'update'; - const items = {}; - - $(`.${selector}`).dropdown({ - 'action': 'nothing', // do not hide the menu if user presses Enter - fullTextSearch: 'exact', - async onHide() { - hasUpdateAction = $listMenu.data('action') === 'update'; // Update the var - if (hasUpdateAction) { - // TODO: Add batch functionality and make this 1 network request. - const itemEntries = Object.entries(items); - for (const [elementId, item] of itemEntries) { - await updateIssuesMeta( - item['update-url'], - item['action'], - item['issue-id'], - elementId, - ); - } - if (itemEntries.length) { - issueSidebarReloadConfirmDraftComment(); - } - } - }, - }); - - $listMenu.find('.item:not(.no-select)').on('click', function (e) { - e.preventDefault(); - if (this.classList.contains('ban-change')) { - return false; - } - - hasUpdateAction = $listMenu.data('action') === 'update'; // Update the var - - const clickedItem = this; // eslint-disable-line unicorn/no-this-assignment - const scope = this.getAttribute('data-scope'); - - $(this).parent().find('.item').each(function () { - if (scope) { - // Enable only clicked item for scoped labels - if (this.getAttribute('data-scope') !== scope) { - return; - } - if (this !== clickedItem && !this.classList.contains('checked')) { - return; - } - } else if (this !== clickedItem) { - // Toggle for other labels - return; - } - - if (this.classList.contains('checked')) { - $(this).removeClass('checked'); - $(this).find('.octicon-check').addClass('tw-invisible'); - if (hasUpdateAction) { - if (!($(this).data('id') in items)) { - items[$(this).data('id')] = { - 'update-url': $listMenu.data('update-url'), - action: 'detach', - 'issue-id': $listMenu.data('issue-id'), - }; - } else { - delete items[$(this).data('id')]; - } - } - } else { - $(this).addClass('checked'); - $(this).find('.octicon-check').removeClass('tw-invisible'); - if (hasUpdateAction) { - if (!($(this).data('id') in items)) { - items[$(this).data('id')] = { - 'update-url': $listMenu.data('update-url'), - action: 'attach', - 'issue-id': $listMenu.data('issue-id'), - }; - } else { - delete items[$(this).data('id')]; - } - } - } - }); - - // TODO: Which thing should be done for choosing review requests - // to make chosen items be shown on time here? - if (selector === 'select-assignees-modify') { - return false; - } - - const listIds = []; - $(this).parent().find('.item').each(function () { - if (this.classList.contains('checked')) { - listIds.push($(this).data('id')); - $($(this).data('id-selector')).removeClass('tw-hidden'); - } else { - $($(this).data('id-selector')).addClass('tw-hidden'); - } - }); - if (!listIds.length) { - $noSelect.removeClass('tw-hidden'); - } else { - $noSelect.addClass('tw-hidden'); - } - $($(this).parent().data('id')).val(listIds.join(',')); - return false; - }); - $listMenu.find('.no-select.item').on('click', function (e) { - e.preventDefault(); - if (hasUpdateAction) { - (async () => { - await updateIssuesMeta( - $listMenu.data('update-url'), - 'clear', - $listMenu.data('issue-id'), - '', - ); - issueSidebarReloadConfirmDraftComment(); - })(); - } - - $(this).parent().find('.item').each(function () { - $(this).removeClass('checked'); - $(this).find('.octicon-check').addClass('tw-invisible'); - }); - - if (selector === 'select-assignees-modify') { - return false; - } - - $list.find('.item').each(function () { - $(this).addClass('tw-hidden'); - }); - $noSelect.removeClass('tw-hidden'); - $($(this).parent().data('id')).val(''); - }); -} - -function selectItem(select_id, input_id) { - const $menu = $(`${select_id} .menu`); - const $list = $(`.ui${select_id}.list`); - const hasUpdateAction = $menu.data('action') === 'update'; - - $menu.find('.item:not(.no-select)').on('click', function () { - $(this).parent().find('.item').each(function () { - $(this).removeClass('selected active'); - }); - - $(this).addClass('selected active'); - if (hasUpdateAction) { - (async () => { - await updateIssuesMeta( - $menu.data('update-url'), - '', - $menu.data('issue-id'), - $(this).data('id'), - ); - issueSidebarReloadConfirmDraftComment(); - })(); - } - - let icon = ''; - if (input_id === '#milestone_id') { - icon = svg('octicon-milestone', 18, 'tw-mr-2'); - } else if (input_id === '#project_id') { - icon = svg('octicon-project', 18, 'tw-mr-2'); - } else if (input_id === '#assignee_id') { - icon = `avatar`; - } - - $list.find('.selected').html(` - - ${icon} - ${htmlEscape(this.textContent)} - - `); - - $(`.ui${select_id}.list .no-select`).addClass('tw-hidden'); - $(input_id).val($(this).data('id')); - }); - $menu.find('.no-select.item').on('click', function () { - $(this).parent().find('.item:not(.no-select)').each(function () { - $(this).removeClass('selected active'); - }); - - if (hasUpdateAction) { - (async () => { - await updateIssuesMeta( - $menu.data('update-url'), - '', - $menu.data('issue-id'), - $(this).data('id'), - ); - issueSidebarReloadConfirmDraftComment(); - })(); - } - - $list.find('.selected').html(''); - $list.find('.no-select').removeClass('tw-hidden'); - $(input_id).val(''); - }); -} - function initRepoIssueDue() { const form = document.querySelector('.issue-due-form'); if (!form) return; @@ -257,14 +48,6 @@ export function initRepoIssueSidebar() { initBranchSelector(); initRepoIssueDue(); - // TODO: refactor the legacy initListSubmits&selectItem to initIssueSidebarComboList - initListSubmits('select-assignees', 'assignees'); - initListSubmits('select-assignees-modify', 'assignees'); - selectItem('.select-assignee', '#assignee_id'); - - selectItem('.select-project', '#project_id'); - selectItem('.select-milestone', '#milestone_id'); - // init the combo list: a dropdown for selecting items, and a list for showing selected items and related actions queryElems(document, '.issue-sidebar-combo', (el) => initIssueSidebarComboList(el)); }