katello 3.9.1 → 3.10.0.rc1

data/db/migrate/20181017181806_available_module_streams.rb

@@ -0,0 +1,34 @@
+class AvailableModuleStreams < ActiveRecord::Migration[5.2]
+  def up
+    create_table :katello_available_module_streams do |t|
+      t.string :name
+      t.string :stream
+    end
+
+    create_table :katello_host_available_module_streams do |t|
+      t.references :host, :null => false, :index => true
+      t.references :available_module_stream, :null => false, :index => false
+      t.text :installed_profiles
+      t.string :status
+    end
+
+    add_index :katello_available_module_streams, [:name, :stream], :unique => true, :name => :katello_available_module_streams_name_stream
+
+    add_foreign_key :katello_host_available_module_streams, :hosts,
+                    :name => :katello_hems_host_id_fk, :column => :host_id
+
+    add_foreign_key :katello_host_available_module_streams, :katello_available_module_streams,
+                    :name => :katello_hems_available_module_stream_id_fk, :column => :available_module_stream_id
+
+    add_index :katello_host_available_module_streams, :available_module_stream_id,
+              name: :index_katello_hems_available_module_stream_id
+  end
+
+  def down
+    remove_foreign_key :katello_host_available_module_streams, name: :katello_hems_host_id_fk
+    remove_foreign_key :katello_host_available_module_streams, name: :katello_hems_available_module_stream_id_fk
+
+    drop_table :katello_host_available_module_streams
+    drop_table :katello_available_module_streams
+  end
+end

data/db/migrate/20181027014323_add_applicable_modules.rb

@@ -0,0 +1,24 @@
+class AddApplicableModules < ActiveRecord::Migration[5.2]
+  def change
+    create_table "katello_content_facet_applicable_module_streams" do |t|
+      t.references 'content_facet', :null => false, :index => { :name => :katello_cfams_cf_idx }
+      t.references 'module_stream', :null => false, :index => { :name => :katello_cfams_ms_idx }
+    end
+
+    add_foreign_key :katello_content_facet_applicable_module_streams,
+                    :katello_module_streams,
+                    column: :module_stream_id,
+                    name: :katello_cfams_mod_stream_id_fk
+
+    add_foreign_key :katello_content_facet_applicable_module_streams,
+                    :katello_content_facets,
+                    column: :content_facet_id,
+                    name: :katello_cfams_cf_fk
+
+    add_index "katello_content_facet_applicable_module_streams", ["module_stream_id", "content_facet_id"],
+              :name => "katello_content_facet_module_stream_rid_cfid", :unique => true
+
+    add_column :katello_content_facets, :applicable_module_stream_count, :integer, :null => false, :default => 0
+    add_column :katello_content_facets, :upgradable_module_stream_count, :integer, :null => false, :default => 0
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/module-stream-actions.service.js

@@ -16,7 +16,8 @@
                 { action: 'disable', description: translate("Disable")},
                 { action: 'install', description: translate("Install")},
                 { action: 'update', description: translate("Update")},
-                { action: 'remove', description: translate("Remove")}
+                { action: 'remove', description: translate("Remove")},
+                { action: 'reset', description: translate("Reset")}
             ];
         };
     }

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/views/content-credential-info.html

@@ -12,7 +12,7 @@
       <dd>{{ contentCredential.content_type | contentTypeFilter }}</dd>
 
       <dt translate>Content</dt>
-      <dd bst-edit-custom="contentCredential.content"
+      <dd style="font-family: monospace" bst-edit-custom="contentCredential.content"
           readonly="denied('edit_content_credentials', contentCredential)"
           on-save="save(contentCredential)">
         <form role="form"

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

@@ -33,6 +33,7 @@
                   ng-model="contentCredential.pastedContent"
                   tabindex="1"
                   class="form-control"
+                  style="font-family: monospace"
                   rows="15"
                   placeholder="{{ 'Paste contents of Content Credential' | translate }}">
         </textarea>

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

@@ -9,7 +9,7 @@
       <input type="hidden" name="remote_action" ng-value="moduleStreamActionFormValues.remoteAction"/>
       <input type="hidden" name="module_stream_action" ng-value="moduleStreamActionFormValues.moduleStreamAction"/>
       <input type="hidden" name="module_spec" ng-value="moduleStreamActionFormValues.moduleSpec"/>
-      <input type="hidden" name="scoped_search" ng-value="errataActionFormValues.search"/>
+      <input type="hidden" name="scoped_search" ng-value="moduleStreamActionFormValues.search"/>
       <input type="hidden" name="host_ids" ng-value="moduleStreamActionFormValues.hostIds"/>
       <input type="hidden" name="customize" ng-value="moduleStreamActionFormValues.customize"/>
       <input type="hidden" name="authenticity_token" ng-value="moduleStreamActionFormValues.authenticityToken"/>
@@ -67,4 +67,4 @@
   <div data-block="modal-footer">
     <button class="btn btn-default" ng-click="cancel()" translate>Cancel</button>
   </div>
-</div>
+</div>

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

@@ -120,55 +120,70 @@
         <section>
 
           <div class="detail">
-            <span class="info-label" translate>Type</span>
+            <span class="info-label" translate><b>Type</b></span>
             <span class="info-value">{{ erratum.type }}</span>
           </div>
           <div class="detail">
-            <span class="info-label" translate>Title</span>
+            <span class="info-label" translate><b>Title</b></span>
             <span class="info-value">{{ erratum.title }}</span>
           </div>
           <div class="detail">
-            <span class="info-label" translate>Issued</span>
+            <span class="info-label" translate><b>Issued</b></span>
             <span class="info-value">{{ erratum.issued }}</span>
           </div>
           <div class="detail">
-            <span class="info-label" translate>Updated</span>
+            <span class="info-label" translate><b>Updated</b></span>
             <span class="info-value">{{ erratum.updated }}</span>
           </div>
           <div class="detail">
-            <span class="info-label" translate>Reboot Suggested</span>
+            <span class="info-label" translate><b>Reboot Suggested</b></span>
             <span class="info-value">{{ erratum.reboot_suggested }}</span>
           </div>
 
           <div class="detail">
-            <span class="info-label" translate>Description</span>
+            <span class="info-label" translate><b>Description</b></span>
             <span class="info-value">
-        <p ng-repeat="paragraph in erratum.description.split('\n\n')">
-          {{ paragraph }}
-        </p>
-      </span>
+              <p ng-repeat="paragraph in erratum.description.split('\n\n')">
+                {{ paragraph }}
+              </p>
+            </span>
           </div>
 
           <div class="detail">
-            <span class="info-label" translate>Solution</span>
+            <span class="info-label" translate><b>Solution</b></span>
             <span class="info-value">
-        <p ng-repeat="paragraph in erratum.solution.split('\n\n')">
-          {{ paragraph }}
-        </p>
-      </span>
+              <p ng-repeat="paragraph in erratum.solution.split('\n\n')">
+                {{ paragraph }}
+              </p>
+            </span>
           </div>
 
           <div class="detail">
-            <span class="info-label" translate>Packages</span>
+            <span class="info-label" translate><b>Packages</b></span>
             <span class="info-value">
-        <ul>
-          <li ng-repeat="package in erratum.packages">
-            {{ package }}
-          </li>
-        </ul>
-      </span>
+              <ul>
+                <li ng-repeat="package in erratum.packages">
+                  {{ package }}
+                </li>
+              </ul>
+            </span>
           </div>
 
+          <div class="detail">
+            <span class="info-label" translate><b>Module Streams</b></span>
+            <span class="info-value">
+              <ul>
+                <li ng-repeat="moduleStream in erratum.module_streams">
+                  {{ moduleStream.name + ":" + moduleStream.stream }}
+                  <ul>
+                    <li ng-repeat="package in moduleStream.packages">
+                      {{ package }}
+                    </li>
+                  </ul>
+                </li>
+              </ul>
+            </span>
+          </div>
         </section>
       </div>
   </div>

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

@@ -37,7 +37,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostsController',
             'sort_order': 'ASC'
         };
 
-        $scope.csvQuery = $httpParamSerializer(params);
+        $scope.csvQuery = function () {
+            return $httpParamSerializer(params);
+        };
+
         nutupane = new Nutupane(Host, params);
         $scope.controllerName = 'hosts';
         nutupane.masterOnly = true;

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

@@ -5,24 +5,24 @@
  * @requires $scope
  * @resource $timeout
  * @resource $window
- * @requires ModuleStream
+ * @requires HostModuleStream
  * @requires Nutupane
  * @requires ModuleStreamActions
+ * @requires translate
  *
  * @description
  *   Provides the functionality for the content host module streams list and actions.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostModuleStreamsController',
