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
42c6f634
Commit
42c6f634
authored
Sep 17, 2019
by
Adam Hegyi
Committed by
Kushal Pandya
Sep 17, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Rename author_username to author_id"
This reverts commit
98ab3a2a
.
parent
553cf378
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
ee/app/assets/javascripts/analytics/productivity_analytics/store/modules/filters/getters.js
...s/productivity_analytics/store/modules/filters/getters.js
+2
-4
ee/spec/frontend/analytics/productivity_analytics/store/modules/filters/getters_spec.js
...ductivity_analytics/store/modules/filters/getters_spec.js
+1
-1
No files found.
ee/app/assets/javascripts/analytics/productivity_analytics/store/modules/filters/getters.js
View file @
42c6f634
...
@@ -8,7 +8,7 @@ import { urlParamsToObject } from '~/lib/utils/common_utils';
...
@@ -8,7 +8,7 @@ import { urlParamsToObject } from '~/lib/utils/common_utils';
* {
* {
* group_id: 'gitlab-org',
* group_id: 'gitlab-org',
* project_id: 'gitlab-org/gitlab-test',
* project_id: 'gitlab-org/gitlab-test',
* author_
id
: 'author',
* author_
username
: 'author',
* milestone_title: 'my milestone',
* milestone_title: 'my milestone',
* label_name: ['my label', 'yet another label'],
* label_name: ['my label', 'yet another label'],
* merged_at_after: '2019-05-09T16:20:18.393Z'
* merged_at_after: '2019-05-09T16:20:18.393Z'
...
@@ -22,9 +22,7 @@ export const getCommonFilterParams = (state, getters) => {
...
@@ -22,9 +22,7 @@ export const getCommonFilterParams = (state, getters) => {
return
{
return
{
group_id
:
groupNamespace
,
group_id
:
groupNamespace
,
project_id
:
projectPath
,
project_id
:
projectPath
,
// The productivity analytics endpoint accepts an "author_id", however we get "author_username" from the filtered search
author_username
,
// As a result, we need to map the two values here.
author_id
:
author_username
,
milestone_title
,
milestone_title
,
label_name
,
label_name
,
merged_at_after
:
getters
.
mergedOnAfterDate
,
merged_at_after
:
getters
.
mergedOnAfterDate
,
...
...
ee/spec/frontend/analytics/productivity_analytics/store/modules/filters/getters_spec.js
View file @
42c6f634
...
@@ -18,7 +18,7 @@ describe('Productivity analytics filter getters', () => {
...
@@ -18,7 +18,7 @@ describe('Productivity analytics filter getters', () => {
const
mockGetters
=
{
mergedOnAfterDate
:
'
2019-07-16T00:00:00.00Z
'
};
const
mockGetters
=
{
mergedOnAfterDate
:
'
2019-07-16T00:00:00.00Z
'
};
const
expected
=
{
const
expected
=
{
author_
id
:
'
root
'
,
author_
username
:
'
root
'
,
group_id
:
'
gitlab-org
'
,
group_id
:
'
gitlab-org
'
,
label_name
:
[
'
labelxyz
'
],
label_name
:
[
'
labelxyz
'
],
merged_at_after
:
'
2019-07-16T00:00:00.00Z
'
,
merged_at_after
:
'
2019-07-16T00:00:00.00Z
'
,
...
...
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