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
4b043492
Commit
4b043492
authored
May 25, 2021
by
Ezekiel Kigbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reset pagination when switching pages
parent
5342e061
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
11 deletions
+2
-11
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/store/actions.js
...ts/javascripts/analytics/cycle_analytics/store/actions.js
+1
-4
ee/spec/frontend/analytics/cycle_analytics/components/base_spec.js
...rontend/analytics/cycle_analytics/components/base_spec.js
+0
-4
ee/spec/frontend/analytics/cycle_analytics/store/actions_spec.js
.../frontend/analytics/cycle_analytics/store/actions_spec.js
+0
-2
No files found.
ee/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
View file @
4b043492
...
@@ -144,7 +144,7 @@ export default {
...
@@ -144,7 +144,7 @@ export default {
this
.
setDefaultSelectedStage
();
this
.
setDefaultSelectedStage
();
}
else
{
}
else
{
this
.
setSelectedStage
(
stage
);
this
.
setSelectedStage
(
stage
);
this
.
fetchStageData
(
stage
.
slug
);
this
.
updateStageTablePagination
({
...
this
.
pagination
,
page
:
1
}
);
}
}
},
},
onHandleUpdatePagination
(
data
)
{
onHandleUpdatePagination
(
data
)
{
...
...
ee/app/assets/javascripts/analytics/cycle_analytics/store/actions.js
View file @
4b043492
...
@@ -30,10 +30,7 @@ export const setFeatureFlags = ({ commit }, featureFlags) =>
...
@@ -30,10 +30,7 @@ export const setFeatureFlags = ({ commit }, featureFlags) =>
export
const
setSelectedProjects
=
({
commit
},
projects
)
=>
export
const
setSelectedProjects
=
({
commit
},
projects
)
=>
commit
(
types
.
SET_SELECTED_PROJECTS
,
projects
);
commit
(
types
.
SET_SELECTED_PROJECTS
,
projects
);
export
const
setSelectedStage
=
({
commit
,
getters
:
{
paginationParams
}
},
stage
)
=>
{
export
const
setSelectedStage
=
({
commit
},
stage
)
=>
commit
(
types
.
SET_SELECTED_STAGE
,
stage
);
commit
(
types
.
SET_SELECTED_STAGE
,
stage
);
commit
(
types
.
SET_PAGINATION
,
{
...
paginationParams
,
hasNextPage
:
null
});
};
export
const
setDateRange
=
(
export
const
setDateRange
=
(
{
commit
,
dispatch
,
getters
:
{
isOverviewStageSelected
},
state
:
{
selectedStage
}
},
{
commit
,
dispatch
,
getters
:
{
isOverviewStageSelected
},
state
:
{
selectedStage
}
},
...
...
ee/spec/frontend/analytics/cycle_analytics/components/base_spec.js
View file @
4b043492
...
@@ -11,10 +11,6 @@ import PathNavigation from 'ee/analytics/cycle_analytics/components/path_navigat
...
@@ -11,10 +11,6 @@ import PathNavigation from 'ee/analytics/cycle_analytics/components/path_navigat
import
StageTableNew
from
'
ee/analytics/cycle_analytics/components/stage_table_new.vue
'
;
import
StageTableNew
from
'
ee/analytics/cycle_analytics/components/stage_table_new.vue
'
;
import
TypeOfWorkCharts
from
'
ee/analytics/cycle_analytics/components/type_of_work_charts.vue
'
;
import
TypeOfWorkCharts
from
'
ee/analytics/cycle_analytics/components/type_of_work_charts.vue
'
;
import
ValueStreamSelect
from
'
ee/analytics/cycle_analytics/components/value_stream_select.vue
'
;
import
ValueStreamSelect
from
'
ee/analytics/cycle_analytics/components/value_stream_select.vue
'
;
import
{
PAGINATION_SORT_FIELD_END_EVENT
,
PAGINATION_SORT_DIRECTION_DESC
,
}
from
'
ee/analytics/cycle_analytics/constants
'
;
import
createStore
from
'
ee/analytics/cycle_analytics/store
'
;
import
createStore
from
'
ee/analytics/cycle_analytics/store
'
;
import
Daterange
from
'
ee/analytics/shared/components/daterange.vue
'
;
import
Daterange
from
'
ee/analytics/shared/components/daterange.vue
'
;
import
ProjectsDropdownFilter
from
'
ee/analytics/shared/components/projects_dropdown_filter.vue
'
;
import
ProjectsDropdownFilter
from
'
ee/analytics/shared/components/projects_dropdown_filter.vue
'
;
...
...
ee/spec/frontend/analytics/cycle_analytics/store/actions_spec.js
View file @
4b043492
...
@@ -92,12 +92,10 @@ describe('Value Stream Analytics actions', () => {
...
@@ -92,12 +92,10 @@ describe('Value Stream Analytics actions', () => {
describe
(
'
setSelectedStage
'
,
()
=>
{
describe
(
'
setSelectedStage
'
,
()
=>
{
const
data
=
{
id
:
'
someStageId
'
};
const
data
=
{
id
:
'
someStageId
'
};
const
payload
=
{
hasNextPage
:
null
};
it
(
`dispatches the
${
types
.
SET_SELECTED_STAGE
}
and
${
types
.
SET_PAGINATION
}
actions`
,
()
=>
{
it
(
`dispatches the
${
types
.
SET_SELECTED_STAGE
}
and
${
types
.
SET_PAGINATION
}
actions`
,
()
=>
{
return
testAction
(
actions
.
setSelectedStage
,
data
,
{
...
state
,
selectedValueStream
:
{}
},
[
return
testAction
(
actions
.
setSelectedStage
,
data
,
{
...
state
,
selectedValueStream
:
{}
},
[
{
type
:
types
.
SET_SELECTED_STAGE
,
payload
:
data
},
{
type
:
types
.
SET_SELECTED_STAGE
,
payload
:
data
},
{
type
:
types
.
SET_PAGINATION
,
payload
},
]);
]);
});
});
});
});
...
...
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