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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
87444fb6
Commit
87444fb6
authored
Oct 30, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds pagination to pipelines table in merge request page
parent
fc892db6
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
98 additions
and
42 deletions
+98
-42
app/assets/javascripts/commit/pipelines/pipelines_table.vue
app/assets/javascripts/commit/pipelines/pipelines_table.vue
+18
-1
app/assets/javascripts/pipelines/components/pipelines.vue
app/assets/javascripts/pipelines/components/pipelines.vue
+0
-38
app/assets/javascripts/pipelines/mixins/pipelines.js
app/assets/javascripts/pipelines/mixins/pipelines.js
+38
-0
app/assets/javascripts/vue_shared/mixins/ci_pagination_api_mixin.js
.../javascripts/vue_shared/mixins/ci_pagination_api_mixin.js
+8
-1
app/controllers/projects/commit_controller.rb
app/controllers/projects/commit_controller.rb
+2
-1
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+2
-1
changelogs/unreleased/28249-add-pagination.yml
changelogs/unreleased/28249-add-pagination.yml
+5
-0
spec/controllers/projects/commit_controller_spec.rb
spec/controllers/projects/commit_controller_spec.rb
+1
-0
spec/controllers/projects/merge_requests_controller_spec.rb
spec/controllers/projects/merge_requests_controller_spec.rb
+1
-0
spec/javascripts/commit/pipelines/pipelines_spec.js
spec/javascripts/commit/pipelines/pipelines_spec.js
+23
-0
No files found.
app/assets/javascripts/commit/pipelines/pipelines_table.vue
View file @
87444fb6
...
@@ -2,9 +2,15 @@
...
@@ -2,9 +2,15 @@
import
PipelinesService
from
'
../../pipelines/services/pipelines_service
'
;
import
PipelinesService
from
'
../../pipelines/services/pipelines_service
'
;
import
PipelineStore
from
'
../../pipelines/stores/pipelines_store
'
;
import
PipelineStore
from
'
../../pipelines/stores/pipelines_store
'
;
import
pipelinesMixin
from
'
../../pipelines/mixins/pipelines
'
;
import
pipelinesMixin
from
'
../../pipelines/mixins/pipelines
'
;
import
TablePagination
from
'
../../vue_shared/components/table_pagination.vue
'
;
import
{
getParameterByName
}
from
'
../../lib/utils/common_utils
'
;
import
CIPaginationMixin
from
'
../../vue_shared/mixins/ci_pagination_api_mixin
'
;
export
default
{
export
default
{
mixins
:
[
pipelinesMixin
],
components
:
{
TablePagination
,
},
mixins
:
[
pipelinesMixin
,
CIPaginationMixin
],
props
:
{
props
:
{
endpoint
:
{
endpoint
:
{
type
:
String
,
type
:
String
,
...
@@ -35,6 +41,8 @@ export default {
...
@@ -35,6 +41,8 @@ export default {
return
{
return
{
store
,
store
,
state
:
store
.
state
,
state
:
store
.
state
,
page
:
getParameterByName
(
'
page
'
)
||
'
1
'
,
requestData
:
{},
};
};
},
},
...
@@ -48,11 +56,14 @@ export default {
...
@@ -48,11 +56,14 @@ export default {
},
},
created
()
{
created
()
{
this
.
service
=
new
PipelinesService
(
this
.
endpoint
);
this
.
service
=
new
PipelinesService
(
this
.
endpoint
);
this
.
requestData
=
{
page
:
this
.
page
};
},
},
methods
:
{
methods
:
{
successCallback
(
resp
)
{
successCallback
(
resp
)
{
// depending of the endpoint the response can either bring a `pipelines` key or not.
// depending of the endpoint the response can either bring a `pipelines` key or not.
const
pipelines
=
resp
.
data
.
pipelines
||
resp
.
data
;
const
pipelines
=
resp
.
data
.
pipelines
||
resp
.
data
;
this
.
store
.
storePagination
(
resp
.
headers
);
this
.
setCommonData
(
pipelines
);
this
.
setCommonData
(
pipelines
);
const
updatePipelinesEvent
=
new
CustomEvent
(
'
update-pipelines-count
'
,
{
const
updatePipelinesEvent
=
new
CustomEvent
(
'
update-pipelines-count
'
,
{
...
@@ -97,5 +108,11 @@ export default {
...
@@ -97,5 +108,11 @@ export default {
:view-type=
"viewType"
:view-type=
"viewType"
/>
/>
</div>
</div>
<table-pagination
v-if=
"shouldRenderPagination"
:change=
"onChangePage"
:page-info=
"state.pageInfo"
/>
</div>
</div>
</
template
>
</
template
>
app/assets/javascripts/pipelines/components/pipelines.vue
View file @
87444fb6
...
@@ -155,14 +155,6 @@ export default {
...
@@ -155,14 +155,6 @@ export default {
);
);
},
},
shouldRenderPagination
()
{
return
(
!
this
.
isLoading
&&
this
.
state
.
pipelines
.
length
&&
this
.
state
.
pageInfo
.
total
>
this
.
state
.
pageInfo
.
perPage
);
},
emptyTabMessage
()
{
emptyTabMessage
()
{
const
{
scopes
}
=
this
.
$options
;
const
{
scopes
}
=
this
.
$options
;
const
possibleScopes
=
[
scopes
.
pending
,
scopes
.
running
,
scopes
.
finished
];
const
possibleScopes
=
[
scopes
.
pending
,
scopes
.
running
,
scopes
.
finished
];
...
@@ -232,36 +224,6 @@ export default {
...
@@ -232,36 +224,6 @@ export default {
this
.
setCommonData
(
resp
.
data
.
pipelines
);
this
.
setCommonData
(
resp
.
data
.
pipelines
);
}
}
},
},
/**
* Handles URL and query parameter changes.
* When the user uses the pagination or the tabs,
* - update URL
* - Make API request to the server with new parameters
* - Update the polling function
* - Update the internal state
*/
updateContent
(
parameters
)
{
this
.
updateInternalState
(
parameters
);
// fetch new data
return
this
.
service
.
getPipelines
(
this
.
requestData
)
.
then
(
response
=>
{
this
.
isLoading
=
false
;
this
.
successCallback
(
response
);
// restart polling
this
.
poll
.
restart
({
data
:
this
.
requestData
});
})
.
catch
(()
=>
{
this
.
isLoading
=
false
;
this
.
errorCallback
();
// restart polling
this
.
poll
.
restart
({
data
:
this
.
requestData
});
});
},
handleResetRunnersCache
(
endpoint
)
{
handleResetRunnersCache
(
endpoint
)
{
this
.
isResetCacheButtonLoading
=
true
;
this
.
isResetCacheButtonLoading
=
true
;
...
...
app/assets/javascripts/pipelines/mixins/pipelines.js
View file @
87444fb6
...
@@ -23,6 +23,15 @@ export default {
...
@@ -23,6 +23,15 @@ export default {
hasMadeRequest
:
false
,
hasMadeRequest
:
false
,
};
};
},
},
computed
:
{
shouldRenderPagination
()
{
return
(
!
this
.
isLoading
&&
this
.
state
.
pipelines
.
length
&&
this
.
state
.
pageInfo
.
total
>
this
.
state
.
pageInfo
.
perPage
);
},
},
beforeMount
()
{
beforeMount
()
{
this
.
poll
=
new
Poll
({
this
.
poll
=
new
Poll
({
resource
:
this
.
service
,
resource
:
this
.
service
,
...
@@ -65,6 +74,35 @@ export default {
...
@@ -65,6 +74,35 @@ export default {
this
.
poll
.
stop
();
this
.
poll
.
stop
();
},
},
methods
:
{
methods
:
{
/**
* Handles URL and query parameter changes.
* When the user uses the pagination or the tabs,
* - update URL
* - Make API request to the server with new parameters
* - Update the polling function
* - Update the internal state
*/
updateContent
(
parameters
)
{
this
.
updateInternalState
(
parameters
);
// fetch new data
return
this
.
service
.
getPipelines
(
this
.
requestData
)
.
then
(
response
=>
{
this
.
isLoading
=
false
;
this
.
successCallback
(
response
);
// restart polling
this
.
poll
.
restart
({
data
:
this
.
requestData
});
})
.
catch
(()
=>
{
this
.
isLoading
=
false
;
this
.
errorCallback
();
// restart polling
this
.
poll
.
restart
({
data
:
this
.
requestData
});
});
},
updateTable
()
{
updateTable
()
{
// Cancel ongoing request
// Cancel ongoing request
if
(
this
.
isMakingRequest
)
{
if
(
this
.
isMakingRequest
)
{
...
...
app/assets/javascripts/vue_shared/mixins/ci_pagination_api_mixin.js
View file @
87444fb6
...
@@ -14,7 +14,14 @@ export default {
...
@@ -14,7 +14,14 @@ export default {
onChangePage
(
page
)
{
onChangePage
(
page
)
{
/* URLS parameters are strings, we need to parse to match types */
/* URLS parameters are strings, we need to parse to match types */
this
.
updateContent
({
scope
:
this
.
scope
,
page
:
Number
(
page
).
toString
()
});
const
params
=
{
page
:
Number
(
page
).
toString
(),
};
if
(
this
.
scope
)
{
params
.
scope
=
this
.
scope
;
}
this
.
updateContent
(
params
);
},
},
updateInternalState
(
parameters
)
{
updateInternalState
(
parameters
)
{
...
...
app/controllers/projects/commit_controller.rb
View file @
87444fb6
...
@@ -43,7 +43,7 @@ class Projects::CommitController < Projects::ApplicationController
...
@@ -43,7 +43,7 @@ class Projects::CommitController < Projects::ApplicationController
# rubocop: disable CodeReuse/ActiveRecord
# rubocop: disable CodeReuse/ActiveRecord
def
pipelines
def
pipelines
@pipelines
=
@commit
.
pipelines
.
order
(
id: :desc
)
@pipelines
=
@commit
.
pipelines
.
order
(
id: :desc
)
@pipelines
=
@pipelines
.
where
(
ref:
params
[
:ref
])
if
params
[
:ref
]
@pipelines
=
@pipelines
.
where
(
ref:
params
[
:ref
])
.
page
(
params
[
:page
]).
per
(
30
)
if
params
[
:ref
]
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
format
.
html
...
@@ -53,6 +53,7 @@ class Projects::CommitController < Projects::ApplicationController
...
@@ -53,6 +53,7 @@ class Projects::CommitController < Projects::ApplicationController
render
json:
{
render
json:
{
pipelines:
PipelineSerializer
pipelines:
PipelineSerializer
.
new
(
project:
@project
,
current_user:
@current_user
)
.
new
(
project:
@project
,
current_user:
@current_user
)
.
with_pagination
(
request
,
response
)
.
represent
(
@pipelines
),
.
represent
(
@pipelines
),
count:
{
count:
{
all:
@pipelines
.
count
all:
@pipelines
.
count
...
...
app/controllers/projects/merge_requests_controller.rb
View file @
87444fb6
...
@@ -84,13 +84,14 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
...
@@ -84,13 +84,14 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
end
end
def
pipelines
def
pipelines
@pipelines
=
@merge_request
.
all_pipelines
@pipelines
=
@merge_request
.
all_pipelines
.
page
(
params
[
:page
]).
per
(
30
)
Gitlab
::
PollingInterval
.
set_header
(
response
,
interval:
10_000
)
Gitlab
::
PollingInterval
.
set_header
(
response
,
interval:
10_000
)
render
json:
{
render
json:
{
pipelines:
PipelineSerializer
pipelines:
PipelineSerializer
.
new
(
project:
@project
,
current_user:
@current_user
)
.
new
(
project:
@project
,
current_user:
@current_user
)
.
with_pagination
(
request
,
response
)
.
represent
(
@pipelines
),
.
represent
(
@pipelines
),
count:
{
count:
{
all:
@pipelines
.
count
all:
@pipelines
.
count
...
...
changelogs/unreleased/28249-add-pagination.yml
0 → 100644
View file @
87444fb6
---
title
:
Adds pagination to pipelines table in merge request page
merge_request
:
author
:
type
:
performance
spec/controllers/projects/commit_controller_spec.rb
View file @
87444fb6
...
@@ -356,6 +356,7 @@ describe Projects::CommitController do
...
@@ -356,6 +356,7 @@ describe Projects::CommitController do
expect
(
response
).
to
be_ok
expect
(
response
).
to
be_ok
expect
(
JSON
.
parse
(
response
.
body
)[
'pipelines'
]).
not_to
be_empty
expect
(
JSON
.
parse
(
response
.
body
)[
'pipelines'
]).
not_to
be_empty
expect
(
JSON
.
parse
(
response
.
body
)[
'count'
][
'all'
]).
to
eq
1
expect
(
JSON
.
parse
(
response
.
body
)[
'count'
][
'all'
]).
to
eq
1
expect
(
response
).
to
include_pagination_headers
end
end
end
end
end
end
...
...
spec/controllers/projects/merge_requests_controller_spec.rb
View file @
87444fb6
...
@@ -563,6 +563,7 @@ describe Projects::MergeRequestsController do
...
@@ -563,6 +563,7 @@ describe Projects::MergeRequestsController do
it
'responds with serialized pipelines'
do
it
'responds with serialized pipelines'
do
expect
(
json_response
[
'pipelines'
]).
not_to
be_empty
expect
(
json_response
[
'pipelines'
]).
not_to
be_empty
expect
(
json_response
[
'count'
][
'all'
]).
to
eq
1
expect
(
json_response
[
'count'
][
'all'
]).
to
eq
1
expect
(
response
).
to
include_pagination_headers
end
end
end
end
...
...
spec/javascripts/commit/pipelines/pipelines_spec.js
View file @
87444fb6
...
@@ -72,6 +72,29 @@ describe('Pipelines table in Commits and Merge requests', function() {
...
@@ -72,6 +72,29 @@ describe('Pipelines table in Commits and Merge requests', function() {
done
();
done
();
},
0
);
},
0
);
});
});
describe
(
'
with pagination
'
,
()
=>
{
it
(
'
should make an API request when using pagination
'
,
done
=>
{
setTimeout
(()
=>
{
spyOn
(
vm
,
'
updateContent
'
);
vm
.
store
.
state
.
pageInfo
=
{
page
:
1
,
total
:
10
,
perPage
:
2
,
nextPage
:
2
,
totalPages
:
5
,
};
vm
.
$nextTick
(()
=>
{
vm
.
$el
.
querySelector
(
'
.js-next-button a
'
).
click
();
expect
(
vm
.
updateContent
).
toHaveBeenCalledWith
({
page
:
'
2
'
});
done
();
});
});
});
});
});
});
describe
(
'
pipeline badge counts
'
,
()
=>
{
describe
(
'
pipeline badge counts
'
,
()
=>
{
...
...
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