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
cfd75921
Commit
cfd75921
authored
Mar 23, 2017
by
Sam Rose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add event limit warning all tabs Cycle Analytics
parent
a634e53a
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
65 additions
and
6 deletions
+65
-6
app/assets/javascripts/cycle_analytics/components/limit_warning_component.js
...pts/cycle_analytics/components/limit_warning_component.js
+17
-0
app/assets/javascripts/cycle_analytics/components/stage_code_component.js
...cripts/cycle_analytics/components/stage_code_component.js
+1
-0
app/assets/javascripts/cycle_analytics/components/stage_issue_component.js
...ripts/cycle_analytics/components/stage_issue_component.js
+1
-0
app/assets/javascripts/cycle_analytics/components/stage_plan_component.js
...cripts/cycle_analytics/components/stage_plan_component.js
+1
-6
app/assets/javascripts/cycle_analytics/components/stage_production_component.js
.../cycle_analytics/components/stage_production_component.js
+1
-0
app/assets/javascripts/cycle_analytics/components/stage_review_component.js
...ipts/cycle_analytics/components/stage_review_component.js
+1
-0
app/assets/javascripts/cycle_analytics/components/stage_staging_component.js
...pts/cycle_analytics/components/stage_staging_component.js
+1
-0
app/assets/javascripts/cycle_analytics/components/stage_test_component.js
...cripts/cycle_analytics/components/stage_test_component.js
+1
-0
app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js
...ets/javascripts/cycle_analytics/cycle_analytics_bundle.js
+2
-0
spec/javascripts/cycle_analytics/limit_warning_component_spec.js
...vascripts/cycle_analytics/limit_warning_component_spec.js
+39
-0
No files found.
app/assets/javascripts/cycle_analytics/components/limit_warning_component.js
0 → 100644
View file @
cfd75921
export
default
{
props
:
{
count
:
{
type
:
Number
,
required
:
true
,
},
},
template
:
`
<span v-if="count === 50" class="events-info pull-right">
<i class="fa fa-warning has-tooltip"
aria-hidden="true"
title="Limited to showing 50 events at most"
data-placement="top"></i>
Showing 50 events
</span>
`
,
};
app/assets/javascripts/cycle_analytics/components/stage_code_component.js
View file @
cfd75921
...
@@ -14,6 +14,7 @@ import Vue from 'vue';
...
@@ -14,6 +14,7 @@ import Vue from 'vue';
<div>
<div>
<div class="events-description">
<div class="events-description">
{{ stage.description }}
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
</div>
<ul class="stage-event-list">
<ul class="stage-event-list">
<li v-for="mergeRequest in items" class="stage-event-item">
<li v-for="mergeRequest in items" class="stage-event-item">
...
...
app/assets/javascripts/cycle_analytics/components/stage_issue_component.js
View file @
cfd75921
...
@@ -14,6 +14,7 @@ import Vue from 'vue';
...
@@ -14,6 +14,7 @@ import Vue from 'vue';
<div>
<div>
<div class="events-description">
<div class="events-description">
{{ stage.description }}
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
</div>
<ul class="stage-event-list">
<ul class="stage-event-list">
<li v-for="issue in items" class="stage-event-item">
<li v-for="issue in items" class="stage-event-item">
...
...
app/assets/javascripts/cycle_analytics/components/stage_plan_component.js
View file @
cfd75921
...
@@ -19,12 +19,7 @@ import iconCommit from '../svg/icon_commit.svg';
...
@@ -19,12 +19,7 @@ import iconCommit from '../svg/icon_commit.svg';
<div>
<div>
<div class="events-description">
<div class="events-description">
{{ stage.description }}
{{ stage.description }}
<span v-if="items.length === 50" class="events-info pull-right">
<limit-warning :count="items.length" />
<i class="fa fa-warning has-tooltip"
title="Limited to showing 50 events at most"
data-placement="top"></i>
Showing 50 events
</span>
</div>
</div>
<ul class="stage-event-list">
<ul class="stage-event-list">
<li v-for="commit in items" class="stage-event-item">
<li v-for="commit in items" class="stage-event-item">
...
...
app/assets/javascripts/cycle_analytics/components/stage_production_component.js
View file @
cfd75921
...
@@ -14,6 +14,7 @@ import Vue from 'vue';
...
@@ -14,6 +14,7 @@ import Vue from 'vue';
<div>
<div>
<div class="events-description">
<div class="events-description">
{{ stage.description }}
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
</div>
<ul class="stage-event-list">
<ul class="stage-event-list">
<li v-for="issue in items" class="stage-event-item">
<li v-for="issue in items" class="stage-event-item">
...
...
app/assets/javascripts/cycle_analytics/components/stage_review_component.js
View file @
cfd75921
...
@@ -14,6 +14,7 @@ import Vue from 'vue';
...
@@ -14,6 +14,7 @@ import Vue from 'vue';
<div>
<div>
<div class="events-description">
<div class="events-description">
{{ stage.description }}
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
</div>
<ul class="stage-event-list">
<ul class="stage-event-list">
<li v-for="mergeRequest in items" class="stage-event-item">
<li v-for="mergeRequest in items" class="stage-event-item">
...
...
app/assets/javascripts/cycle_analytics/components/stage_staging_component.js
View file @
cfd75921
...
@@ -17,6 +17,7 @@ import iconBranch from '../svg/icon_branch.svg';
...
@@ -17,6 +17,7 @@ import iconBranch from '../svg/icon_branch.svg';
<div>
<div>
<div class="events-description">
<div class="events-description">
{{ stage.description }}
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
</div>
<ul class="stage-event-list">
<ul class="stage-event-list">
<li v-for="build in items" class="stage-event-item item-build-component">
<li v-for="build in items" class="stage-event-item item-build-component">
...
...
app/assets/javascripts/cycle_analytics/components/stage_test_component.js
View file @
cfd75921
...
@@ -18,6 +18,7 @@ import iconBranch from '../svg/icon_branch.svg';
...
@@ -18,6 +18,7 @@ import iconBranch from '../svg/icon_branch.svg';
<div>
<div>
<div class="events-description">
<div class="events-description">
{{ stage.description }}
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
</div>
<ul class="stage-event-list">
<ul class="stage-event-list">
<li v-for="build in items" class="stage-event-item item-build-component">
<li v-for="build in items" class="stage-event-item item-build-component">
...
...
app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js
View file @
cfd75921
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
Cookies
from
'
js-cookie
'
;
import
Cookies
from
'
js-cookie
'
;
import
LimitWarningComponent
from
'
./components/limit_warning_component
'
;
require
(
'
./components/stage_code_component
'
);
require
(
'
./components/stage_code_component
'
);
require
(
'
./components/stage_issue_component
'
);
require
(
'
./components/stage_issue_component
'
);
...
@@ -130,5 +131,6 @@ $(() => {
...
@@ -130,5 +131,6 @@ $(() => {
});
});
// Register global components
// Register global components
Vue
.
component
(
'
limit-warning
'
,
LimitWarningComponent
);
Vue
.
component
(
'
total-time
'
,
gl
.
cycleAnalytics
.
TotalTimeComponent
);
Vue
.
component
(
'
total-time
'
,
gl
.
cycleAnalytics
.
TotalTimeComponent
);
});
});
spec/javascripts/cycle_analytics/limit_warning_component_spec.js
0 → 100644
View file @
cfd75921
import
Vue
from
'
vue
'
;
import
limitWarningComp
from
'
~/cycle_analytics/components/limit_warning_component
'
;
describe
(
'
Limit warning component
'
,
()
=>
{
let
component
;
let
LimitWarningComponent
;
beforeEach
(()
=>
{
LimitWarningComponent
=
Vue
.
extend
(
limitWarningComp
);
});
it
(
'
should not render if count is not exactly than 50
'
,
()
=>
{
component
=
new
LimitWarningComponent
({
propsData
:
{
count
:
5
,
},
}).
$mount
();
expect
(
component
.
$el
.
textContent
.
trim
()).
toBe
(
''
);
component
=
new
LimitWarningComponent
({
propsData
:
{
count
:
55
,
},
}).
$mount
();
expect
(
component
.
$el
.
textContent
.
trim
()).
toBe
(
''
);
});
it
(
'
should render if count is exactly 50
'
,
()
=>
{
component
=
new
LimitWarningComponent
({
propsData
:
{
count
:
50
,
},
}).
$mount
();
expect
(
component
.
$el
.
textContent
.
trim
()).
toBe
(
'
Showing 50 events
'
);
});
});
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