diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-10-04 07:58:34 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-10-04 07:58:34 +0000 |
commit | c958c201b72577eb01662cc1dac0f253e3d3e6db (patch) | |
tree | 26f52060490aaee5c2695e34c57b812383d834a3 /app/serializers | |
parent | 912e6b0b3d887b86bf41066062376438d3377da7 (diff) | |
parent | ba4a442996d322ca736c97ff6e7f7fdf3860d36a (diff) | |
download | gitlab-ce-c958c201b72577eb01662cc1dac0f253e3d3e6db.tar.gz |
Merge branch '31050-registry-image-lists' into 'master'
Lazy load and paginate registry image list
Closes #31050
See merge request gitlab-org/gitlab-ce!14303
Diffstat (limited to 'app/serializers')
-rw-r--r-- | app/serializers/container_repositories_serializer.rb | 3 | ||||
-rw-r--r-- | app/serializers/container_repository_entity.rb | 25 | ||||
-rw-r--r-- | app/serializers/container_tag_entity.rb | 23 | ||||
-rw-r--r-- | app/serializers/container_tags_serializer.rb | 17 |
4 files changed, 68 insertions, 0 deletions
diff --git a/app/serializers/container_repositories_serializer.rb b/app/serializers/container_repositories_serializer.rb new file mode 100644 index 00000000000..56dc70b5687 --- /dev/null +++ b/app/serializers/container_repositories_serializer.rb @@ -0,0 +1,3 @@ +class ContainerRepositoriesSerializer < BaseSerializer + entity ContainerRepositoryEntity +end diff --git a/app/serializers/container_repository_entity.rb b/app/serializers/container_repository_entity.rb new file mode 100644 index 00000000000..1103cf30a07 --- /dev/null +++ b/app/serializers/container_repository_entity.rb @@ -0,0 +1,25 @@ +class ContainerRepositoryEntity < Grape::Entity + include RequestAwareEntity + + expose :id, :path, :location + + expose :tags_path do |repository| + project_registry_repository_tags_path(project, repository, format: :json) + end + + expose :destroy_path, if: -> (*) { can_destroy? } do |repository| + project_container_registry_path(project, repository, format: :json) + end + + private + + alias_method :repository, :object + + def project + request.project + end + + def can_destroy? + can?(request.current_user, :update_container_image, project) + end +end diff --git a/app/serializers/container_tag_entity.rb b/app/serializers/container_tag_entity.rb new file mode 100644 index 00000000000..ec1fc349586 --- /dev/null +++ b/app/serializers/container_tag_entity.rb @@ -0,0 +1,23 @@ +class ContainerTagEntity < Grape::Entity + include RequestAwareEntity + + expose :name, :location, :revision, :total_size, :created_at + + expose :destroy_path, if: -> (*) { can_destroy? } do |tag| + project_registry_repository_tag_path(project, tag.repository, tag.name, format: :json) + end + + private + + alias_method :tag, :object + + def project + request.project + end + + def can_destroy? + # TODO: We check permission against @project, not tag, + # as tag is no AR object that is attached to project + can?(request.current_user, :update_container_image, project) + end +end diff --git a/app/serializers/container_tags_serializer.rb b/app/serializers/container_tags_serializer.rb new file mode 100644 index 00000000000..6ff3adff135 --- /dev/null +++ b/app/serializers/container_tags_serializer.rb @@ -0,0 +1,17 @@ +class ContainerTagsSerializer < BaseSerializer + entity ContainerTagEntity + + def with_pagination(request, response) + tap { @paginator = Gitlab::Serializer::Pagination.new(request, response) } + end + + def paginated? + @paginator.present? + end + + def represent(resource, opts = {}) + resource = @paginator.paginate(resource) if paginated? + + super(resource, opts) + end +end |