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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
5073e727
Commit
5073e727
authored
Aug 17, 2020
by
Martin Wortschack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address reviewer feedback
parent
9fc42a55
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
8 deletions
+4
-8
ee/app/assets/javascripts/analytics/productivity_analytics/components/metric_chart.vue
...lytics/productivity_analytics/components/metric_chart.vue
+1
-3
ee/changelogs/unreleased/235471-follow-up-from-improve-productivity-analytics-error-when-query-tak.yml
...m-improve-productivity-analytics-error-when-query-tak.yml
+0
-0
ee/spec/frontend/analytics/productivity_analytics/components/__snapshots__/metric_chart_spec.js.snap
...lytics/components/__snapshots__/metric_chart_spec.js.snap
+1
-3
ee/spec/frontend/analytics/productivity_analytics/components/metric_chart_spec.js
...cs/productivity_analytics/components/metric_chart_spec.js
+2
-2
No files found.
ee/app/assets/javascripts/analytics/productivity_analytics/components/metric_chart.vue
View file @
5073e727
...
...
@@ -89,9 +89,7 @@ export default {
<h5
v-if=
"title"
>
{{
title
}}
</h5>
<gl-loading-icon
v-if=
"isLoading"
size=
"md"
class=
"my-4 py-4"
/>
<template
v-else
>
<gl-alert
v-if=
"infoMessage"
:dismissible=
"false"
>
{{
infoMessage
}}
</gl-alert>
<gl-alert
v-if=
"infoMessage"
:dismissible=
"false"
>
{{
infoMessage
}}
</gl-alert>
<template
v-else
>
<gl-deprecated-dropdown
v-if=
"hasMetricTypes"
...
...
changelogs/unreleased/235471-follow-up-from-improve-productivity-analytics-error-when-query-tak.yml
→
ee/
changelogs/unreleased/235471-follow-up-from-improve-productivity-analytics-error-when-query-tak.yml
View file @
5073e727
File moved
ee/spec/frontend/analytics/productivity_analytics/components/__snapshots__/metric_chart_spec.js.snap
View file @
5073e727
...
...
@@ -13,9 +13,7 @@ exports[`MetricChart component template when isLoading is false and chart data i
title=""
variant="info"
>
There is no data available. Please change your selection.
There is no data available. Please change your selection.
</gl-alert-stub>
</div>
`;
...
...
ee/spec/frontend/analytics/productivity_analytics/components/metric_chart_spec.js
View file @
5073e727
...
...
@@ -101,7 +101,7 @@ describe('MetricChart component', () => {
describe
(
'
and there is no error
'
,
()
=>
{
it
(
'
shows a "no data" info text
'
,
()
=>
{
expect
(
findInfoMessage
().
text
()).
to
Contain
(
expect
(
findInfoMessage
().
text
()).
to
Be
(
'
There is no data available. Please change your selection.
'
,
);
});
...
...
@@ -111,7 +111,7 @@ describe('MetricChart component', () => {
it
(
'
shows a "too much data" info text
'
,
()
=>
{
factory
({
isLoading
,
chartData
:
[],
errorCode
:
httpStatusCodes
.
INTERNAL_SERVER_ERROR
});
expect
(
findInfoMessage
().
text
()).
to
Contain
(
expect
(
findInfoMessage
().
text
()).
to
Be
(
'
There is too much data to calculate. Please change your selection.
'
,
);
});
...
...
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