katello 3.5.2 → 3.6.0.rc1

data/app/views/katello/api/v2/content_facet/base.json.rabl

@@ -2,7 +2,8 @@ attributes :id, :uuid
 attributes :content_view_id, :content_view_name
 attributes :lifecycle_environment_id, :lifecycle_environment_name
 attributes :content_source_id, :content_source_name
-attributes :kickstart_repository_id, :errata_counts
+attributes :kickstart_repository_id, :kickstart_repository_name
+attributes :errata_counts
 attributes :applicable_rpm_count => :applicable_package_count
 attributes :upgradable_rpm_count => :upgradable_package_count
 
@@ -17,3 +18,7 @@ end
 child :content_source => :content_source do
   attributes :id, :name, :url
 end
+
+child :kickstart_repository => :kickstart_repository do
+  attributes :id, :name
+end

data/app/views/katello/api/v2/content_view_versions/base.json.rabl

@@ -9,12 +9,15 @@ attributes :content_view_id
 attributes :default
 attributes :description
 attributes :package_count
+attributes :srpm_count
 attributes :file_count
 attributes :package_group_count
 attributes :puppet_module_count
 attributes :docker_manifest_count
+attributes :docker_manifest_list_count
 attributes :docker_tag_count
 attributes :ostree_branch_count
+attributes :deb_count
 
 node :errata_counts do |version|
   partial('katello/api/v2/errata/counts', :object => Katello::RelationPresenter.new(version.errata))

data/app/views/katello/api/v2/content_views/show.json.rabl

@@ -3,3 +3,15 @@ object @resource
 extends "katello/api/v2/content_views/base"
 
 attributes :content_host_count
+
+child :duplicate_repositories_to_publish => :duplicate_repositories_to_publish do
+  attributes :id, :name
+  node :components do |repo|
+    @resource.components_with_repo(repo).map do |component|
+      {
+        :content_view_name => component.content_view.name,
+        :content_view_version => component.version
+      }
+    end
+  end
+end

data/app/views/katello/api/v2/debs/base.json.rabl

@@ -0,0 +1,10 @@
+object @resource
+
+attributes :id
+attributes :name
+attributes :version
+attributes :architecture
+attributes :filename
+attributes :checksum
+attributes :description
+attributes :uuid

data/app/views/katello/api/v2/debs/index.json.rabl

@@ -0,0 +1,7 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends "katello/api/v2/debs/base"
+end

data/app/views/katello/api/v2/debs/show.json.rabl

@@ -0,0 +1,3 @@
+object @resource
+
+extends "katello/api/v2/debs/base"

data/app/views/katello/api/v2/docker_manifest_lists/index.json.rabl

@@ -0,0 +1,7 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/docker_manifest_lists/show'
+end

data/app/views/katello/api/v2/docker_manifest_lists/show.json.rabl

@@ -0,0 +1,12 @@
+object @resource
+
+attributes :id, :schema_version, :digest, :manifest_type
+
+child :docker_tags => :tags do
+  attributes :associated_meta_tag_identifier => :id
+  attributes :repository_id, :name
+end
+
+child :docker_manifests => :manifests do
+  attributes :id, :digest, :schema_version, :manifest_type
+end

data/app/views/katello/api/v2/docker_manifests/compare.json.rabl

@@ -0,0 +1,10 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/docker_manifests/show'
+  node :comparison do |result|
+    result.comparison
+  end
+end

data/app/views/katello/api/v2/docker_manifests/show.json.rabl

@@ -1,8 +1,12 @@
 object @resource
 
-attributes :id, :name, :schema_version, :digest
+attributes :id, :schema_version, :digest, :manifest_type
 
 child :docker_tags => :tags do
   attributes :associated_meta_tag_identifier => :id
   attributes :repository_id, :name
 end
+
+child :docker_manifest_lists => :manifest_lists do
+  attributes :id, :digest, :schema_version, :manifest_type
+end

data/app/views/katello/api/v2/docker_tags/_base.json.rabl

@@ -1,21 +1,21 @@
 object @resource
 
-attributes :id, :name, :full_name
+attributes :id, :name
 attributes :repository_id
 
 child :schema1_manifest => :manifest_schema1 do
   attributes :uuid => :id
-  attributes :name, :schema_version, :digest
+  attributes :schema_version, :digest, :manifest_type
 end
 
 child :schema2_manifest => :manifest_schema2 do
   attributes :uuid => :id
-  attributes :name, :schema_version, :digest
+  attributes :schema_version, :digest, :manifest_type
 end
 
 child :docker_manifest => :manifest do
   attributes :uuid => :id
-  attributes :name, :schema_version, :digest
+  attributes :schema_version, :digest, :manifest_type
 end
 
 child :repository => :repository do

data/app/views/katello/api/v2/docker_tags/compare.json.rabl

@@ -0,0 +1,10 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/docker_tags/base'
+  node :comparison do |result|
+    result.comparison
+  end
+end