-    ['$scope', '$timeout', '$window', 'ModuleStream', 'Nutupane', 'BastionConfig', 'ModuleStreamActions',
-    function ($scope, $timeout, $window, ModuleStream, Nutupane, BastionConfig, ModuleStreamActions) {
+    ['$scope', '$timeout', '$window', 'HostModuleStream', 'Nutupane', 'BastionConfig', 'ModuleStreamActions', 'translate',
+    function ($scope, $timeout, $window, HostModuleStream, Nutupane, BastionConfig, ModuleStreamActions, translate) {
         $scope.moduleStreamActions = ModuleStreamActions.getActions();
 
         $scope.working = false;
 
-        $scope.moduleStreamsNutupane = new Nutupane(ModuleStream, {
-            'host_ids': [$scope.$stateParams.hostId],
-            'name_stream_only': '1'
-        });
+        $scope.nutupaneParams = { id: $scope.$stateParams.hostId };
+
+        $scope.moduleStreamsNutupane = new Nutupane(HostModuleStream, $scope.nutupaneParams);
 
         $scope.moduleStreamsNutupane.masterOnly = true;
         $scope.table = $scope.moduleStreamsNutupane.table;
@@ -34,6 +34,17 @@ angular.module('Bastion.content-hosts').controller('ContentHostModuleStreamsCont
             remoteAction: 'module_stream_action'
         };
 
+        $scope.moduleStreamStatus = function(module) {
+            var statuses = [];
+            if (["enabled", "disabled"].includes(module.status)) {
+                statuses.push(translate(_.capitalize(module.status)));
+            }
+            if (module.installed_profiles.length) {
+                statuses.push(translate("Installed"));
+            }
+            return statuses.join(", ");
+        };
+
         $scope.performViaRemoteExecution = function(moduleSpec, actionType) {
             $scope.working = true;
             $scope.moduleStreamActionFormValues.moduleSpec = moduleSpec;
@@ -44,5 +55,14 @@ angular.module('Bastion.content-hosts').controller('ContentHostModuleStreamsCont
                 angular.element('#moduleStreamActionForm').submit();
             }, 0);
         };
+
+        $scope.$watch(
+          function(scope) {
+              return scope.nutupaneParams.status;
+          },
+          function() {
+              $scope.moduleStreamsNutupane.refresh();
+          }
+        );
     }
 ]);

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

@@ -8,6 +8,7 @@
 </div>
 
 <div ng-if="host && host.hasContent()">
+
   <form id="moduleStreamActionForm" method="post" action="/katello/remote_execution">
     <input type="hidden" name="remote_action" ng-value="moduleStreamActionFormValues.remoteAction"/>
     <input type="hidden" name="module_stream_action" ng-value="moduleStreamActionFormValues.moduleStreamAction"/>
@@ -18,6 +19,23 @@
   </form>
 
   <div data-extend-template="layouts/partials/table.html">
+    <span data-block="filters">
+      <div class="kat-clearfix">
+        <div class="kat-inline">
+          <label translate>Filter by Status: </label>
+        </div>
+        <div class="kat-inline">
+          <select ng-model="nutupaneParams.status">
+            <option value="">All</option>
+            <option value="enabled" translate>Enabled</option>
+            <option value="installed" translate>Installed</option>
+            <option value="disabled" translate>Disabled</option>
+            <option value="unknown" translate>Unknown</option>
+            <option value="upgradable" translate>Upgrade Available</option>
+          </select>
+        </div>
+      </div>
+    </span>
 
     <span data-block="no-rows-message" translate>
       There are no Module Streams to display.
@@ -32,6 +50,8 @@
           <tr bst-table-head>
             <th bst-table-column translate>Name</th>
             <th bst-table-column translate>Stream</th>
+            <th bst-table-column translate>Status</th>
+            <th bst-table-column translate>Installed Profile</th>
             <th bst-table-column translate>Actions</th>
           </tr>
         </thead>
@@ -42,6 +62,15 @@
               <a href="/module_streams?search=module_spec%3D{{ module.module_spec }}+and+host%3D{{ host.name }}">
               {{ module.name }}</a></td>
             <td bst-table-cell>{{ module.stream }}</td>
+            <td bst-table-cell>
+              {{ moduleStreamStatus(module) }}
+              <span ng-if="module.upgradable" class="pficon pficon-info"
+                    uib-tooltip="{{ 'Upgrade Available' | translate }}"
+              > </span>
+            </td>
+            <td bst-table-cell>
+              {{ module.installed_profiles.join(", ") }}
+            </td>
             <td bst-table-cell>
               <div class="dropdown" ng-hide="!remoteExecutionPresent || denied('edit_content_hosts', contentHost)">
                 <button class="btn btn-default dropdown-toggle" ng-disabled="$scope.working" type="button" id="dropdownMenu1" data-toggle="dropdown"> Actions

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

@@ -34,10 +34,24 @@
 
   <dt translate>Packages</dt>
   <dd>
