katello 4.14.1 → 4.15.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-info.html

@@ -6,6 +6,12 @@
   </span>
 </div>
 
+<div bst-alert="warning" ng-if="activationKey.multi_content_view_environment">
+  <span translate>
+    This activation key has multiple content view environments, which cannot yet be edited in the web UI. To change this key's content view environments, update the activation key via Hammer.
+  </span>
+</div>
+
 <div data-extend-template="layouts/two-column-details.html">
   <div data-block="left-column">
     <h4 translate>Basic Information</h4>
@@ -51,7 +57,6 @@
         </div>
       </dd>
 
-
       <div class="divider"></div>
       <h4 translate>System Purpose</h4>
 
@@ -117,17 +122,18 @@
           on-delete="clearReleaseVersion()"
           on-save="save(activationKey)">
       </dd>
-
+    </dl>
+    <dl class="dl-horizontal dl-horizontal-left" ng-if="!activationKey.multi_content_view_environment">
       <dt bst-feature-flag="lifecycle_environments">
         <span translate>Environment</span>
       </dt>
       <dd bst-feature-flag="lifecycle_environments">
         <div path-selector="environments"
-             ng-model="activationKey.environment"
-             mode="singleSelect"
-             selection-required="selectionRequired"
-             disabled="denied('edit_activation_keys', activationKey)"
-             disable-trigger="disableEnvironmentSelection">
+            ng-model="activationKey.environment"
+            mode="singleSelect"
+            selection-required="selectionRequired"
+            disabled="denied('edit_activation_keys', activationKey)"
+            disable-trigger="disableEnvironmentSelection">
         </div>
       </dd>
 
@@ -136,14 +142,14 @@
       </dt>
       <dd bst-feature-flag="lifecycle_environments">
         <div bst-edit-select="activationKey.content_view.name"
-             readonly="denied('edit_activation_keys', activationKey) || activationKey.environment === undefined || activationKey.environment === null"
-             selector="activationKey.content_view.id"
-             options="contentViews()"
-             on-cancel="cancelContentViewUpdate()"
-             on-save="saveContentView(activationKey)"
-             deletable="activationKey.content_view"
-             on-delete="resetEnvironment(activationKey)"
-             edit-trigger="editContentView">
+            readonly="denied('edit_activation_keys', activationKey) || activationKey.environment === undefined || activationKey.environment === null"
+            selector="activationKey.content_view.id"
+            options="contentViews()"
+            on-cancel="cancelContentViewUpdate()"
+            on-save="saveContentView(activationKey)"
+            deletable="activationKey.content_view"
+            on-delete="resetEnvironment(activationKey)"
+            edit-trigger="editContentView">
         </div>
 
         <div bst-alert="info" ng-show="editEnvironment">
@@ -154,6 +160,14 @@
         </div>
       </dd>
     </dl>
+    <dl class="dl-horizontal dl-horizontal-left">
+      <span id="ak-cve-details" data-ak-details="{{ activationKey }}" class="hidden"></span>
+      <foreman-react-component
+          name="CVEDetailsCard"
+          data-props=""
+          ng-if="activationKey.multi_content_view_environment"
+      ></foreman-react-component>
+    </dl>
   </div>
 </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-repository-sets.html

@@ -33,6 +33,19 @@
           <option value="">{{'All' | translate}}</option>
       </select>
     </label>
+
+    <label class="repository-status-label">
+      <span translate>Status</span>
+      <select
+              id="repositoryStatuses"
+              name="repositoryStatuses"
+              ng-model="repositoryStatus.value"
+              ng-options="id as name for (id, name) in repositoryStatuses"
+              ng-change="selectRepositoryStatus()"
+              >
+          <option value="">{{'All' | translate}}</option>
+      </select>
+    </label>
   </div>
 
   <div data-block="list-actions">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/views/activation-keys.html

@@ -29,6 +29,7 @@
         <th bst-table-column="consumed"><span translate>Host Limit</span></th>
         <th bst-table-column="environment"><span translate>Environment</span></th>
         <th bst-table-column="contentView"><span translate>Content View</span></th>
