Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
99915931
Commit
99915931
authored
Aug 01, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved data holding into models
parent
da64959b
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
169 additions
and
85 deletions
+169
-85
app/assets/javascripts/boards/boards_bundle.js.es6
app/assets/javascripts/boards/boards_bundle.js.es6
+3
-2
app/assets/javascripts/boards/components/board.js.es6
app/assets/javascripts/boards/components/board.js.es6
+1
-1
app/assets/javascripts/boards/components/board_delete.js.es6
app/assets/javascripts/boards/components/board_delete.js.es6
+1
-1
app/assets/javascripts/boards/components/board_list.js.es6
app/assets/javascripts/boards/components/board_list.js.es6
+5
-5
app/assets/javascripts/boards/components/new_list_dropdown.js.es6
...ts/javascripts/boards/components/new_list_dropdown.js.es6
+32
-0
app/assets/javascripts/boards/models/issue.js.es6
app/assets/javascripts/boards/models/issue.js.es6
+35
-0
app/assets/javascripts/boards/models/label.js.es6
app/assets/javascripts/boards/models/label.js.es6
+7
-0
app/assets/javascripts/boards/models/list.js.es6
app/assets/javascripts/boards/models/list.js.es6
+49
-0
app/assets/javascripts/boards/stores/boards_store.js.es6
app/assets/javascripts/boards/stores/boards_store.js.es6
+35
-75
app/views/shared/issuable/_filter.html.haml
app/views/shared/issuable/_filter.html.haml
+1
-1
No files found.
app/assets/javascripts/boards/boards_bundle.js.es6
View file @
99915931
//= require vue
//= require vue-resource
//= require Sortable
//= require_tree ./models
//= require_tree ./stores
//= require_tree ./services
//= require_tree ./components
...
...
@@ -16,8 +17,8 @@ $(function () {
ready: function () {
service.all()
.then((resp) => {
resp.
data
.forEach((board) => {
BoardsStore.
state.lists.push
(board);
resp.
json()
.forEach((board) => {
BoardsStore.
new
(board);
});
});
}
...
...
app/assets/javascripts/boards/components/board.js.es6
View file @
99915931
...
...
@@ -27,7 +27,7 @@
fallbackClass: 'is-dragging',
ghostClass: 'is-ghost',
onUpdate: function (e) {
BoardsStore.move
Board
(e.oldIndex + 1, e.newIndex + 1);
BoardsStore.move
List
(e.oldIndex + 1, e.newIndex + 1);
}
});
},
...
...
app/assets/javascripts/boards/components/board_delete.js.es6
View file @
99915931
...
...
@@ -8,7 +8,7 @@
$(this.$el).tooltip('destroy');
if (confirm('Are you sure you want to delete this list?')) {
BoardsStore.remove
Board
(this.boardId);
BoardsStore.remove
List
(this.boardId);
}
}
}
...
...
app/assets/javascripts/boards/components/board_list.js.es6
View file @
99915931
...
...
@@ -62,13 +62,13 @@
fallbackClass: 'is-dragging',
ghostClass: 'is-ghost',
onAdd: (e) => {
let from
Board
Id = e.from.getAttribute('data-board');
from
BoardId = parseInt(fromBoardId) || fromBoard
Id;
let to
Board
Id = e.to.getAttribute('data-board');
to
BoardId = parseInt(toBoardId) || toBoard
Id;
let from
List
Id = e.from.getAttribute('data-board');
from
ListId = parseInt(fromListId) || fromList
Id;
let to
List
Id = e.to.getAttribute('data-board');
to
ListId = parseInt(toListId) || toList
Id;
const issueId = parseInt(e.item.getAttribute('data-issue'));
BoardsStore.moveCardTo
Board(fromBoardId, toBoard
Id, issueId, e.newIndex);
BoardsStore.moveCardTo
List(fromListId, toList
Id, issueId, e.newIndex);
},
onUpdate: (e) => {
console.log(e.newIndex, e.oldIndex);
...
...
app/assets/javascripts/boards/components/new_list_dropdown.js.es6
0 → 100644
View file @
99915931
$(() => {
$('.js-new-board-list').each(function () {
const $this = $(this);
$this.glDropdown({
data: function(term, callback) {
$.ajax({
url: $this.attr('data-labels')
}).then((resp) => {
callback(resp);
});
},
renderRow: (label) => {
const $li = $('<li />'),
$a = $('<a />', {
text: label.title,
href: '#'
}),
$labelColor = $('<span />', {
class: 'dropdown-label-box',
style: `background-color: ${label.color}`
});
return $li.append($a.prepend($labelColor));
},
selectable: true,
clicked: (label, $el, e) => {
e.preventDefault();
}
});
});
});
app/assets/javascripts/boards/models/issue.js.es6
0 → 100644
View file @
99915931
class Issue {
constructor (obj) {
this.id = obj.id;
this.title = obj.title;
this.labels = [];
obj.labels.forEach((label) => {
this.labels.push(new Label(label));
});
}
addLabel (label) {
if (label) {
const hasLabel = this.findLabel(label);
if (!hasLabel) {
this.labels.push(new Label(label));
}
}
}
findLabel (findLabel) {
return _.find(this.labels, (label) => {
return label.title === findLabel.title;
});
}
removeLabel (removeLabel) {
if (removeLabel) {
this.labels = _.reject(this.labels, (label) => {
return removeLabel.title === label.title;
});
}
}
}
app/assets/javascripts/boards/models/label.js.es6
0 → 100644
View file @
99915931
class Label {
constructor (obj) {
this.title = obj.title;
this.backgroundColor = obj.backgroundColor;
this.textColor = obj.textColor;
}
}
app/assets/javascripts/boards/models/list.js.es6
0 → 100644
View file @
99915931
class List {
constructor (obj) {
this.id = obj.id;
this.index = obj.index;
this.search = obj.search || false;
this.title = obj.title;
if (obj.label) {
this.label = new Label(obj.label);
}
if (obj.issues) {
this.issues = [];
obj.issues.forEach((issue) => {
this.issues.push(new Issue(issue));
});
}
}
addIssue (issue, index) {
this.issues.splice(index, 0, issue);
issue.addLabel(this.label);
}
findIssue (id) {
return _.find(this.issues, (issue) => {
return issue.id === id;
});
}
removeIssue (removeIssue, listLabels) {
this.issues = _.reject(this.issues, (issue) => {
const matchesRemove = removeIssue.id === issue.id;
if (matchesRemove) {
if (typeof listLabels !== 'undefined') {
listLabels.forEach((listLabel) => {
issue.removeLabel(listLabel);
});
} else {
issue.removeLabel(this.label);
}
}
return matchesRemove;
});
}
}
app/assets/javascripts/boards/stores/boards_store.js.es6
View file @
99915931
...
...
@@ -9,103 +9,63 @@
milestone: {},
}
},
removeBoard: (id) => {
BoardsStore.state.lists = _.reject(BoardsStore.state.lists, (board) => {
return board.id === id;
new: function (board) {
const list = new List(board);
this.state.lists.push(list);
},
removeList: function (id) {
this.state.lists = _.reject(this.state.lists, (list) => {
return list.id === id;
});
},
move
Board: (oldIndex, newIndex) =>
{
const
boardFrom = _.find(BoardsStore.state.lists, (board
) => {
return
board
.index === oldIndex;
move
List: function (oldIndex, newIndex)
{
const
listFrom = _.find(this.state.lists, (list
) => {
return
list
.index === oldIndex;
});
service.updateBoard(
board
From.id, newIndex);
service.updateBoard(
list
From.id, newIndex);
const
boardTo = _.find(BoardsStore.state.lists, (board
) => {
return
board
.index === newIndex;
const
listTo = _.find(this.state.lists, (list
) => {
return
list
.index === newIndex;
});
board
From.index = newIndex;
if (newIndex >
board
To.index) {
board
To.index--;
list
From.index = newIndex;
if (newIndex >
list
To.index) {
list
To.index--;
} else {
board
To.index++;
list
To.index++;
}
},
moveCardToBoard: (boardFromId, boardToId, issueId, toIndex) => {
const boardFrom = _.find(BoardsStore.state.lists, (board) => {
return board.id === boardFromId;
});
const boardTo = _.find(BoardsStore.state.lists, (board) => {
return board.id === boardToId;
});
let issue = _.find(boardFrom.issues, (issue) => {
return issue.id === issueId;
moveCardToList: function (listFromId, listToId, issueId, toIndex) {
const listFrom = _.find(this.state.lists, (list) => {
return list.id === listFromId;
});
const issueTo = _.find(boardTo.issues, (issue) => {
return issue.id === issueId;
});
const issueBoards = BoardsStore.getBoardsForIssue(issue);
// Remove the issue from old board
boardFrom.issues = _.reject(boardFrom.issues, (issue) => {
return issue.id === issueId;
const listTo = _.find(this.state.lists, (list) => {
return list.id === listToId;
});
const issueTo = listTo.findIssue(issueId);
let issue = listFrom.findIssue(issueId);
const issueLists = this.getListsForIssue(issue);
listFrom.removeIssue(issue);
// Add to new boards issues if it doesn't already exist
if (issueTo) {
issue = issueTo;
issue.removeLabel(listFrom.label);
} else {
boardTo.issues.splice(toIndex, 0, issue
);
listTo.addIssue(issue, toIndex
);
}
if (
boardTo.id === 'done' && board
From.id !== 'backlog') {
BoardsStore.removeIssueFromBoards(issue, issueBoards);
issue.labels = _.reject(issue.labels, (label) => {
return label.title === boardFrom.title
;
if (
listTo.id === 'done' && list
From.id !== 'backlog') {
issueLists.forEach((list) => {
issue.removeLabel(list.label);
list.removeIssue(issue)
;
});
} else {
if (boardTo.label) {
if (boardFrom.id !== 'backlog') {
BoardsStore.removeIssueFromBoard(issue, boardFrom);
}
foundLabel = _.find(issue.labels, (label) => {
return label.title === boardTo.title;
});
if (!foundLabel) {
issue.labels.push(boardTo.label);
}
}
}
},
removeIssueFromBoards: (issue, boards) => {
const boardLabels = _.map(boards, (board) => {
return board.title;
});
boards.issues = _.each(boards, (board) => {
board.issues = _.reject(board.issues, (boardIssue) => {
return issue.id === boardIssue.id;
});
});
issue.labels = _.reject(issue.labels, (label) => {
return boardLabels.indexOf(label.title) !== -1;
});
},
removeIssueFromBoard: (issue, board) => {
issue.labels = _.reject(issue.labels, (label) => {
return label.title === board.title;
});
},
getBoardsForIssue: (issue) => {
return _.filter(BoardsStore.state.lists, (board) => {
const foundIssue = _.find(board.issues, (boardIssue) => {
return issue.id === boardIssue.id;
});
return foundIssue;
getListsForIssue: function (issue) {
return _.filter(this.state.lists, (list) => {
return list.findIssue(issue.id);
});
},
clearDone: () => {
...
...
app/views/shared/issuable/_filter.html.haml
View file @
99915931
...
...
@@ -31,7 +31,7 @@
=
render
'shared/sort_dropdown'
-
else
.dropdown
%button
.btn.btn-create
{
type:
"button"
,
data:
{
toggle:
"dropdown"
}
}
%button
.btn.btn-create
.js-new-board-list
{
type:
"button"
,
data:
{
toggle:
"dropdown"
,
labels:
labels_filter_path
}
}
Create new list
.dropdown-menu.dropdown-menu-paging.dropdown-menu-align-right.dropdown-menu-issues-board-new
=
dropdown_title
(
"Create a new list"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment