katello 3.10.2 → 3.11.0.rc1

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

@@ -1,7 +1,8 @@
 object @resource
 
 attributes :id
-attributes :uuid
+attributes :pulp_id
+attributes :pulp_id => :uuid
 attributes :name
 attributes :version
 attributes :author

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

@@ -1,4 +1,4 @@
 object @resource
 
 extends 'katello/api/v2/puppet_modules/base'
-extends 'katello/api/v2/puppet_modules/backend', :object => Katello::Pulp::PuppetModule.new(@resource.uuid)
+extends 'katello/api/v2/puppet_modules/backend', :object => Katello::Pulp::PuppetModule.new(@resource.pulp_id)

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

@@ -12,6 +12,7 @@ glue(@object.root) do
   child :product do |_product|
     attributes :id, :cp_id, :name
     attributes :orphaned? => :orphaned
+    attributes :redhat? => :redhat
     node :sync_plan do |_sync_plan|
       attributes :name, :description, :sync_date, :interval, :next_sync
     end

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

@@ -1,9 +1,9 @@
 <% content_for(:stylesheets) do %>
-    <%= stylesheet_link_tag *webpack_asset_paths('katello', :extension => 'css'), "data-turbolinks-track" => true %>
+    <%= webpacked_plugins_css_for :katello %>
 <% end %>
 
 <% content_for(:javascripts) do %>
-    <%= javascript_include_tag *webpack_asset_paths('katello', :extension => 'js') %>
+    <%= webpacked_plugins_js_for :katello %>
 <% end %>
 
 <% content_for(:content) do %>
@@ -11,6 +11,6 @@
     <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
     <div id="user-id" data-id="<%= User.current.id if User.current %>" ></div>
     <div id="reactRoot"></div>
-    <%= mount_react_component('katello', '#reactRoot') %>
 <% end %>
 <%= render file: "layouts/base" %>
+<%= mount_react_component('katello', '#reactRoot') %>

data/db/migrate/20181219205642_create_yum_metadata_file.rb

@@ -0,0 +1,20 @@
+class CreateYumMetadataFile < ActiveRecord::Migration[5.2]
+  def up
+    create_table :katello_yum_metadata_files do |t|
+      t.string :uuid, null: false
+      t.string :checksum, null: true
+      t.string :name, null: true
+      t.integer :repository_id, null: true
+      t.timestamps
+    end
+
+    add_foreign_key :katello_yum_metadata_files, :katello_repositories, :column => "repository_id"
+    change_column :katello_yum_metadata_files, :created_at, :datetime, :null => true
+    change_column :katello_yum_metadata_files, :updated_at, :datetime, :null => true
+  end
+
+  def down
+    remove_foreign_key :katello_yum_metadata_files, :katello_repositories
+    drop_table :katello_yum_metadata_files
+  end
+end

data/db/migrate/20190107160723_units_uuid_to_backend_ident.rb

@@ -0,0 +1,8 @@
+class UnitsUuidToBackendIdent < ActiveRecord::Migration[5.2]
+  def change
+    %w(rpms errata package_groups files yum_metadata_files srpms module_streams debs docker_tags docker_manifests
+       docker_manifest_lists puppet_modules ostree_branches).each do |name|
+      rename_column("katello_#{name}", :uuid, :pulp_id)
+    end
+  end
+end

data/db/seeds.d/101-locations.rb

@@ -4,17 +4,15 @@
 # !!! PLEASE KEEP THIS SCRIPT IDEMPOTENT !!!
 #
 
-if Location.exists? || ENV['SEED_LOCATION'].present?
-  # Create a new location to be used as the Katello Default.
-  if ENV['SEED_LOCATION'].blank?
-    default_location = Location.first
-  else
-    default_location = Location.where(:name => ENV['SEED_LOCATION']).first_or_create
-  end
-  if Setting[:default_location_subscribed_hosts].empty?
-    Setting[:default_location_subscribed_hosts] = default_location.title
-  end
-  if Setting[:default_location_puppet_content].empty?
-    Setting[:default_location_puppet_content] = default_location.title
-  end
+# Create a new location to be used as the Katello Default.
+if ENV['SEED_LOCATION'].blank?
+  default_location = Location.first
+else
+  default_location = Location.where(:name => ENV['SEED_LOCATION']).first_or_create
+end
+if Setting[:default_location_subscribed_hosts].empty?
+  Setting[:default_location_subscribed_hosts] = default_location.title
+end
+if Setting[:default_location_puppet_content].empty?
+  Setting[:default_location_puppet_content] = default_location.title
 end

data/db/seeds.d/102-organizations.rb

@@ -4,9 +4,11 @@
 # !!! PLEASE KEEP THIS SCRIPT IDEMPOTENT !!!
 #
 
-Organization.all.each do |org|
-  User.as(::User.anonymous_api_admin.login) do
-    ForemanTasks.sync_task(::Actions::Katello::Organization::Create, org) unless org.library
+unless Rails.env.test?
+  Organization.all.each do |org|
+    User.as(::User.anonymous_api_admin.login) do
+      ForemanTasks.sync_task(::Actions::Katello::Organization::Create, org) unless org.library
+    end
   end
 end
 

data/db/seeds.d/111-upgrade_tasks.rb

@@ -6,7 +6,7 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:upgrades:3.8:clear_checksum_type'},
     {:name => 'katello:upgrades:3.9:migrate_sync_plans'},
     {:name => 'katello:upgrades:3.10:clear_invalid_repo_credentials'},
-    {:name => 'katello:upgrades:3.10:update_gpg_key_urls'},
+    {:name => 'katello:upgrades:3.11:import_yum_metadata'},
     {:name => 'katello:upgrades:3.11:update_puppet_repos'}
   ]
 end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion_katello.js

@@ -94,6 +94,8 @@
 //= require "bastion_katello/architectures/architectures.module.js"
 //= require_tree "./architectures"
 
+//= require "bastion_katello/dates/dates.module.js"
+
 //= require "bastion_katello/i18n/translations.js"
 
 //= require "bastion_katello/bastion-katello-bootstrap.js"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/subscription-add-or-remove.html

@@ -40,7 +40,7 @@
        </td>
        <td bst-table-cell><div subscription-type="subscription"></div></td>
        <td bst-table-cell><div subscription-start-date="subscription"></div></td>
-       <td bst-table-cell>{{ subscription.end_date | date:"shortDate" }}</td>
+       <td bst-table-cell><date date="subscription.end_date" /></td>
        <td bst-table-cell>{{ subscription.support_level }}</td>
        <td bst-table-cell>{{ subscription.contract_number }}</td>
        <td bst-table-cell>{{ subscription.account_number }}</td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-subscriptions-modal.html

@@ -101,7 +101,7 @@
               <td bst-table-cell>{{ subscription | subscriptionConsumedFilter }}</td>
               <td bst-table-cell><div subscription-type="subscription"></div></td>
               <td bst-table-cell><div subscription-start-date="subscription"></div></td>
-              <td bst-table-cell>{{ subscription.end_date | date:"shortDate" }}</td>
+              <td bst-table-cell><date date="subscription.end_date" /></td>
               <td bst-table-cell>{{ subscription.support_level }}</td>
               <td bst-table-cell>{{ subscription.contract_number }}</td>
               <td bst-table-cell>{{ subscription.account_number }}</td>
@@ -118,4 +118,4 @@
       Done
     </button>
   </div>
-</div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.module.js