+        <th bst-table-column="multi-cv"><span translate>Multi Content View Environment</span></th>
       </tr>
       </thead>
 
@@ -48,6 +49,7 @@
         <td bst-table-cell>{{ activationKey | activationKeyConsumedFilter }}</td>
         <td bst-table-cell>{{ activationKey.environment.name || "" }}</td>
         <td bst-table-cell>{{ activationKey.content_view.name || "" }}</td>
+        <td bst-table-cell>{{ activationKey.multi_content_view_environment ? 'Yes' : 'No' }}</td>
       </tr>
       </tbody>
     </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-host-collections-modal.controller.js

@@ -69,8 +69,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkHostCollecti
 
             if (action === 'add') {
                 HostBulkAction.addHostCollections(params, success, error);
+                $scope.ok();
             } else if (action === 'remove') {
                 HostBulkAction.removeHostCollections(params, success, error);
+                $scope.ok();
             }
         };
 

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

@@ -10,7 +10,7 @@
 
     <div bst-alert="info" ng-show="hostCollections.action == 'add'">
       <span translate>
-        Are you sure you want to add the {{ table.numSelected }} content host(s) selected to the host collection(s) chosen?
+        Are you sure you want to add the content host(s) selected to the host collection(s) chosen?
       </span>
       <div>
         <button type="button" class="btn btn-default" ng-click="performHostCollectionAction()" translate>Yes</button>
@@ -20,7 +20,7 @@
 
     <div bst-alert="info" ng-show="hostCollections.action == 'remove'">
       <span translate>
-        Are you sure you want to remove the {{ table.numSelected }} content host(s) selected from the host collection(s) chosen?
+        Are you sure you want to remove the content host(s) selected from the host collection(s) chosen?
       </span>
       <div>
         <button type="button" class="btn btn-default" ng-click="performHostCollectionAction()" translate>Yes</button>
@@ -84,8 +84,8 @@
   </div>
 
   <div data-block="modal-footer">
-    <button type="button" class="btn btn-primary" ng-click="ok()" translate>
-      Done
+    <button type="button" class="btn btn-default" ng-click="ok()" translate>
+      Cancel
     </button>
   </div>
 </div>

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

@@ -40,6 +40,15 @@
                 parent: 'debs'
             }
         })
