mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-30 14:09:42 -05:00
d91839692f
The previous implementation will start multiple POST requests from the
frontend when moving a column and another bug is moving the default
column will never be remembered in fact.
- [x] This PR will allow the default column to move to a non-first
position
- [x] And it also uses one request instead of multiple requests when
moving the columns
- [x] Use a star instead of a pin as the icon for setting the default
column action
- [x] Inserted new column will be append to the end
- [x] Fix #30701 the newly added issue will be append to the end of the
default column
- [x] Fix when deleting a column, all issues in it will be displayed
from UI but database records exist.
- [x] Add a limitation for columns in a project to 20. So the sorting
will not be overflow because it's int8.
---------
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit a303c973e0264dab45a787c4afa200e183e0d953)
Conflicts:
routers/web/web.go
e91733468ef726fc9365aa4820cdd5f2ddfdaa23 Add missing database transaction for new issue (#29490) was not cherry-picked
services/issue/issue.go
fe6792dff3 Enable/disable owner and repo projects independently (#28805) was not cherry-picked
(cherry picked from commit 7d3ca90dfe)
(cherry picked from commit 084bec89ed7ae0816fc2d8db6784ad22523d1fc4)
127 lines
3.8 KiB
Go
127 lines
3.8 KiB
Go
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package project
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"testing"
|
|
|
|
"code.gitea.io/gitea/models/db"
|
|
"code.gitea.io/gitea/models/unittest"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestGetDefaultBoard(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
projectWithoutDefault, err := GetProjectByID(db.DefaultContext, 5)
|
|
assert.NoError(t, err)
|
|
|
|
// check if default board was added
|
|
board, err := projectWithoutDefault.GetDefaultBoard(db.DefaultContext)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, int64(5), board.ProjectID)
|
|
assert.Equal(t, "Uncategorized", board.Title)
|
|
|
|
projectWithMultipleDefaults, err := GetProjectByID(db.DefaultContext, 6)
|
|
assert.NoError(t, err)
|
|
|
|
// check if multiple defaults were removed
|
|
board, err = projectWithMultipleDefaults.GetDefaultBoard(db.DefaultContext)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, int64(6), board.ProjectID)
|
|
assert.Equal(t, int64(9), board.ID)
|
|
|
|
// set 8 as default board
|
|
assert.NoError(t, SetDefaultBoard(db.DefaultContext, board.ProjectID, 8))
|
|
|
|
// then 9 will become a non-default board
|
|
board, err = GetBoard(db.DefaultContext, 9)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, int64(6), board.ProjectID)
|
|
assert.False(t, board.Default)
|
|
}
|
|
|
|
func Test_moveIssuesToAnotherColumn(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
column1 := unittest.AssertExistsAndLoadBean(t, &Board{ID: 1, ProjectID: 1})
|
|
|
|
issues, err := column1.GetIssues(db.DefaultContext)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, issues, 1)
|
|
assert.EqualValues(t, 1, issues[0].ID)
|
|
|
|
column2 := unittest.AssertExistsAndLoadBean(t, &Board{ID: 2, ProjectID: 1})
|
|
issues, err = column2.GetIssues(db.DefaultContext)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, issues, 1)
|
|
assert.EqualValues(t, 3, issues[0].ID)
|
|
|
|
err = column1.moveIssuesToAnotherColumn(db.DefaultContext, column2)
|
|
assert.NoError(t, err)
|
|
|
|
issues, err = column1.GetIssues(db.DefaultContext)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, issues, 0)
|
|
|
|
issues, err = column2.GetIssues(db.DefaultContext)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, issues, 2)
|
|
assert.EqualValues(t, 3, issues[0].ID)
|
|
assert.EqualValues(t, 0, issues[0].Sorting)
|
|
assert.EqualValues(t, 1, issues[1].ID)
|
|
assert.EqualValues(t, 1, issues[1].Sorting)
|
|
}
|
|
|
|
func Test_MoveColumnsOnProject(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
project1 := unittest.AssertExistsAndLoadBean(t, &Project{ID: 1})
|
|
columns, err := project1.GetBoards(db.DefaultContext)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, columns, 3)
|
|
assert.EqualValues(t, 0, columns[0].Sorting) // even if there is no default sorting, the code should also work
|
|
assert.EqualValues(t, 0, columns[1].Sorting)
|
|
assert.EqualValues(t, 0, columns[2].Sorting)
|
|
|
|
err = MoveColumnsOnProject(db.DefaultContext, project1, map[int64]int64{
|
|
0: columns[1].ID,
|
|
1: columns[2].ID,
|
|
2: columns[0].ID,
|
|
})
|
|
assert.NoError(t, err)
|
|
|
|
columnsAfter, err := project1.GetBoards(db.DefaultContext)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, columnsAfter, 3)
|
|
assert.EqualValues(t, columns[1].ID, columnsAfter[0].ID)
|
|
assert.EqualValues(t, columns[2].ID, columnsAfter[1].ID)
|
|
assert.EqualValues(t, columns[0].ID, columnsAfter[2].ID)
|
|
}
|
|
|
|
func Test_NewBoard(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
project1 := unittest.AssertExistsAndLoadBean(t, &Project{ID: 1})
|
|
columns, err := project1.GetBoards(db.DefaultContext)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, columns, 3)
|
|
|
|
for i := 0; i < maxProjectColumns-3; i++ {
|
|
err := NewBoard(db.DefaultContext, &Board{
|
|
Title: fmt.Sprintf("board-%d", i+4),
|
|
ProjectID: project1.ID,
|
|
})
|
|
assert.NoError(t, err)
|
|
}
|
|
err = NewBoard(db.DefaultContext, &Board{
|
|
Title: "board-21",
|
|
ProjectID: project1.ID,
|
|
})
|
|
assert.Error(t, err)
|
|
assert.True(t, strings.Contains(err.Error(), "maximum number of columns reached"))
|
|
}
|