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
2099e33b
Commit
2099e33b
authored
Jan 14, 2020
by
Ezekiel Kigbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix minor review comments
parent
35b7fd7c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
ee/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
...javascripts/analytics/cycle_analytics/components/base.vue
+1
-1
ee/app/assets/javascripts/analytics/cycle_analytics/components/tasks_by_type_chart.vue
...lytics/cycle_analytics/components/tasks_by_type_chart.vue
+1
-1
ee/spec/features/analytics/cycle_analytics/cycle_analytics_spec.rb
...eatures/analytics/cycle_analytics/cycle_analytics_spec.rb
+1
-1
ee/spec/frontend/analytics/cycle_analytics/components/base_spec.js
...rontend/analytics/cycle_analytics/components/base_spec.js
+2
-2
No files found.
ee/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
View file @
2099e33b
...
@@ -317,7 +317,7 @@ export default {
...
@@ -317,7 +317,7 @@ export default {
<gl-loading-icon
v-else-if=
"!isLoading"
size=
"md"
class=
"my-4 py-4"
/>
<gl-loading-icon
v-else-if=
"!isLoading"
size=
"md"
class=
"my-4 py-4"
/>
</template>
</template>
<
template
v-if=
"featureFlags.hasTasksByTypeChart"
>
<
template
v-if=
"featureFlags.hasTasksByTypeChart"
>
<div
class=
"tasks-by-type-chart"
>
<div
class=
"
js-
tasks-by-type-chart"
>
<div
v-if=
"shouldDisplayTasksByTypeChart"
>
<div
v-if=
"shouldDisplayTasksByTypeChart"
>
<tasks-by-type-chart
<tasks-by-type-chart
:chart-data=
"tasksByTypeChartData"
:chart-data=
"tasksByTypeChartData"
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/components/tasks_by_type_chart.vue
View file @
2099e33b
...
@@ -20,7 +20,7 @@ export default {
...
@@ -20,7 +20,7 @@ export default {
},
},
computed
:
{
computed
:
{
hasData
()
{
hasData
()
{
return
this
.
chartData
&&
this
.
chartData
.
data
&&
this
.
chartData
.
data
.
length
;
return
Boolean
(
this
.
chartData
?.
data
?.
length
)
;
},
},
selectedFiltersText
()
{
selectedFiltersText
()
{
const
{
subject
,
selectedLabelIds
}
=
this
.
filters
;
const
{
subject
,
selectedLabelIds
}
=
this
.
filters
;
...
...
ee/spec/features/analytics/cycle_analytics/cycle_analytics_spec.rb
View file @
2099e33b
...
@@ -274,7 +274,7 @@ describe 'Group Cycle Analytics', :js do
...
@@ -274,7 +274,7 @@ describe 'Group Cycle Analytics', :js do
end
end
it
'will not display the tasks by type chart'
do
it
'will not display the tasks by type chart'
do
expect
(
page
).
not_to
have_selector
(
'.tasks-by-type-chart'
)
expect
(
page
).
not_to
have_selector
(
'.
js-
tasks-by-type-chart'
)
expect
(
page
).
not_to
have_text
(
'Tasks by type'
)
expect
(
page
).
not_to
have_text
(
'Tasks by type'
)
end
end
...
...
ee/spec/frontend/analytics/cycle_analytics/components/base_spec.js
View file @
2099e33b
...
@@ -366,7 +366,7 @@ describe('Cycle Analytics component', () => {
...
@@ -366,7 +366,7 @@ describe('Cycle Analytics component', () => {
mock
.
restore
();
mock
.
restore
();
});
});
it
(
'
displays the tasks by type chart
'
,
()
=>
{
it
(
'
displays the tasks by type chart
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
.tasks-by-type-chart
'
).
exists
()).
toBe
(
true
);
expect
(
wrapper
.
find
(
'
.
js-
tasks-by-type-chart
'
).
exists
()).
toBe
(
true
);
});
});
});
});
...
@@ -390,7 +390,7 @@ describe('Cycle Analytics component', () => {
...
@@ -390,7 +390,7 @@ describe('Cycle Analytics component', () => {
});
});
it
(
'
does not render the tasks by type chart
'
,
()
=>
{
it
(
'
does not render the tasks by type chart
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
.tasks-by-type-chart
'
).
exists
()).
toBe
(
false
);
expect
(
wrapper
.
find
(
'
.
js-
tasks-by-type-chart
'
).
exists
()).
toBe
(
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