data/app/views/katello/api/v2/docker_tags/show.json.rabl

@@ -4,7 +4,7 @@ extends 'katello/api/v2/docker_tags/base'
 
 child :docker_manifest => :manifest do
   attributes :uuid => :id
-  attributes :name, :schema_version, :digest
+  attributes :schema_version, :digest, :manifest_type
 end
 
 child :related_tags => :related_tags do

data/app/views/katello/api/v2/errata/_counts.json.rabl

@@ -1,3 +1,4 @@
+
 totals = @object.relation.group(:errata_type).count.with_indifferent_access
 
 node :security do |_presenter|

data/app/views/katello/api/v2/errata/available_errata.rabl

@@ -0,0 +1,7 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/errata/show'
+end

data/app/views/katello/api/v2/file_units/compare.json.rabl

@@ -0,0 +1,10 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/file_units/base'
+  node :comparison do |result|
+    result.comparison
+  end
+end

data/app/views/katello/api/v2/host_subscriptions/product_content.json.rabl

@@ -8,8 +8,7 @@ child @collection[:results] => :results do
   end
 
   child :content => :content do
-    attributes :id, :name, :label
-    attribute :contentUrl => :content_url
+    attributes :id, :name, :label, :vendor, :content_type, :content_url, :gpg_url
   end
 
   child :content_overrides => :overrides do

data/app/views/katello/api/v2/hostgroups_extensions/show.json.rabl

@@ -1,3 +1,4 @@
 object @hostgroup
 extends 'api/v2/hostgroups/show'
-attributes :content_source_id, :content_source_name, :content_view_id, :content_view_name, :lifecycle_environment_id, :lifecycle_environment_name, :kickstart_repository_id
+attributes :content_source_id, :content_source_name, :content_view_id, :content_view_name, :lifecycle_environment_id, :lifecycle_environment_name
+attributes :kickstart_repository_id, :kickstart_repository_name

data/app/views/katello/api/v2/hosts_bulk_actions/applicable_errata.json.rabl

@@ -0,0 +1,7 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+node :results do
+  partial("katello/api/v2/hosts_bulk_actions/erratum", :object => @collection[:results])
+end

data/app/views/katello/api/v2/layouts/resource.json.erb

@@ -1,4 +1,4 @@
-<% if object_name %>
+<% if try(:object_name) %>
   {<%= object_name %>: <%= yield %>}
 <% else %>
   <%= yield %>

data/app/views/katello/api/v2/ostree_branches/compare.json.rabl

@@ -0,0 +1,10 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/ostree_branches/show'
+  node :comparison do |result|
+    result.comparison
+  end
+end

data/app/views/katello/api/v2/package_groups/compare.json.rabl

@@ -0,0 +1,10 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/package_groups/base'
+  node :comparison do |result|
+    result.comparison
+  end
+end

data/app/views/katello/api/v2/packages/compare.json.rabl

@@ -0,0 +1,10 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/packages/base'
+  node :comparison do |result|
+    result.comparison
+  end
+end

data/app/views/katello/api/v2/products/_product_content.json.rabl

@@ -0,0 +1,9 @@
+attribute :enabled, :product_id
+
+glue :content do |_content|
+  attributes :name, :label, :vendor,
+             :cp_content_id => :id,
+             :content_type => :contentType,
+             :gpg_url => :gpgUrl,
+             :content_url => :contentUrl
+end

data/app/views/katello/api/v2/products/base.json.rabl

@@ -10,7 +10,9 @@ attributes :sync_plan_id
 attributes :sync_summary
 attributes :gpg_key_id
 
-attributes :available_content => :available_content, :if => params[:include_available_content]
+child({:available_content => :available_content}, :if => params[:include_available_content]) do
+  extends "katello/api/v2/products/product_content"
+end
 
 child :sync_plan do
   attributes :id, :name, :description, :sync_date, :interval, :next_sync

data/app/views/katello/api/v2/products/show.json.rabl

@@ -3,9 +3,13 @@ object @resource
 
 extends "katello/api/v2/products/base"
 
-attributes :productContent => :product_content
+child(:product_contents => :product_content) do
+  extends "katello/api/v2/products/product_content"
+end
 
-attributes :available_content => :available_content
+child(:available_content => :available_content) do
+  extends "katello/api/v2/products/product_content"
+end
 
 attributes :redhat? => :redhat
 

data/app/views/katello/api/v2/puppet_modules/compare.json.rabl

@@ -0,0 +1,10 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/puppet_modules/base'
+  node :comparison do |result|
+    result.comparison
+  end
+end

data/app/views/katello/api/v2/repositories/base.json.rabl

@@ -4,6 +4,7 @@ extends 'katello/api/v2/common/identifier'
 
 attributes :content_type, :url, :relative_path, :arch
 attributes :pulp_id => :backend_identifier
+attributes :cp_label => :content_label
 
 child :product do |_product|
   attributes :id, :cp_id, :name
