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
Jérome Perrin
gitlab-ce
Commits
1ac15de9
Commit
1ac15de9
authored
Apr 26, 2017
by
Filipa Lacerda
Committed by
Phil Hughes
Apr 26, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Jobs dropdown in mini graph should close when we receive an error"
parent
d71d09e8
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
114 additions
and
64 deletions
+114
-64
app/assets/javascripts/mini_pipeline_graph_dropdown.js
app/assets/javascripts/mini_pipeline_graph_dropdown.js
+6
-1
app/assets/javascripts/pipelines/components/stage.js
app/assets/javascripts/pipelines/components/stage.js
+33
-16
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+0
-1
spec/javascripts/mini_pipeline_graph_dropdown_spec.js
spec/javascripts/mini_pipeline_graph_dropdown_spec.js
+60
-46
spec/javascripts/pipelines/stage_spec.js
spec/javascripts/pipelines/stage_spec.js
+15
-0
No files found.
app/assets/javascripts/mini_pipeline_graph_dropdown.js
View file @
1ac15de9
...
...
@@ -28,7 +28,9 @@ export default class MiniPipelineGraph {
* All dropdown events are fired at the .dropdown-menu's parent element.
*/
bindEvents
()
{
$
(
document
).
off
(
'
shown.bs.dropdown
'
,
this
.
container
).
on
(
'
shown.bs.dropdown
'
,
this
.
container
,
this
.
getBuildsList
);
$
(
document
)
.
off
(
'
shown.bs.dropdown
'
,
this
.
container
)
.
on
(
'
shown.bs.dropdown
'
,
this
.
container
,
this
.
getBuildsList
);
}
/**
...
...
@@ -91,6 +93,9 @@ export default class MiniPipelineGraph {
},
error
:
()
=>
{
this
.
toggleLoading
(
button
);
if
(
$
(
button
).
parent
().
hasClass
(
'
open
'
))
{
$
(
button
).
dropdown
(
'
toggle
'
);
}
new
Flash
(
'
An error occurred while fetching the builds.
'
,
'
alert
'
);
},
});
...
...
app/assets/javascripts/pipelines/components/stage.js
View file @
1ac15de9
...
...
@@ -2,13 +2,6 @@
import
StatusIconEntityMap
from
'
../../ci_status_icons
'
;
export
default
{
data
()
{
return
{
builds
:
''
,
spinner
:
'
<span class="fa fa-spinner fa-spin"></span>
'
,
};
},
props
:
{
stage
:
{
type
:
Object
,
...
...
@@ -16,6 +9,13 @@ export default {
},
},
data
()
{
return
{
builds
:
''
,
spinner
:
'
<span class="fa fa-spinner fa-spin"></span>
'
,
};
},
updated
()
{
if
(
this
.
builds
)
{
this
.
stopDropdownClickPropagation
();
...
...
@@ -31,7 +31,13 @@ export default {
return
this
.
$http
.
get
(
this
.
stage
.
dropdown_path
)
.
then
((
response
)
=>
{
this
.
builds
=
JSON
.
parse
(
response
.
body
).
html
;
},
()
=>
{
})
.
catch
(()
=>
{
// If dropdown is opened we'll close it.
if
(
this
.
$el
.
classList
.
contains
(
'
open
'
))
{
$
(
this
.
$refs
.
dropdown
).
dropdown
(
'
toggle
'
);
}
const
flash
=
new
Flash
(
'
Something went wrong on our end.
'
);
return
flash
;
});
...
...
@@ -46,7 +52,8 @@ export default {
* target the click event of this component.
*/
stopDropdownClickPropagation
()
{
$
(
this
.
$el
.
querySelectorAll
(
'
.js-builds-dropdown-list a.mini-pipeline-graph-dropdown-item
'
)).
on
(
'
click
'
,
(
e
)
=>
{
$
(
this
.
$el
.
querySelectorAll
(
'
.js-builds-dropdown-list a.mini-pipeline-graph-dropdown-item
'
))
.
on
(
'
click
'
,
(
e
)
=>
{
e
.
stopPropagation
();
});
},
...
...
@@ -81,12 +88,22 @@ export default {
data-placement="top"
data-toggle="dropdown"
type="button"
:aria-label="stage.title">
<span v-html="svgHTML" aria-hidden="true"></span>
<i class="fa fa-caret-down" aria-hidden="true"></i>
:aria-label="stage.title"
ref="dropdown">
<span
v-html="svgHTML"
aria-hidden="true">
</span>
<i
class="fa fa-caret-down"
aria-hidden="true" />
</button>
<ul class="dropdown-menu mini-pipeline-graph-dropdown-menu js-builds-dropdown-container">
<div class="arrow-up" aria-hidden="true"></div>
<ul
ref="dropdown-content"
class="dropdown-menu mini-pipeline-graph-dropdown-menu js-builds-dropdown-container">
<div
class="arrow-up"
aria-hidden="true"></div>
<div
:class="dropdownClass"
class="js-builds-dropdown-list scrollable-menu"
...
...
app/assets/stylesheets/framework/dropdowns.scss
View file @
1ac15de9
...
...
@@ -195,7 +195,6 @@
border
:
1px
solid
$dropdown-border-color
;
border-radius
:
$border-radius-base
;
box-shadow
:
0
2px
4px
$dropdown-shadow-color
;
overflow
:
hidden
;
@include
set-invisible
;
@media
(
max-width
:
$screen-sm-min
)
{
...
...
spec/javascripts/mini_pipeline_graph_dropdown_spec.js
View file @
1ac15de9
...
...
@@ -3,8 +3,7 @@
import
MiniPipelineGraph
from
'
~/mini_pipeline_graph_dropdown
'
;
import
'
~/flash
'
;
(()
=>
{
describe
(
'
Mini Pipeline Graph Dropdown
'
,
()
=>
{
describe
(
'
Mini Pipeline Graph Dropdown
'
,
()
=>
{
preloadFixtures
(
'
static/mini_dropdown_graph.html.raw
'
);
beforeEach
(()
=>
{
...
...
@@ -29,7 +28,10 @@ import '~/flash';
describe
(
'
When dropdown is clicked
'
,
()
=>
{
it
(
'
should call getBuildsList
'
,
()
=>
{
const
getBuildsListSpy
=
spyOn
(
MiniPipelineGraph
.
prototype
,
'
getBuildsList
'
).
and
.
callFake
(
function
()
{});
const
getBuildsListSpy
=
spyOn
(
MiniPipelineGraph
.
prototype
,
'
getBuildsList
'
,
).
and
.
callFake
(
function
()
{});
new
MiniPipelineGraph
({
container
:
'
.js-builds-dropdown-tests
'
}).
bindEvents
();
...
...
@@ -68,5 +70,17 @@ import '~/flash';
expect
(
$
(
'
.js-builds-dropdown-list
'
).
is
(
'
:visible
'
)).
toEqual
(
true
);
});
});
it
(
'
should close the dropdown when request returns an error
'
,
(
done
)
=>
{
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
options
=>
options
.
error
());
new
MiniPipelineGraph
({
container
:
'
.js-builds-dropdown-tests
'
}).
bindEvents
();
document
.
querySelector
(
'
.js-builds-dropdown-button
'
).
click
();
setTimeout
(()
=>
{
expect
(
$
(
'
.js-builds-dropdown-tests .dropdown
'
).
hasClass
(
'
open
'
)).
toEqual
(
false
);
done
();
},
0
);
});
})
()
;
});
spec/javascripts/pipelines/stage_spec.js
View file @
1ac15de9
...
...
@@ -63,4 +63,19 @@ describe('Pipelines Stage', () => {
expect
(
minifiedComponent
).
toContain
(
expectedSVG
);
});
});
describe
(
'
when request fails
'
,
()
=>
{
it
(
'
closes dropdown
'
,
()
=>
{
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
options
=>
options
.
error
());
const
StageComponent
=
Vue
.
extend
(
Stage
);
const
component
=
new
StageComponent
({
propsData
:
{
stage
:
{
status
:
{
icon
:
'
foo
'
}
}
},
}).
$mount
();
expect
(
component
.
$el
.
classList
.
contains
(
'
open
'
),
).
toEqual
(
false
);
});
});
});
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