Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add/remove label on kanban column change #28745

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions models/project/board.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ type Board struct {
Default bool `xorm:"NOT NULL DEFAULT false"` // issues not assigned to a specific board will be assigned to this board
Sorting int8 `xorm:"NOT NULL DEFAULT 0"`
Color string `xorm:"VARCHAR(7)"`
LabelID int64 `xorm:"DEFAULT 0"`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only one label is allowed?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And migrations are necessary.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We did not see the relevance to assign more than 1 label on column change. see just above where I explained it :)
#28745 (comment)


ProjectID int64 `xorm:"INDEX NOT NULL"`
CreatorID int64 `xorm:"NOT NULL"`
Expand Down
3 changes: 3 additions & 0 deletions models/project/issue.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ type ProjectIssue struct { //revive:disable-line:exported

// the sorting order on the board
Sorting int64 `xorm:"NOT NULL DEFAULT 0"`

// label that is added when a issue is moved to this column
LabelID int64 `xorm:"DEFAULT 0"`
}

func init() {
Expand Down
19 changes: 19 additions & 0 deletions routers/web/org/projects.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"code.gitea.io/gitea/modules/web"
shared_user "code.gitea.io/gitea/routers/web/shared/user"
"code.gitea.io/gitea/services/forms"
issue_service "code.gitea.io/gitea/services/issue"
)

const (
Expand Down Expand Up @@ -545,6 +546,7 @@ func AddBoardToProjectPost(ctx *context.Context) {
ProjectID: project.ID,
Title: form.Title,
Color: form.Color,
LabelID: form.LabelID,
CreatorID: ctx.Doer.ID,
}); err != nil {
ctx.ServerError("NewProjectBoard", err)
Expand Down Expand Up @@ -742,10 +744,27 @@ func MoveIssues(ctx *context.Context) {
}
}

fromColumnLabelID, err := strconv.ParseInt(ctx.FormString("fromColumnLabelID"), 10, 64)
if err != nil {
ctx.ServerError("fromColumnLableId is required", errors.New("fromColumnLableId is required"))
return
}

issueID, err := strconv.ParseInt(ctx.FormString("issueID"), 10, 64)
if err != nil {
ctx.ServerError("moved issueID is required", errors.New("moved issueID is required"))
return
}

if err = project_model.MoveIssuesOnProjectBoard(ctx, board, sortedIssueIDs); err != nil {
ctx.ServerError("MoveIssuesOnProjectBoard", err)
return
}

if err = issue_service.AddAndOrRemoveLabelFromIssue(ctx, issueID, fromColumnLabelID, board); err != nil {
ctx.ServerError("failed adding/removing label in addAndOrRemoveLabel", err)
return
}

ctx.JSONOK()
}
11 changes: 11 additions & 0 deletions routers/web/repo/issue_label.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,17 @@ func RetrieveLabels(ctx *context.Context) {
ctx.Data["SortType"] = ctx.FormString("sort")
}

// RetrieveLabelsOrg clone of RetrieveLabels but without repo
func RetrieveLabelsOrg(ctx *context.Context) {
orgLabels, err := issues_model.GetLabelsByOrgID(ctx, ctx.Org.Organization.ID, ctx.FormString("sort"), db.ListOptions{})
if err != nil {
ctx.ServerError("GetLabelsByOrgID", err)
return
}

ctx.Data["Labels"] = orgLabels
}