+        .state('deb.dependencies', {
+            url: '/dependencies',
+            permission: ['view_products', 'view_content_views'],
+            templateUrl: 'debs/details/views/deb-dependencies.html',
+            ncyBreadcrumb: {
+                label: "{{ 'Dependencies' | translate }}",
+                parent: 'deb.info'
+            }
+        })
         .state('deb.repositories', {
             url: '/repositories',
             permission: ['view_products'],

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/details/views/deb-dependencies.html

@@ -0,0 +1,54 @@
+<span page-title ng-model="deb">{{ 'Deb: ' | translate }} {{ deb.nva }}</span>
+
+<section>
+
+  <div ng-if="deb.depends.length > 0" class="details fl">
+    <h4 translate><b>Depends</b></h4>
+    <div ng-repeat="item in deb.depends | orderBy:'toString()'">
+      {{ item }}
+    </div>
+  </div>
+
+  <div ng-if="deb.pre_depends.length > 0" class="details fl">
+    <h4 translate><b>Pre-Depends</b></h4>
+    <div ng-repeat="item in deb.pre_depends | orderBy:'toString()'">
+      {{ item }}
+    </div>
+  </div>
+
+  <div ng-if="deb.recommends.length > 0" class="details fl">
+    <h4 translate><b>Recommends</b></h4>
+    <div ng-repeat="item in deb.recommends | orderBy:'toString()'">
+      {{ item }}
+    </div>
+  </div>
+
+  <div ng-if="deb.suggests.length > 0" class="details fl">
+    <h4 translate><b>Suggests</b></h4>
+    <div ng-repeat="item in deb.suggests | orderBy:'toString()'">
+      {{ item }}
+    </div>
+  </div>
+
+  <div ng-if="deb.enhances.length > 0" class="details fl">
+    <h4 translate><b>Enhances</b></h4>
+    <div ng-repeat="item in deb.enhances | orderBy:'toString()'">
+      {{ item }}
+    </div>
+  </div>
+
+  <div ng-if="deb.breaks.length > 0" class="details fl">
+    <h4 translate><b>Breaks</b></h4>
+    <div ng-repeat="item in deb.breaks | orderBy:'toString()'">
+      {{ item }}
+    </div>
+  </div>
+
+  <div ng-if="deb.conflicts.length > 0" class="details fl">
+    <h4 translate><b>Conflicts</b></h4>
+    <div ng-repeat="item in deb.conflicts | orderBy:'toString()'">
+      {{ item }}
+    </div>
+  </div>
+
+</section>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/details/views/deb-info.html

@@ -2,7 +2,7 @@
 
 <div data-extend-template="layouts/full-page-details.html">
   <div data-block="content">
-    <h4 translate>Basic Information</h4>
+    <h4 translate>Package Information</h4>
 
     <dl class="dl-horizontal dl-horizontal-left">
       <dt translate>Installed On</dt>
@@ -46,6 +46,18 @@
 
       <dt translate>Description</dt>
       <dd>{{ deb.description }}</dd>
+
+      <dt translate>Section</dt>
+      <dd>{{ deb.section }}</dd>
+
+      <dt translate>Maintainer</dt>
+      <dd>{{ deb.maintainer }}</dd>
+
+      <dt translate>Homepage</dt>
+      <dd>{{ deb.homepage }}</dd>
+
+      <dt translate>Installed size</dt>
+      <dd>{{ deb.installed_size }} kB</dd>
     </dl>
     <div class="divider"></div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/details/views/deb.html

@@ -14,6 +14,13 @@
           </span>
         </a>
       </li>
+      <li ng-class="{active: isState('deb.dependencies')}">
+        <a ui-sref="deb.dependencies">
+          <span translate>
+            Dependencies
+          </span>
+        </a>
+      </li>
       <li ng-show="permitted('view_products')" ng-class="{active: isState('deb.repositories')}">
         <a ui-sref="deb.repositories">
           <span translate>
@@ -34,4 +41,4 @@
   <div data-block="content">
     <section ui-view></section>
   </div>
-</div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/apply-errata-confirm.html

@@ -119,7 +119,7 @@
     <div class="checkbox" ng-show="updates.length > 0">
       <label>
         <input name="noDepSolve" ng-model="noDepSolve" type="checkbox"/>
-        <span translate>Skip dependency solving for a significant speed increase. If the update cannot be applied to the host, delete the incremental content view version and retry the application with dependency solving turned on.</span>
+        <b><span translate>Skip dependency solving for a significant speed increase. If the update cannot be applied to the host, delete the incremental content view version and retry the application with dependency solving turned on.</span></b>
       </label>
     </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -87,6 +87,10 @@
                 on-save="save(repository)"
                 ng-if='option.input_type=="textarea"'>
             </dd>
+            <dd bst-edit-number="genericRemoteOptions[$index].value"
+                on-save="save(repository)"
+                ng-if='option.input_type=="number"'>
+            </dd>
         </span>
       </span>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html

@@ -283,6 +283,17 @@
             {{option.description}}
           </p>
         </div>
+        <div ng-if='option.input_type=="number"' bst-form-group label="{{ option.title | translate }}">
+          <input
+            name="option_name"
+            ng-model="genericRemoteOptions[$index].value"
+            type="number"
+            min="0"
+            placeholder="default value is {{ option.default }}"/>
+          <p class="help-block" translate>
+            {{option.description}}
+          </p>
+        </div>
       </div>
 
       <div bst-form-group label="{{ 'Download Policy' | translate }}" ng-if="repository.content_type === 'yum' || repository.content_type === 'deb' || repository.content_type === 'docker'">

data/engines/bastion_katello/app/assets/stylesheets/bastion_katello/activation_keys.scss

@@ -4,7 +4,7 @@
   margin-bottom:0.3rem
 }
 
-.repository-type-label {
+.repository-type-label, .repository-status-label {
   padding-left: 15px;
   font-weight: normal;
   span {

data/engines/bastion_katello/lib/bastion_katello/engine.rb

@@ -35,7 +35,7 @@ module BastionKatello
           { 'consumerCertRPM' => consumer_cert_rpm,
             'defaultDownloadPolicy' => !Foreman.in_rake? && db_migrated && Setting['default_download_policy'],
             'remoteExecutionPresent' => true,
-            'hostToolingEnabled' => true
+            'hostToolingEnabled' => true,
           }
         end
       )

data/lib/katello/engine.rb

@@ -33,29 +33,29 @@ module Katello
         :consumer_cert_rpm => 'katello-ca-consumer-latest.noarch.rpm',
         :consumer_cert_sh => 'katello-rhsm-consumer',
         :event_daemon => {
-          enabled: true
+          enabled: true,
         },
         :pulp => {
           :default_login => 'admin',
           :skip_checksum_validation => false,
           :upload_chunk_size => 1_048_575, # upload size in bytes to pulp. see SSLRenegBufferSize in apache
           :sync_threads => 4,
-          :sync_KBlimit => nil
+          :sync_KBlimit => nil,
         },
         :candlepin => {
           :url => 'https://localhost:8443/candlepin',
           :oauth_key => 'katello',
           :oauth_secret => 'katello',
           :ca_cert_file => nil,
-          :bulk_load_size => 1000
+          :bulk_load_size => 1000,
         },
         :candlepin_events => {
           :broker_host => 'localhost',
           :broker_port => 61_613,
           :queue_name => 'katello.candlepin',
           :subscription_name => 'candlepin_events',
-          :client_id => 'katello_candlepin_event_monitor'
-        }
+          :client_id => 'katello_candlepin_event_monitor',
+        },
       }
 
       SETTINGS[:katello] = default_settings.deep_merge(SETTINGS[:katello] || {})
@@ -79,12 +79,14 @@ module Katello
 
     # make sure the Katello plugin is initialized before `after_initialize`
     # hook so that the resumed Dynflow tasks can rely on everything ready.
-    initializer 'katello.register_plugin', :before => :finisher_hook, :after => 'foreman_remote_execution.register_plugin' do
-      ::Foreman::AccessControl::Permission.prepend ::Katello::Concerns::PermissionExtensions
-      require 'katello/plugin'
+    initializer 'katello.register_plugin', :before => :finisher_hook, :after => 'foreman_remote_execution.register_plugin' do |app|
+      app.reloader.to_prepare do
+        ::Foreman::AccessControl::Permission.prepend ::Katello::Concerns::PermissionExtensions
+        require 'katello/plugin'
 
-      # extend builtin permissions from core with new actions
-      require 'katello/permissions'
+        # extend builtin permissions from core with new actions
+        require 'katello/permissions'
+      end
     end
 
     initializer "katello.set_dynflow_middlewares", :before => :finisher_hook do |_app|
@@ -185,11 +187,11 @@ module Katello
       # We need to explicitly load this files because Foreman has
       # similar strucuture and if the Foreman files are loaded first,
       # autoloading doesn't work.
-      require_dependency "#{Katello::Engine.root}/app/lib/katello/api/v2/rendering"
-      require_dependency "#{Katello::Engine.root}/app/controllers/katello/api/api_controller"
-      require_dependency "#{Katello::Engine.root}/app/controllers/katello/api/v2/api_controller"
-      require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp"
-      require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp_node"
+      # require_dependency "#{Katello::Engine.root}/app/lib/katello/api/v2/rendering"
+      # require_dependency "#{Katello::Engine.root}/app/controllers/katello/api/api_controller"
+      # require_dependency "#{Katello::Engine.root}/app/controllers/katello/api/v2/api_controller"
+      # require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp"
+      # require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp_node"
 
       #Api controller extensions
       ::Api::V2::HostsController.include Katello::Concerns::Api::V2::HostsControllerExtensions