-    <ul class="list-unstyled">
+    <ul>
       <li ng-repeat="package in erratum.packages">
         {{ package }}
       </li>
     </ul>
   </dd>
+
+  <dt translate>Module Streams</dt>
+  <dd>
+    <ul>
+      <li ng-repeat="moduleStream in erratum.module_streams">
+        {{ moduleStream.name + ":" + moduleStream.stream }}
+        <ul>
+          <li ng-repeat="package in moduleStream.packages">
+            {{ package }}
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </dd>
 </dl>

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

@@ -7,7 +7,7 @@
   </div>
 
   <div data-block="list-actions">
-    <a href="/hosts/content_hosts.csv?{{csvQuery}}" class="btn btn-default" target="_self">
+    <a href="/hosts/content_hosts.csv?{{csvQuery()}}" class="btn btn-default" target="_self">
       <span translate>Export</span>
     </a>
     <button class="btn btn-default"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-promotion.controller.js

@@ -99,7 +99,6 @@ angular.module('Bastion.content-views').controller('ContentViewPromotionControll
             ContentViewVersion.promote({id: $scope.version.id,
                                         'environment_id': $scope.selectedEnvironment.id,
                                         'description': $scope.description,
-                                        'force_yum_metadata_regeneration': $scope.forceMetadataRegeneration,
                                         force: true},
                 success, failure);
         };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-publish.controller.js

@@ -34,8 +34,7 @@ angular.module('Bastion.content-views').controller('ContentViewPublishController
 
         $scope.publish = function (contentView) {
             var description = $scope.version.description,
-                forceMetadataRegeneration = $scope.version.forceMetadataRegeneration,
-                data = {'id': contentView.id, 'description': description, 'force_yum_metadata_regeneration': forceMetadataRegeneration};
+                data = {'id': contentView.id, 'description': description};
             $scope.working = true;
             ContentView.publish(data, success, failure);
         };

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

@@ -170,7 +170,9 @@ angular.module('Bastion.content-views').controller('ContentViewVersionsControlle
 
         $scope.status = function (version) {
             var taskTypes = $scope.taskTypes,
-                deletionEvents = findTaskTypes(version['active_history'], taskTypes.deletion),
+                deletionEvents = _.filter(findTaskTypes(version['active_history'], taskTypes.deletion), function(history) {
+                    return history.environment != null;
+                }),
                 promotionEvents = findTaskTypes(version['active_history'], taskTypes.promotion),
                 publishEvents = findTaskTypes(version['active_history'], taskTypes.publish),
                 messages = "";

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

@@ -16,7 +16,7 @@ angular.module('Bastion.content-views').controller('ContentViewHistoryController
 
         nutupane = new Nutupane(ContentViewHistory, {
             contentViewId: $scope.$stateParams.contentViewId,
-            'sort_by': 'created_at',
+            'sort_by': 'content_view_version_id',
             'sort_order': 'DESC'
         });
         $scope.controllerName = 'katello_content_views';

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

@@ -36,21 +36,6 @@
     </textarea>
   </div>
 
-  <div class="checkbox">
-    <label translate>
-      <input id="forceMetadataRegeneration"
-             name="forceMetadataRegeneration"
-             ng-model="forceMetadataRegeneration"
-             type="checkbox"/>
-      Force Yum Metadata Regeneration
-    </label>
-    <i class="fa fa-question-circle"
-       uib-tooltip="{{ 'Forces metadata regeneration on yum repos even if the contents of the repo have not changed' | translate }}"
-       tooltip-animation="false"
-       tooltip-append-to-body="true">
-    </i>
-  </div>
-
   <div>
     <button type="button" class="btn btn-primary btn-lg" ng-disabled="promoting || !selectedEnvironment" ng-click="verifySelection()" translate>
       Promote Version

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

@@ -45,20 +45,6 @@
     </textarea>
       </div>
 
-      <div class="checkbox">
-        <label translate>
-          <input id="forceMetadataRegeneration"
-                 name="forceMetadataRegeneration"
-                 ng-model="version.forceMetadataRegeneration"
-                 type="checkbox"/>
-          Force Yum Metadata Regeneration
-        </label>
-        <i class="fa fa-question-circle"
-           uib-tooltip="{{ 'Forces metadata regeneration on yum repos even if the contents of the repo have not changed' | translate }}"
-           tooltip-animation="false"
-           tooltip-append-to-body="true"></i>
-      </div>
-
       <div bst-form-buttons
            on-cancel="transitionTo('content-view.versions', {contentViewId: contentView.id})"
            on-save="publish(contentView)"