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
86047a24
Commit
86047a24
authored
Jul 05, 2021
by
wortschi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove productivity_analytics_scatterplot flag
Changelog: removed EE: true
parent
86da56a2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
82 deletions
+38
-82
ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue
...ripts/analytics/productivity_analytics/components/app.vue
+0
-10
ee/app/controllers/groups/analytics/productivity_analytics_controller.rb
...ers/groups/analytics/productivity_analytics_controller.rb
+0
-3
ee/config/feature_flags/development/productivity_analytics_scatterplot_enabled.yml
...evelopment/productivity_analytics_scatterplot_enabled.yml
+0
-8
ee/spec/frontend/analytics/productivity_analytics/components/app_spec.js
...d/analytics/productivity_analytics/components/app_spec.js
+38
-61
No files found.
ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue
View file @
86047a24
...
...
@@ -118,19 +118,12 @@ export default {
};
},
},
mounted
()
{
this
.
setChartEnabled
({
chartKey
:
chartKeys
.
scatterplot
,
isEnabled
:
this
.
isScatterplotFeatureEnabled
(),
});
},
methods
:
{
...
mapActions
(
'
charts
'
,
[
'
fetchChartData
'
,
'
setMetricType
'
,
'
updateSelectedItems
'
,
'
resetMainChartSelection
'
,
'
setChartEnabled
'
,
]),
...
mapActions
(
'
table
'
,
[
'
setSortField
'
,
'
setPage
'
,
'
toggleSortOrder
'
,
'
setColumnMetric
'
]),
onMainChartItemClicked
({
params
})
{
...
...
@@ -148,9 +141,6 @@ export default {
...
this
.
getColumnChartDatazoomOption
(
chartKey
),
};
},
isScatterplotFeatureEnabled
()
{
return
this
.
glFeatures
.
productivityAnalyticsScatterplotEnabled
;
},
},
};
</
script
>
...
...
ee/app/controllers/groups/analytics/productivity_analytics_controller.rb
View file @
86047a24
...
...
@@ -16,9 +16,6 @@ class Groups::Analytics::ProductivityAnalyticsController < Groups::Analytics::Ap
before_action
->
{
authorize_view_by_action!
(
:view_productivity_analytics
)
}
before_action
->
{
push_frontend_feature_flag
(
:productivity_analytics_scatterplot_enabled
,
default_enabled:
true
)
}
before_action
:validate_params
,
only: :show
,
if:
->
{
request
.
format
.
json?
}
...
...
ee/config/feature_flags/development/productivity_analytics_scatterplot_enabled.yml
deleted
100644 → 0
View file @
86da56a2
---
name
:
productivity_analytics_scatterplot_enabled
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17735
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/13412
milestone
:
'
12.4'
type
:
development
group
:
group::optimize
default_enabled
:
true
ee/spec/frontend/analytics/productivity_analytics/components/app_spec.js
View file @
86047a24
...
...
@@ -49,7 +49,7 @@ describe('ProductivityApp component', () => {
const
mainChartData
=
{
1
:
2
,
2
:
3
};
const
createComponent
=
({
props
=
{},
options
=
{}
,
scatterplotEnabled
=
true
}
=
{})
=>
{
const
createComponent
=
({
props
=
{},
options
=
{}
}
=
{})
=>
{
const
{
modules
:
{
charts
,
table
,
...
modules
},
...
storeConfig
...
...
@@ -82,9 +82,6 @@ describe('ProductivityApp component', () => {
...
propsData
,
...
props
,
},
provide
:
{
glFeatures
:
{
productivityAnalyticsScatterplotEnabled
:
scatterplotEnabled
},
},
...
options
,
});
...
...
@@ -330,11 +327,6 @@ describe('ProductivityApp component', () => {
});
describe
(
'
Scatterplot
'
,
()
=>
{
describe
(
'
when the feature flag is enabled
'
,
()
=>
{
it
(
'
isScatterplotFeatureEnabled returns true
'
,
()
=>
{
expect
(
wrapper
.
vm
.
isScatterplotFeatureEnabled
()).
toBe
(
true
);
});
it
(
'
renders a metric chart component
'
,
()
=>
{
expect
(
findScatterplotMetricChart
().
exists
()).
toBe
(
true
);
});
...
...
@@ -386,21 +378,6 @@ describe('ProductivityApp component', () => {
});
});
describe
(
'
when the feature flag is disabled
'
,
()
=>
{
beforeEach
(()
=>
{
createComponent
({
scatterplotEnabled
:
false
});
});
it
(
'
isScatterplotFeatureEnabled returns false
'
,
()
=>
{
expect
(
wrapper
.
vm
.
isScatterplotFeatureEnabled
()).
toBe
(
false
);
});
it
(
"
doesn't render a metric chart component
"
,
()
=>
{
expect
(
findScatterplotMetricChart
().
exists
()).
toBe
(
false
);
});
});
});
describe
(
'
MR table
'
,
()
=>
{
describe
(
'
when table is loading
'
,
()
=>
{
beforeEach
(()
=>
{
...
...
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