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
c49ee361
Commit
c49ee361
authored
Feb 24, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'boards-card-template-to-js' into 'master'
Issue boards card template in JS See merge request !9477
parents
d6f18f8e
a9bcb5b8
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
239 additions
and
74 deletions
+239
-74
app/assets/javascripts/boards/components/board_card.js
app/assets/javascripts/boards/components/board_card.js
+69
-0
app/assets/javascripts/boards/components/board_card.js.es6
app/assets/javascripts/boards/components/board_card.js.es6
+0
-61
app/assets/javascripts/boards/components/board_list.js.es6
app/assets/javascripts/boards/components/board_list.js.es6
+2
-2
app/views/projects/boards/_show.html.haml
app/views/projects/boards/_show.html.haml
+0
-1
app/views/projects/boards/components/_card.html.haml
app/views/projects/boards/components/_card.html.haml
+0
-10
spec/javascripts/boards/board_card_spec.js
spec/javascripts/boards/board_card_spec.js
+168
-0
No files found.
app/assets/javascripts/boards/components/board_card.js
0 → 100644
View file @
c49ee361
/* global Vue */
require
(
'
./issue_card_inner
'
);
const
Store
=
gl
.
issueBoards
.
BoardsStore
;
module
.
exports
=
{
name
:
'
BoardsIssueCard
'
,
template
:
`
<li class="card"
:class="{ 'user-can-drag': !disabled && issue.id, 'is-disabled': disabled || !issue.id, 'is-active': issueDetailVisible }"
:index="index"
:data-issue-id="issue.id"
@mousedown="mouseDown"
@mousemove="mouseMove"
@mouseup="showIssue($event)">
<issue-card-inner
:list="list"
:issue="issue"
:issue-link-base="issueLinkBase"
:root-path="rootPath" />
</li>
`
,
components
:
{
'
issue-card-inner
'
:
gl
.
issueBoards
.
IssueCardInner
,
},
props
:
{
list
:
Object
,
issue
:
Object
,
issueLinkBase
:
String
,
disabled
:
Boolean
,
index
:
Number
,
rootPath
:
String
,
},
data
()
{
return
{
showDetail
:
false
,
detailIssue
:
Store
.
detail
,
};
},
computed
:
{
issueDetailVisible
()
{
return
this
.
detailIssue
.
issue
&&
this
.
detailIssue
.
issue
.
id
===
this
.
issue
.
id
;
},
},
methods
:
{
mouseDown
()
{
this
.
showDetail
=
true
;
},
mouseMove
()
{
this
.
showDetail
=
false
;
},
showIssue
(
e
)
{
const
targetTagName
=
e
.
target
.
tagName
.
toLowerCase
();
if
(
targetTagName
===
'
a
'
||
targetTagName
===
'
button
'
)
return
;
if
(
this
.
showDetail
)
{
this
.
showDetail
=
false
;
if
(
Store
.
detail
.
issue
&&
Store
.
detail
.
issue
.
id
===
this
.
issue
.
id
)
{
Store
.
detail
.
issue
=
{};
}
else
{
Store
.
detail
.
issue
=
this
.
issue
;
Store
.
detail
.
list
=
this
.
list
;
}
}
},
},
};
app/assets/javascripts/boards/components/board_card.js.es6
deleted
100644 → 0
View file @
d6f18f8e
/* eslint-disable comma-dangle, space-before-function-paren, dot-notation */
/* global Vue */
require('./issue_card_inner');
(() => {
const Store = gl.issueBoards.BoardsStore;
window.gl = window.gl || {};
window.gl.issueBoards = window.gl.issueBoards || {};
gl.issueBoards.BoardCard = Vue.extend({
template: '#js-board-list-card',
components: {
'issue-card-inner': gl.issueBoards.IssueCardInner,
},
props: {
list: Object,
issue: Object,
issueLinkBase: String,
disabled: Boolean,
index: Number,
rootPath: String,
},
data () {
return {
showDetail: false,
detailIssue: Store.detail
};
},
computed: {
issueDetailVisible () {
return this.detailIssue.issue && this.detailIssue.issue.id === this.issue.id;
}
},
methods: {
mouseDown () {
this.showDetail = true;
},
mouseMove() {
this.showDetail = false;
},
showIssue (e) {
const targetTagName = e.target.tagName.toLowerCase();
if (targetTagName === 'a' || targetTagName === 'button') return;
if (this.showDetail) {
this.showDetail = false;
if (Store.detail.issue && Store.detail.issue.id === this.issue.id) {
Store.detail.issue = {};
} else {
Store.detail.issue = this.issue;
Store.detail.list = this.list;
}
}
}
}
});
})();
app/assets/javascripts/boards/components/board_list.js.es6
View file @
c49ee361
...
...
@@ -2,7 +2,7 @@
/* global Vue */
/* global Sortable */
require('./board_card');
const boardCard =
require('./board_card');
require('./board_new_issue');
(() => {
...
...
@@ -14,7 +14,7 @@ require('./board_new_issue');
gl.issueBoards.BoardList = Vue.extend({
template: '#js-board-list-template',
components: {
'board-card': gl.issueBoards.B
oardCard,
b
oardCard,
'board-new-issue': gl.issueBoards.BoardNewIssue
},
props: {
...
...
app/views/projects/boards/_show.html.haml
View file @
c49ee361
...
...
@@ -8,7 +8,6 @@
%script
#js-board-template
{
type:
"text/x-template"
}=
render
"projects/boards/components/board"
%script
#js-board-list-template
{
type:
"text/x-template"
}=
render
"projects/boards/components/board_list"
%script
#js-board-list-card
{
type:
"text/x-template"
}=
render
"projects/boards/components/card"
=
render
"projects/issues/head"
...
...
app/views/projects/boards/components/_card.html.haml
deleted
100644 → 0
View file @
d6f18f8e
%li
.card
{
":class"
=>
'
{
"user-can-drag"
:
!
disabled
&&
issue
.
id
,
"is-disabled"
:
disabled
||
!
issue
.
id
,
"is-active"
:
issueDetailVisible
}
'
,
":index"
=>
"index"
,
":data-issue-id"
=>
"issue.id"
,
"@mousedown"
=>
"mouseDown"
,
"@mousemove"
=>
"mouseMove"
,
"@mouseup"
=>
"showIssue($event)"
}
%issue-card-inner
{
":list"
=>
"list"
,
":issue"
=>
"issue"
,
":issue-link-base"
=>
"issueLinkBase"
,
":root-path"
=>
"rootPath"
}
spec/javascripts/boards/board_card_spec.js
0 → 100644
View file @
c49ee361
/* global Vue */
/* global List */
/* global ListLabel */
/* global listObj */
/* global boardsMockInterceptor */
/* global BoardService */
require
(
'
~/boards/models/list
'
);
require
(
'
~/boards/models/label
'
);
require
(
'
~/boards/stores/boards_store
'
);
const
boardCard
=
require
(
'
~/boards/components/board_card
'
);
require
(
'
./mock_data
'
);
describe
(
'
Issue card
'
,
()
=>
{
let
vm
;
beforeEach
((
done
)
=>
{
Vue
.
http
.
interceptors
.
push
(
boardsMockInterceptor
);
gl
.
boardService
=
new
BoardService
(
'
/test/issue-boards/board
'
,
''
,
'
1
'
);
gl
.
issueBoards
.
BoardsStore
.
create
();
gl
.
issueBoards
.
BoardsStore
.
detail
.
issue
=
{};
const
BoardCardComp
=
Vue
.
extend
(
boardCard
);
const
list
=
new
List
(
listObj
);
const
label1
=
new
ListLabel
({
id
:
3
,
title
:
'
testing 123
'
,
color
:
'
blue
'
,
text_color
:
'
white
'
,
description
:
'
test
'
,
});
setTimeout
(()
=>
{
list
.
issues
[
0
].
labels
.
push
(
label1
);
vm
=
new
BoardCardComp
({
propsData
:
{
list
,
issue
:
list
.
issues
[
0
],
issueLinkBase
:
'
/
'
,
disabled
:
false
,
index
:
0
,
rootPath
:
'
/
'
,
},
}).
$mount
();
done
();
},
0
);
});
afterEach
(()
=>
{
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
boardsMockInterceptor
);
});
it
(
'
returns false when detailIssue is empty
'
,
()
=>
{
expect
(
vm
.
issueDetailVisible
).
toBe
(
false
);
});
it
(
'
returns true when detailIssue is equal to card issue
'
,
()
=>
{
gl
.
issueBoards
.
BoardsStore
.
detail
.
issue
=
vm
.
issue
;
expect
(
vm
.
issueDetailVisible
).
toBe
(
true
);
});
it
(
'
adds user-can-drag class if not disabled
'
,
()
=>
{
expect
(
vm
.
$el
.
classList
.
contains
(
'
user-can-drag
'
)).
toBe
(
true
);
});
it
(
'
does not add user-can-drag class disabled
'
,
(
done
)
=>
{
vm
.
disabled
=
true
;
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
classList
.
contains
(
'
user-can-drag
'
)).
toBe
(
false
);
done
();
},
0
);
});
it
(
'
does not add disabled class
'
,
()
=>
{
expect
(
vm
.
$el
.
classList
.
contains
(
'
is-disabled
'
)).
toBe
(
false
);
});
it
(
'
adds disabled class is disabled is true
'
,
(
done
)
=>
{
vm
.
disabled
=
true
;
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
classList
.
contains
(
'
is-disabled
'
)).
toBe
(
true
);
done
();
},
0
);
});
describe
(
'
mouse events
'
,
()
=>
{
const
triggerEvent
=
(
eventName
,
el
=
vm
.
$el
)
=>
{
const
event
=
document
.
createEvent
(
'
MouseEvents
'
);
event
.
initMouseEvent
(
eventName
,
true
,
true
,
window
,
1
,
0
,
0
,
0
,
0
,
false
,
false
,
false
,
false
,
0
,
null
);
el
.
dispatchEvent
(
event
);
};
it
(
'
sets showDetail to true on mousedown
'
,
()
=>
{
triggerEvent
(
'
mousedown
'
);
expect
(
vm
.
showDetail
).
toBe
(
true
);
});
it
(
'
sets showDetail to false on mousemove
'
,
()
=>
{
triggerEvent
(
'
mousedown
'
);
expect
(
vm
.
showDetail
).
toBe
(
true
);
triggerEvent
(
'
mousemove
'
);
expect
(
vm
.
showDetail
).
toBe
(
false
);
});
it
(
'
does not set detail issue if showDetail is false
'
,
()
=>
{
expect
(
gl
.
issueBoards
.
BoardsStore
.
detail
.
issue
).
toEqual
({});
});
it
(
'
does not set detail issue if link is clicked
'
,
()
=>
{
triggerEvent
(
'
mouseup
'
,
vm
.
$el
.
querySelector
(
'
a
'
));
expect
(
gl
.
issueBoards
.
BoardsStore
.
detail
.
issue
).
toEqual
({});
});
it
(
'
does not set detail issue if button is clicked
'
,
()
=>
{
triggerEvent
(
'
mouseup
'
,
vm
.
$el
.
querySelector
(
'
button
'
));
expect
(
gl
.
issueBoards
.
BoardsStore
.
detail
.
issue
).
toEqual
({});
});
it
(
'
does not set detail issue if showDetail is false after mouseup
'
,
()
=>
{
triggerEvent
(
'
mouseup
'
);
expect
(
gl
.
issueBoards
.
BoardsStore
.
detail
.
issue
).
toEqual
({});
});
it
(
'
sets detail issue to card issue on mouse up
'
,
()
=>
{
triggerEvent
(
'
mousedown
'
);
triggerEvent
(
'
mouseup
'
);
expect
(
gl
.
issueBoards
.
BoardsStore
.
detail
.
issue
).
toEqual
(
vm
.
issue
);
expect
(
gl
.
issueBoards
.
BoardsStore
.
detail
.
list
).
toEqual
(
vm
.
list
);
});
it
(
'
adds active class if detail issue is set
'
,
(
done
)
=>
{
triggerEvent
(
'
mousedown
'
);
triggerEvent
(
'
mouseup
'
);
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
classList
.
contains
(
'
is-active
'
)).
toBe
(
true
);
done
();
},
0
);
});
it
(
'
resets detail issue to empty if already set
'
,
()
=>
{
triggerEvent
(
'
mousedown
'
);
triggerEvent
(
'
mouseup
'
);
expect
(
gl
.
issueBoards
.
BoardsStore
.
detail
.
issue
).
toEqual
(
vm
.
issue
);
triggerEvent
(
'
mousedown
'
);
triggerEvent
(
'
mouseup
'
);
expect
(
gl
.
issueBoards
.
BoardsStore
.
detail
.
issue
).
toEqual
({});
});
});
});
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