@@ -16,13 +17,16 @@ node :content_counts do |repo|
   {
     :ostree_branch => repo.ostree_branches.count,
     :docker_manifest => repo.docker_manifests.count,
+    :docker_manifest_list => repo.docker_manifest_lists.count,
     :docker_tag => repo.docker_meta_tag_count,
     :rpm => repo.rpms.count,
+    :srpm => repo.srpms.count,
     :package => repo.rpms.count,
     :package_group => repo.package_groups.count,
     :erratum => repo.errata.count,
     :puppet_module => repo.puppet_modules.count,
-    :file => repo.files.count
+    :file => repo.files.count,
+    :deb => repo.debs.count
   }
 end
 

data/app/views/katello/api/v2/repositories/show.json.rabl

@@ -20,6 +20,8 @@ attributes :promoted? => :promoted
 attributes :ostree_branch_names => :ostree_branches
 attributes :upstream_username
 attributes :ostree_upstream_sync_policy, :ostree_upstream_sync_depth, :compute_ostree_upstream_sync_depth => :computed_ostree_upstream_sync_depth
+attributes :deb_releases, :deb_components, :deb_architectures
+attributes :ignore_global_proxy
 
 if @resource.is_a?(Katello::Repository)
   if @resource.distribution_version || @resource.distribution_arch || @resource.distribution_family || @resource.distribution_variant

data/app/views/katello/api/v2/repository_sets/show.json.rabl

@@ -3,8 +3,19 @@ object @resource
 @resource ||= @object
 
 glue :content do
-  extends 'katello/api/v2/common/identifier'
-  attributes :type, :updated, :vendor, :gpgUrl, :contentUrl, :label
+  node do |content|
+    {
+      id: content.cp_content_id,
+      name: content.name,
+      label: content.label,
+      vendor: content.vendor,
+      type: content.content_type,
+      gpgUrl: content.gpg_url,
+      contentUrl: content.content_url
+    }
+  end
+
+  attributes :name, :vendor, :label
 end
 attribute :enabled
 
@@ -15,5 +26,6 @@ if @resource.product
 end
 
 child @resource.repositories => :repositories do
-  attributes :id, :name
+  attributes :id, :name, :arch
+  attributes :minor => :releasever
 end

data/app/views/katello/layouts/react.html.erb

@@ -0,0 +1,15 @@
+<% content_for(:stylesheets) do %>
+    <%= stylesheet_link_tag *webpack_asset_paths('katello', :extension => 'css'), "data-turbolinks-track" => true %>
+<% end %>
+
+<% content_for(:javascripts) do %>
+    <%= javascript_include_tag *webpack_asset_paths('katello', :extension => 'js'), "data-turbolinks-track" => true, 'defer' => 'defer' %>
+<% end %>
+
+<% content_for(:content) do %>
+    <%= notifications %>
+    <div id="reactRoot"></div>
+    <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
+<% end %>
+
+<%= render file: "layouts/base" %>

data/app/views/katello/providers/redhat/_repo_sets.html.erb

@@ -11,7 +11,7 @@
       <% orphaned = orphaned_product_ids.include?(product.id) %>
       <% if product_map[product.id] %>
         <% contents = product_map[product.id].sort{|p1, p2| p1.content.name <=> p2.content.name} %>
-        <% has_content = !orphaned || product.repositories.length > 0 %>
+        <% has_content = !orphaned || product.repositories.size > 0 %>
         <% if has_content %>
           <tr class="product <%= cycle(nil, 'alt') %>" id="<%= tab_id%>_prod_<%= product.id %>">
             <td>
@@ -28,15 +28,15 @@
                 </thead>
                 <tbody>
                   <% for product_content in contents %>
-                    <% if !orphaned || product.repositories.detect {|repo| repo.cp_label == product_content.content.label} %>
-                      <tr class="collapsed repo_set" id="repo_set_<%= product_content.content.id %>">
+                    <% if !orphaned || product.repositories.any? {|repo| repo.cp_label == product_content.content.label} %>
+                      <tr class="collapsed repo_set" id="repo_set_<%= product_content.content.cp_content_id %>">
                         <td>
                           <span class="expander_area clickable"
                                 data-url="<%= katello.available_repositories_product_path(product.id)%>"
-                                data-content-id="<%= product_content.content.id %>"
+                                data-content-id="<%= product_content.content.cp_content_id %>"
                                 data-orphaned="<%= orphaned.to_s %>">
                             <%= image_tag( "katello/icons/spinner.gif", :class=>"hidden fl repo_set_spinner",
-                                  :id=>"spinner_set_#{product_content.content.id}", :style=>"margin-left:-18px;") %>
+                                  :id=>"spinner_set_#{product_content.content.cp_content_id}", :style=>"margin-left:-18px;") %>
                             <span class="expander"></span>
                             <%= product_content.content.name %>
                           </span>