// NewLabel create new label for repository
func NewLabel(ctx *context.Context) {
form := web.GetForm(ctx).(*forms.CreateLabelForm)
Expand Down
20 changes: 20 additions & 0 deletions routers/web/repo/projects.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"fmt"
"net/http"
"net/url"
"strconv"
"strings"

"code.gitea.io/gitea/models/db"
Expand All @@ -25,6 +26,7 @@ import (
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/services/forms"
issue_service "code.gitea.io/gitea/services/issue"
)

const (
Expand Down Expand Up @@ -487,6 +489,7 @@ func AddBoardToProjectPost(ctx *context.Context) {
Title: form.Title,
Color: form.Color,
CreatorID: ctx.Doer.ID,
LabelID: form.LabelID,
}); err != nil {
ctx.ServerError("NewProjectBoard", err)
return
Expand Down Expand Up @@ -691,10 +694,27 @@ func MoveIssues(ctx *context.Context) {
}
}

fromColumnLabelID, err := strconv.ParseInt(ctx.FormString("fromColumnLabelID"), 10, 64)
if err != nil {
ctx.ServerError("fromColumnLableId is required", errors.New("fromColumnLableId is required"))
return
}

issueID, err := strconv.ParseInt(ctx.FormString("issueID"), 10, 64)
if err != nil {
ctx.ServerError("moved issueID is required", errors.New("moved issueID is required"))
return
}

if err = project_model.MoveIssuesOnProjectBoard(ctx, board, sortedIssueIDs); err != nil {
ctx.ServerError("MoveIssuesOnProjectBoard", err)
return
}

if err = issue_service.AddAndOrRemoveLabelFromIssue(ctx, issueID, fromColumnLabelID, board); err != nil {
ctx.ServerError("failed adding/removing label in addAndOrRemoveLabel", err)
return
}

ctx.JSONOK()
}
4 changes: 2 additions & 2 deletions routers/web/web.go
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,7 @@ func registerRoutes(m *web.Route) {
m.Group("/projects", func() {
m.Group("", func() {
m.Get("", org.Projects)
m.Get("/{id}", org.ViewProject)
m.Get("/{id}", repo.RetrieveLabelsOrg, org.ViewProject)
}, reqUnitAccess(unit.TypeProjects, perm.AccessModeRead, true))
m.Group("", func() { //nolint:dupl
m.Get("/new", org.RenderNewProject)
Expand Down Expand Up @@ -1322,7 +1322,7 @@ func registerRoutes(m *web.Route) {

m.Group("/projects", func() {
m.Get("", repo.Projects)
m.Get("/{id}", repo.ViewProject)
m.Get("/{id}", repo.RetrieveLabels, repo.ViewProject)
m.Group("", func() { //nolint:dupl
m.Get("/new", repo.RenderNewProject)
m.Post("/new", web.Bind(forms.CreateProjectForm{}), repo.NewProjectPost)
Expand Down
1 change: 1 addition & 0 deletions services/forms/repo_form.go
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ type EditProjectBoardForm struct {
Title string `binding:"Required;MaxSize(100)"`
Sorting int8
Color string `binding:"MaxSize(7)"`
LabelID int64
}

// _____ .__.__ __
Expand Down
51 changes: 51 additions & 0 deletions services/issue/project.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// Copyright 2024 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT

package issue

import (
"errors"

issues_model "code.gitea.io/gitea/models/issues"
project_model "code.gitea.io/gitea/models/project"
"code.gitea.io/gitea/modules/context"
)

// AddAndOrRemoveLabelFromIssue updates issue label according to board LabelID
func AddAndOrRemoveLabelFromIssue(ctx *context.Context, currentIssueID, fromColumnLabelID int64, board *project_model.Board) error {
issue, err := issues_model.GetIssueByID(ctx, currentIssueID)
if err != nil {
return errors.New("failed getting issue")
}
var addedLabel *issues_model.Label
if board.LabelID != 0 {
addedLabel, err = issues_model.GetLabelByID(ctx, board.LabelID)
if err != nil {
return errors.New("failed getting add label")
}
}
var removedLabel *issues_model.Label
if fromColumnLabelID != 0 {

removedLabel, err = issues_model.GetLabelByID(ctx, fromColumnLabelID)
if err != nil {
return errors.New("failed getting remove label")
}
}

// Delete old label from current issue
if fromColumnLabelID != 0 {
if err := RemoveLabel(ctx, issue, ctx.Doer, removedLabel); err != nil {
return err
}
}

// Add New Label to current issue
if board.LabelID != 0 {
if err := AddLabel(ctx, issue, ctx.Doer, addedLabel); err != nil {
return err
}
}

return nil
}
131 changes: 78 additions & 53 deletions templates/projects/view.tmpl
Original file line number Diff line number Diff line change
@@ -1,67 +1,91 @@
{{$canWriteProject := and .CanWriteProjects (or (not .Repository) (not .Repository.IsArchived))}}

<div class="ui container">
<div class="gt-df gt-sb gt-ac gt-mb-4">
<h2 class="gt-mb-0">{{.Project.Title}}</h2>
{{if $canWriteProject}}
<div class="ui compact mini menu">
<a class="item" href="{{.Link}}/edit?redirect=project">
{{svg "octicon-pencil"}}
{{ctx.Locale.Tr "repo.issues.label_edit"}}
</a>
{{if .Project.IsClosed}}
<button class="item btn link-action" data-url="{{.Link}}/open">
{{svg "octicon-check"}}
{{ctx.Locale.Tr "repo.projects.open"}}
</button>
{{else}}
<button class="item btn link-action" data-url="{{.Link}}/close">
{{svg "octicon-skip"}}
{{ctx.Locale.Tr "repo.projects.close"}}
</button>
{{end}}
<button class="item btn delete-button" data-url="{{.Link}}/delete" data-id="{{.Project.ID}}">
{{svg "octicon-trash"}}
{{ctx.Locale.Tr "repo.issues.label_delete"}}
<div class="gt-df gt-sb gt-ac gt-mb-4">
<h2 class="gt-mb-0">{{.Project.Title}}</h2>
{{if $canWriteProject}}
<div class="ui compact mini menu">
<a class="item" href="{{.Link}}/edit?redirect=project">
{{svg "octicon-pencil"}}
{{ctx.Locale.Tr "repo.issues.label_edit"}}
</a>
{{if .Project.IsClosed}}
<button class="item btn link-action" data-url="{{.Link}}/open">
{{svg "octicon-check"}}
{{ctx.Locale.Tr "repo.projects.open"}}
</button>
<button class="item btn show-modal" data-modal="#new-project-column-item">
{{svg "octicon-plus"}}
{{ctx.Locale.Tr "new_project_column"}}
{{else}}
<button class="item btn link-action" data-url="{{.Link}}/close">
{{svg "octicon-skip"}}
{{ctx.Locale.Tr "repo.projects.close"}}
</button>
{{end}}
<button class="item btn delete-button" data-url="{{.Link}}/delete" data-id="{{.Project.ID}}">
{{svg "octicon-trash"}}
{{ctx.Locale.Tr "repo.issues.label_delete"}}
</button>
<button class="item btn show-modal" data-modal="#new-project-column-item">
{{svg "octicon-plus"}}
{{ctx.Locale.Tr "new_project_column"}}
</button>
</div>
<div class="ui small modal new-project-column-modal" id="new-project-column-item">
<div class="header">
{{ctx.Locale.Tr "repo.projects.column.new"}}
</div>
<div class="ui small modal new-project-column-modal" id="new-project-column-item">
<div class="header">
{{ctx.Locale.Tr "repo.projects.column.new"}}
</div>
<div class="content">
<form class="ui form">
<div class="required field">
<label for="new_project_column">{{ctx.Locale.Tr "repo.projects.column.new_title"}}</label>
<input class="new-project-column" id="new_project_column" name="title" required>
</div>
<div class="content">
<form class="ui form">
<div class="required field">
<label for="new_project_column">{{ctx.Locale.Tr "repo.projects.column.new_title"}}</label>
<input class="new-project-column" id="new_project_column" name="title" required>
</div>

<div class="field color-field">
<label for="new_project_column_color">{{ctx.Locale.Tr "repo.projects.column.color"}}</label>
<div class="color picker column">
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_project_column_color_picker" name="color">
{{template "repo/issue/label_precolors"}}
</div>
<div class="field color-field">
<label for="new_project_column_color">{{ctx.Locale.Tr "repo.projects.column.color"}}</label>
<div class="color picker column">
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_project_column_color_picker" name="color">
{{template "repo/issue/label_precolors"}}
</div>
</div>

<div class="text right actions">
<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
<button data-url="{{$.Link}}" class="ui primary button" id="new_project_column_submit">{{ctx.Locale.Tr "repo.projects.column.new_submit"}}</button>
{{if .Labels }}
<!-- Label -->
<div class="ui dropdown jump item label-filter" >
<span class="text">
Choose label
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
</span>
<div class="menu" style="max-height:300px;overflow-y: scroll;">
<div class="ui icon search input">
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
<input type="text" id="new_project_column_label" name="label" placeholder="{{.locale.Tr "repo.issues.filter_label"}}">
</div>
{{$previousExclusiveScope := "_no_scope"}}
{{range .Labels}}
{{$exclusiveScope := .ExclusiveScope}}
{{if and (ne $previousExclusiveScope $exclusiveScope)}}
<div class="divider"></div>
{{end}}
{{$previousExclusiveScope = $exclusiveScope}}
<div class="item label-filter-item labels-for-project-creation" data-label-id="{{.ID}}" >{{RenderLabel $.Context .}}</div>
{{end}}
</div>
</div>
</form>
</div>
<input name="label" id="new_project_column_project_label" class="gt-mb-4">
<input name="labelId" id="new_project_column_project_label_id" type="number" style="display: none;">
{{end}}
<div class="text right actions">
<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
<button data-url="{{$.Link}}" class="ui primary button" id="new_project_column_submit">{{ctx.Locale.Tr "repo.projects.column.new_submit"}}</button>
</div>
</form>
</div>
{{end}}
</div>
</div>
{{end}}
</div>

<div class="content">{{$.Project.RenderedContent|Str2html}}</div>
<div class="content">{{$.Project.RenderedContent|Str2html}}</div>

<div class="divider"></div>
</div>
<div class="divider"></div>

<div id="project-board">
<div class="board {{if .CanWriteProjects}}sortable{{end}}">
Expand Down Expand Up @@ -165,9 +189,10 @@

<div class="divider"></div>

{{- $currentColumnLabelID := .LabelID }}
<div class="ui cards {{if and $canWriteProject (ne .ID 0)}}{{/* ID 0 is default column which cannot be moved */}}gt-cursor-grab{{end}}" data-url="{{$.Link}}/{{.ID}}" data-project="{{$.Project.ID}}" data-board="{{.ID}}" id="board_{{.ID}}">
{{range (index $.IssuesMap .ID)}}
<div class="issue-card gt-word-break {{if $canWriteProject}}gt-cursor-grab{{end}}" data-issue="{{.ID}}">
<div class="issue-card gt-word-break {{if $canWriteProject}}gt-cursor-grab{{end}}" data-issue="{{.ID}}" data-column-label-id="{{$currentColumnLabelID}}">
{{template "repo/issue/card" (dict "Issue" . "Page" $)}}
</div>
{{end}}
Expand Down
16 changes: 16 additions & 0 deletions web_src/js/features/project-label.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
export function initNewProjectFormLabel() {
if (!document.querySelectorAll('#new-project-column-item form input#new_project_column_project_label').length) return;

const labels = document.querySelectorAll('.labels-for-project-creation');
const selectedLabel = document.querySelector('input#new_project_column_project_label');
const selectedLabelId = document.querySelector('input#new_project_column_project_label_id');

if (!labels || !selectedLabel || !selectedLabelId) return;

for (const l of labels) {
l.addEventListener('click', () => {
selectedLabel.value = l.textContent;
selectedLabelId.value = l.dataset.labelId;
});
}
}
Loading
Loading