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
97de1a42
Commit
97de1a42
authored
Sep 16, 2020
by
Veethika Mishra
Committed by
Natalia Tepluhina
Sep 16, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrating deprecated button on the Productivity Analysis page
parent
bf386c7a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
12 deletions
+8
-12
ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue
...ripts/analytics/productivity_analytics/components/app.vue
+6
-10
ee/spec/frontend/analytics/productivity_analytics/components/app_spec.js
...d/analytics/productivity_analytics/components/app_spec.js
+2
-2
No files found.
ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue
View file @
97de1a42
...
...
@@ -5,7 +5,7 @@ import {
GlLoadingIcon
,
GlDeprecatedDropdown
,
GlDeprecatedDropdownItem
,
Gl
Deprecated
Button
,
GlButton
,
GlTooltipDirective
,
GlIcon
,
}
from
'
@gitlab/ui
'
;
...
...
@@ -27,7 +27,7 @@ export default {
GlDeprecatedDropdown
,
GlDeprecatedDropdownItem
,
GlColumnChart
,
Gl
Deprecated
Button
,
GlButton
,
GlIcon
,
MetricChart
,
Scatterplot
,
...
...
@@ -182,14 +182,14 @@ export default {
<template
v-if=
"showAppContent"
>
<div
class=
"d-flex justify-content-between"
>
<h4>
{{
s__
(
'
ProductivityAnalytics|Merge Requests
'
)
}}
</h4>
<gl-
deprecated-
button
<gl-button
v-if=
"isFilteringByDaysToMerge"
ref=
"clearChartFiltersBtn"
class=
"btn-link float-right"
type=
"button"
variant=
"default"
@
click=
"resetMainChartSelection()"
>
{{
__
(
'
Clear chart filters
'
)
}}
</gl-
deprecated-
button
>
{{
__
(
'
Clear chart filters
'
)
}}
</gl-button
>
</div>
<metric-chart
...
...
@@ -324,13 +324,9 @@ export default {
</span>
</gl-deprecated-dropdown-item>
</gl-deprecated-dropdown>
<gl-deprecated-button
v-gl-tooltip
.
hover
:title=
"sortTooltipTitle"
@
click=
"toggleSortOrder"
>
<gl-button
v-gl-tooltip
.
hover
:title=
"sortTooltipTitle"
@
click=
"toggleSortOrder"
>
<gl-icon
:name=
"sortIcon"
/>
</gl-
deprecated-
button>
</gl-button>
</div>
</div>
</div>
...
...
ee/spec/frontend/analytics/productivity_analytics/components/app_spec.js
View file @
97de1a42
...
...
@@ -13,7 +13,7 @@ import {
GlLoadingIcon
,
GlDeprecatedDropdown
,
GlDeprecatedDropdownItem
,
Gl
Deprecated
Button
,
GlButton
,
}
from
'
@gitlab/ui
'
;
import
{
GlColumnChart
}
from
'
@gitlab/ui/dist/charts
'
;
import
UrlSyncMixin
from
'
ee/analytics/shared/mixins/url_sync_mixin
'
;
...
...
@@ -108,7 +108,7 @@ describe('ProductivityApp component', () => {
const
findScatterplotMetricChart
=
()
=>
wrapper
.
find
({
ref
:
'
scatterplot
'
});
const
findMrTableSortSection
=
()
=>
wrapper
.
find
(
'
.js-mr-table-sort
'
);
const
findSortFieldDropdown
=
()
=>
findMrTableSortSection
().
find
(
GlDeprecatedDropdown
);
const
findSortOrderToggle
=
()
=>
findMrTableSortSection
().
find
(
Gl
Deprecated
Button
);
const
findSortOrderToggle
=
()
=>
findMrTableSortSection
().
find
(
GlButton
);
const
findMrTableSection
=
()
=>
wrapper
.
find
(
'
.js-mr-table
'
);
const
findMrTable
=
()
=>
findMrTableSection
().
find
(
MergeRequestTable
);
...
...
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