@@ -19,5 +19,6 @@ angular.module('Bastion.content-hosts', [
     'Bastion.hosts',
     'Bastion.errata',
     'Bastion.host-collections',
-    'Bastion.repository-sets'
+    'Bastion.repository-sets',
+    'Bastion.dates'
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html

@@ -137,8 +137,8 @@
                 {{ erratum.errata_id }}
               </a>
             </td>
-            <td bst-table-cell >{{ erratum.title }}</td>
-            <td bst-table-cell >{{ erratum.updated | date:'shortDate' }}</td>
+            <td bst-table-cell>{{ erratum.title }}</td>
+            <td bst-table-cell><date date="erratum.updated" /></td>
           </tr>
         </tbody>
       </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-events.html

@@ -20,7 +20,7 @@
             <td bst-table-cell>{{ event.type }}</td>
             <td bst-table-cell>{{ event.target }}</td>
             <td bst-table-cell>{{ event.messageText }}</td>
-            <td bst-table-cell>{{ event.timestamp | date:"short" }}</td>
+            <td bst-table-cell><short-date-time date="event.timestamp" /></td>
           </tr>
         </tbody>
       </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html

@@ -288,7 +288,7 @@
 
       <dl class="dl-horizontal dl-horizontal-left">
         <dt translate>Registered</dt>
-        <dd>{{ host.created_at | date:'short' }}</dd>
+        <dd><short-date-time date="host.created_at" /></dd>
 
         <dt translate> Registered By</dt>
         <dd>
@@ -315,7 +315,7 @@
         </dd>
 
         <dt translate>Last Checkin</dt>
-        <dd>{{ (host.subscription_facet_attributes.last_checkin | date:'short') || ("Never checked in" | translate) }}</dd>
+        <dd><short-date-time date="host.subscription_facet_attributes.last_checkin" default="'Never checked in' | translate" /></dd>
       </dl>
 
       <div class="divider"></div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-provisioning-info.html

@@ -25,7 +25,7 @@
       <dd>{{ host.puppet_environment_name }}</dd>
 
       <dt translate>Last Puppet Report</dt>
-      <dd>{{ host.last_report | date:'short' }}</dd>
+      <dd><short-date-time date="host.last_report" /></dd>
 
       <dt translate>Model</dt>
       <dd>{{ host.model_name }}</dd>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html

@@ -123,8 +123,8 @@
           <td bst-table-cell>{{ host.operatingsystem_name }}</td>
           <td bst-table-cell>{{ host.content_facet_attributes.lifecycle_environment.name }}</td>
           <td bst-table-cell>{{ host.content_facet_attributes.content_view.name || "" }}</td>
-          <td bst-table-cell>{{ (host.subscription_facet_attributes.registered_at | date:'short') || ("Never registered" | translate) }}</td>
-          <td bst-table-cell>{{ (host.subscription_facet_attributes.last_checkin | date:'short') || ("Never checked in" | translate) }}</td>
+          <td bst-table-cell><short-date-time date="host.subscription_facet_attributes.registered_at" default="'Never registered' | translate" /></td>
+          <td bst-table-cell><short-date-time date="host.subscription_facet_attributes.last_checkin" default="'Never checked in' | translate" /></td>
         </tr>
       </tbody>
     </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-views.module.js

@@ -13,5 +13,6 @@ angular.module('Bastion.content-views', [
     'Bastion.utils',
     'Bastion.content-views.versions',
     'Bastion.components',
-    'Bastion.packages'
+    'Bastion.packages',
+    'Bastion.dates'
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/errata-filter-details.html

@@ -48,10 +48,10 @@
           {{ errata.type }}
         </td>
         <td bst-table-cell>
-          {{ errata.issued | date:'M/d/yy' }}
+          <date date="errata.issued" />
         </td>
         <td bst-table-cell>
-          {{ errata.updated | date:'M/d/yy' }}
+          <date date="errata.updated" />
         </td>
         <td bst-table-cell>{{ errata.title }}</td>
       </tr>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filter-repositories.html

@@ -87,7 +87,7 @@
                   </span>
                   <span ng-hide="repository.last_sync == null">
                     <a href="/foreman_tasks/tasks/{{repository.last_sync.id}}">{{ repository.last_sync.result | capitalize}}</a>
-                    ({{ repository.last_sync.ended_at | date:"short" }})
+                    <short-date-time date="repository.last_sync.ended_at" />
                   </span>
                 </span>
               <span ng-hide="repository.url" translate>N/A</span>
@@ -113,4 +113,4 @@
       </table>
     </div>
   </div>
-</div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filters.html

@@ -66,7 +66,7 @@
             </a>
           </td>
           <td bst-table-cell>{{ filter.description }}</td>
-          <td bst-table-cell>{{ filter.updated_at | date:"short" }}</td>
+          <td bst-table-cell><short-date-time date="filter.updated_at" /></td>
           <td bst-table-cell>
             {{ filter.type | filterContentType }}
             <span ng-if="filter.type === 'erratum' && filter.rules[0].types">{{ '- Date and Type' | translate }}</span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/histories/views/content-view-history.html

@@ -10,27 +10,27 @@
 
   <div data-block="table">
     <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
-     <thead>
-       <tr bst-table-head>
-         <th translate>Date</th>
-         <th translate>Version</th>
-         <th translate>Description</th>
-         <th translate>Action</th>
-         <th translate>User</th>
-         <th translate>Status</th>
-       </tr>
-     </thead>
+      <thead>
+        <tr bst-table-head>
+          <th translate>Date</th>
+          <th translate>Version</th>
+          <th translate>Description</th>
+          <th translate>Action</th>
+          <th translate>User</th>
+          <th translate>Status</th>
+        </tr>
+      </thead>
 
-     <tbody>
-       <tr bst-table-row ng-repeat="history in table.rows">
-         <td bst-table-cell>{{ history.created_at | date:'short' }}</td>
-         <td bst-table-cell>{{ history.version }} </td>
-         <td bst-table-cell class="preserve-newlines">{{ history.description }}</td>
-         <td bst-table-cell>{{ actionText(history) }}</td>
-         <td bst-table-cell>{{ history.user }}</td>
-         <td bst-table-cell>{{ history.task.result }}</td>
-       </tr>
-     </tbody>
+      <tbody>
+        <tr bst-table-row ng-repeat="history in table.rows">
+          <td bst-table-cell><short-date-time date="history.created_at" /></td>
+           <td bst-table-cell>{{ history.version }} </td>
+           <td bst-table-cell class="preserve-newlines">{{ history.description }}</td>
+          <td bst-table-cell>{{ actionText(history) }}</td>
+          <td bst-table-cell>{{ history.user }}</td>
+          <td bst-table-cell>{{ history.task.result }}</td>
+        </tr>
+      </tbody>
     </table>
   </div>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-deb-repositories.html

@@ -71,7 +71,7 @@
             Not Synced
           </span>
           <span ng-show="repository.url">
-            {{ repository.last_sync.ended_at | date:"short" }}
+            <short-date-time date="repository.last_sync.ended_at" />
           </span>
           <span ng-hide="repository.url" translate>N/A</span>
         </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-docker-repositories.html

@@ -79,7 +79,7 @@
               Not Synced
             </span>
             <span ng-show="repository.url">
-              {{ repository.last_sync.ended_at | date:"short" }}
+              <short-date-time date="repository.last_sync.ended_at" />
             </span>
             <span ng-hide="repository.url" translate>N/A</span>
           </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-file-repositories.html

@@ -71,7 +71,7 @@
             Not Synced
           </span>
           <span ng-show="repository.url">
-            {{ repository.last_sync.ended_at | date:"short" }}
+            <short-date-time date="repository.last_sync.ended_at" />
           </span>
           <span ng-hide="repository.url" translate>N/A</span>
         </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-ostree-repositories.html

@@ -71,7 +71,7 @@
             Not Synced
           </span>
           <span ng-show="repository.url">
-            {{ repository.last_sync.ended_at | date:"short" }}
+            <short-date-time date="repository.last_sync.ended_at" />
           </span>
           <span ng-hide="repository.url" translate>N/A</span>
         </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-repositories.html

@@ -74,7 +74,7 @@
             Not Synced
           </span>
           <span ng-show="repository.url">
-            {{ repository.last_sync.ended_at | date:"short" }}
+            <short-date-time date="repository.last_sync.ended_at" />
           </span>
           <span ng-hide="repository.url" translate>N/A</span>
         </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-versions.html

@@ -41,7 +41,7 @@
 
             <span ng-show="hideProgress(version)">
               {{ historyText(version) }}
-              ({{ version.last_event.created_at | date:'short' }})
+              (<short-date-time date="version.last_event.created_at" />)
             </span>
           </td>
           <td bst-table-cell>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-version-content.controller.js

@@ -62,7 +62,7 @@
                 params: {
                     'content_type': "ostree",
                     'content_view_version_id': $scope.$stateParams.versionId,
-                    'sort_by': 'version',
+                    'sort_by': 'created',
                     'sort_order': 'DESC'
                 }
             },

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-errata.html

@@ -38,7 +38,7 @@
           <span ng-show="errata.severity">- {{ errata.severity }}</span>
         </td>
         <td bst-table-cell>{{ errata.hosts_available_count || 0 }}</td>
-        <td bst-table-cell>{{ errata.updated | date:'shortDate'}}</td>
+        <td bst-table-cell><date date="errata.updated" /></td>
       </tr>
     </tbody>
   </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-ostree-branches.html

@@ -9,6 +9,7 @@
         <th bst-table-column translate>Name</th>
         <th bst-table-column translate>Version</th>
         <th bst-table-column translate>Commit</th>
+        <th bst-table-column translate>Date</th>
       </tr>
     </thead>
 
@@ -17,6 +18,7 @@
         <td bst-table-cell>{{ branch.name }}</td>
         <td bst-table-cell>{{ branch.version }}</td>
         <td bst-table-cell>{{ branch.commit }}</td>
+        <td bst-table-cell>{{ branch.version_date }}</td>
       </tr>
     </tbody>
   </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/views/content-views.html

@@ -47,7 +47,7 @@
             <span ng-hide="contentView.composite" translate>No</span>
           </td>
           <td bst-table-cell>
-            <span ng-show="contentView.last_published">{{ contentView.last_published | date:"medium" }}</span>
+            <span ng-show="contentView.last_published"><long-date-time date="contentView.last_published" /></span>
           <span ng-hide="contentView.last_published" translate>
             Not yet published
           </span>