katello 3.3.0.rc1.1 → 3.3.0.rc2

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

@@ -4,39 +4,29 @@
  *
  * @requires $scope
  * @requires ContentView
+ * @requires GlobalNotification
  *
  * @description
  *   Provides the functionality for deleting Content Views
  */
 angular.module('Bastion.content-views').controller('ContentViewDeletionController',
-    ['$scope', 'ContentView', function ($scope, ContentView) {
+    ['$scope', 'ContentView', 'GlobalNotification', function ($scope, ContentView, GlobalNotification) {
 
         function success() {
-            $scope.removeRow($scope.contentView.id);
-            $scope.transitionTo('content-views.index');
+            $scope.transitionTo('content-views');
             $scope.working = false;
         }
 
         function failure(response) {
-            $scope.$parent.errorMessages = [response.data.displayMessage];
+            GlobalNotification.setErrorMessage(response.data.displayMessage);
             $scope.working = false;
         }
 
-        if (angular.isUndefined($scope.versions)) {
-            $scope.reloadVersions();
-        }
-
         $scope.delete = function () {
             $scope.working = true;
             ContentView.remove({id: $scope.contentView.id}, success, failure);
         };
 
-        $scope.conflictingVersions = function () {
-            return _.reject($scope.versions, function (version) {
-                return version.environments.length === 0;
-            });
-        };
-
         $scope.environmentNames = function (version) {
             return _.map($scope.readableEnvironments(version), 'name');
         };
@@ -47,5 +37,6 @@ angular.module('Bastion.content-views').controller('ContentViewDeletionControlle
             });
         };
 
+        $scope.conflictingVersions = ContentView.conflictingVersions({id: $scope.$stateParams.contentViewId});
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-activation-keys.controller.js

@@ -43,8 +43,8 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionAc
             return term + " AND " + addition;
         };
 
-        $scope.detailsTable = nutupane.table;
-        $scope.detailsTable.closeItem = function () {};
+        $scope.table = nutupane.table;
+        $scope.table.closeItem = function () {};
 
         $scope.environments = Organization.readableEnvironments({id: CurrentOrganization});
         $scope.initEnvironmentWatch($scope);

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

@@ -5,14 +5,15 @@
  * @requires $scope
  * @requires ContentView
  * @requires translate
+ * @requires GlobalNotification
  *
  * @description
  *   Provides the confirmation and submit code for the content view version deletion
  *   workflow
  */
 angular.module('Bastion.content-views').controller('ContentViewVersionDeletionConfirmController',
-    ['$scope', 'ContentView', 'translate',
-    function ($scope, ContentView, translate) {
+    ['$scope', 'ContentView', 'translate', 'GlobalNotification',
+    function ($scope, ContentView, translate, GlobalNotification) {
 
         function success() {
             var message = translate('Successfully initiated removal of %cv version %ver.');
@@ -22,13 +23,15 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
             }
 
             message = message.replace('%cv', $scope.contentView.name).replace('%ver', $scope.version.version);
-            $scope.successMessages.push(message);
-            $scope.transitionTo('content-views.details.versions', {contentViewId: $scope.contentView.id});
+            GlobalNotification.setSuccessMessage(message);
+            $scope.transitionTo('content-view.versions', {contentViewId: $scope.contentView.id});
         }
 
         function error(response) {
             $scope.deleting = false;
-            $scope.$parent.$parent.errorMessages = response.data.errors;
+            angular.forEach(response.data.errors, function (responseError) {
+                GlobalNotification.setErrorMessage(responseError);
+            });
         }
 
         $scope.validateEnvironmentSelection();

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

@@ -43,8 +43,8 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
 
             return term + " AND " + addition;
         };
-        $scope.detailsTable = nutupane.table;
-        $scope.detailsTable.closeItem = function () {};
+        $scope.table = nutupane.table;
+        $scope.table.closeItem = function () {};
 
         $scope.environments = Organization.readableEnvironments({id: CurrentOrganization});
         $scope.initEnvironmentWatch($scope);

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

@@ -19,10 +19,10 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
         $scope.version = ContentViewVersion.get({id: $scope.$stateParams.versionId});
 
         $scope.stepStates = {
-            environments: 'content-views.details.version-deletion.environments',
-            activationKeys: 'content-views.details.version-deletion.activation-keys',
-            contentHosts: 'content-views.details.version-deletion.content-hosts',
-            confirm: 'content-views.details.version-deletion.confirm'
+            environments: 'content-view.version-deletion.environments',
+            activationKeys: 'content-view.version-deletion.activation-keys',
+            contentHosts: 'content-view.version-deletion.content-hosts',
+            confirm: 'content-view.version-deletion.confirm'
         };
 
         if (angular.isUndefined($scope.deleteOptions)) {
@@ -92,7 +92,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
 
         $scope.validateEnvironmentSelection = function () {
             if (!$scope.deleteOptions.deleteArchive && $scope.deleteOptions.environments.length === 0) {
-                $scope.transitionTo("content-views.details.version-deletion.environments",
+                $scope.transitionTo("content-view.version-deletion.environments",
                         {contentViewId: $scope.$stateParams.contentViewId, versionId: $scope.$stateParams.versionId});
             }
         };

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

@@ -3,15 +3,14 @@
 <div>
   <h3 translate>Remove {{ contentView.name }}</h3>
 
-  <div ng-show="conflictingVersions().length > 0">
+  <div ng-show="conflictingVersions.length > 0">
     <i class="fa fa-warning"></i>
     <span translate>
       {{ contentView.name }} cannot be deleted as one or more Content View Versions are still promoted to a Lifecycle Environment.
       Each Content View Version must be removed from their Lifecycle Environments before the Content View can be deleted.
     </span>
 
-    <br/><br/>
-    <table class="table table-striped table-bordered" bst-table="table">
+    <table class="table table-striped table-bordered">
       <thead>
         <tr>
           <th translate>Version</th>
@@ -20,13 +19,12 @@
         </tr>
       </thead>
       <tbody>
-        <tr ng-repeat="version in conflictingVersions()">
+        <tr ng-repeat="version in conflictingVersions">
           <td>{{ version.version }}</td>
           <td>{{ environmentNames(version).join(', ') }}</td>
           <td>
-            <a ui-sref="content-views.details.version-deletion.environments({contentViewId: contentView.id, versionId: version.id})" ng-show="version.permissions.deletable">
+            <a ui-sref="content-view.version-deletion.environments({contentViewId: contentView.id, versionId: version.id})" ng-show="version.permissions.deletable">
               <button class="btn btn-default">
-                <i class="fa fa-trash-o-o"></i>
                 <span translate>Remove Version</span>
               </button>
             </a>
@@ -36,7 +34,7 @@
     </table>
   </div>
 
-  <div class="details" ng-show="conflictingVersions().length === 0">
+  <div class="details" ng-show="conflictingVersions.length === 0">
     <p translate>
       Are you sure you want to remove Content View "{{ contentView.name }}"?
     </p>
@@ -48,16 +46,13 @@
       </span>
     </div>
 
-    <br/><br/>
-    <div class="fr">
-      <button ng-disabled="working" class="btn-danger btn-lg" ng-click="delete()" >
-        <i class="fa fa-spinner fa-spin" ng-show="working"></i>
-        <span translate>Remove</span>
-      </button>
+    <button ng-disabled="working" class="btn btn-danger" ng-click="delete()" >
+      <i class="fa fa-spinner fa-spin" ng-show="working"></i>
+      <span translate>Remove</span>
+    </button>
 
-      <a ui-sref="content-views.details.versions" ng-disabled="working" class="btn btn-default btn-lg"  translate role="button">
-        Cancel
-      </a>
-    </div>
+    <a ui-sref="content-view.versions" ng-disabled="working" class="btn btn-default"  translate role="button">
+      Cancel
+    </a>
   </div>
 </div>

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

@@ -3,8 +3,6 @@
   <section class="details details-full">
     <h3 translate>Activation Keys using Version {{ version.version }}</h3>
 
-    <div data-extend-template="content-views/deletion/views/version-deletion-breadcrumb.html"></div>
-
     <p translate>
       The Activation Keys listed below are currently using this Content View Version.  Before deleting the Version you must move these Activation Keys to a Lifecycle Environment where this Version is not in use.
     </p>
@@ -47,7 +45,7 @@
       </div>
 
       <div class="fr">
-        <a ui-sref="content-views.details.versions({contentViewId: contentView.id})" >
+        <a ui-sref="content-view.versions({contentViewId: contentView.id})" >
           <button class="btn btn-default" translate>
             Cancel
           </button>
@@ -68,7 +66,7 @@
     </a>
 
     <div ng-show="showKeys">
-      <div data-extend-template="layouts/details-nutupane.html">
+      <div data-extend-template="layouts/partials/table.html">
         <h5 translate>Affected Activation Keys</h5>
 
         <div data-block="selection-summary"></div>
@@ -82,7 +80,7 @@
           </thead>
 
           <tbody>
-            <tr bst-table-row ng-repeat="key in detailsTable.rows">
+            <tr bst-table-row ng-repeat="key in table.rows">
               <td bst-table-cell>
                   {{ key.name }}
               </td>

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

@@ -3,8 +3,6 @@
 <section class="details details-full">
   <h3 translate>Confirm Version Removal: Version {{ version.version }}</h3>
 
-  <div data-extend-template="content-views/deletion/views/version-deletion-breadcrumb.html"></div>
-
   <div class="details">
 
     <div ng-hide="deleteOptions.environments.length === 0">
@@ -62,7 +60,7 @@
     </div>
 
     <div class="fr">
-      <a ui-sref="content-views.details.versions({contentViewId: contentView.id})" >
+      <a ui-sref="content-view.versions({contentViewId: contentView.id})" >
         <button class="btn btn-default" ng-disabled="deleting" translate>
           Cancel
         </button>

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

@@ -1,89 +1,85 @@
 <span page-title ng-model="version">{{ "Remove Version" | translate }} {{ version.version }}</span>
 
-  <section class="details details-full">
-    <h3 translate>Content Hosts using Version {{ version.version }}</h3>
+<section class="details details-full">
+  <h3 translate>Content Hosts using Version {{ version.version }}</h3>
 
-    <div data-extend-template="content-views/deletion/views/version-deletion-breadcrumb.html"></div>
+  <p translate>
+    The Content Hosts listed below are currently using this Content View Version.  Before removing the version you must move these Content Hosts to an environment where this version is not in use.
+  </p>
 
-    <p translate>
-      The Content Hosts listed below are currently using this Content View Version.  Before removing the version you must move these Content Hosts to an environment where this version is not in use.
-    </p>
+  <p translate>
+    If you would prefer to move portions of these Content Hosts to different content views or environments click <a href="{{ contentHostsLink() }}">here</a>  to manage these Content Hosts in bulk.
+  </p>
+
+  <div class="details">
 
     <p translate>
-      If you would prefer to move portions of these Content Hosts to different content views or environments click <a href="{{ contentHostsLink() }}">here</a>  to manage these Content Hosts in bulk.
+      Please select a Lifecycle Environment and Content View to move these Content Hosts to:
     </p>
 
-    <div class="details">
-
-      <p translate>
-        Please select a Lifecycle Environment and Content View to move these Content Hosts to:
-      </p>
+    <div path-selector="environments"
+         ng-model="selectedEnvironment"
+         mode="singleSelect"></div>
 
-      <div path-selector="environments"
-           ng-model="selectedEnvironment"
-           mode="singleSelect"></div>
-
-      <div>
-        <span translate>Content View:</span>
-        <select ng-show="!fetchingViews && selectedEnvironment && contentViewsForEnvironment.length > 0"
-                ng-options="cv.id as cv.name for cv in contentViewsForEnvironment"
-                ng-model="selectedContentViewId"></select>
-        <i ng-show="fetchingViews" class="fa fa-spinner fa-spin"></i>
-        <span translate ng-hide="selectedEnvironment">
-          Please select an environment.
-        </span>
-        <span translate ng-show="!fetchingViews && selectedEnvironment && contentViewsForEnvironment.length === 0">
-          No Content Views available, please select another environment.
-        </span>
-      </div>
+    <div>
+      <span translate>Content View:</span>
+      <select ng-show="!fetchingViews && selectedEnvironment && contentViewsForEnvironment.length > 0"
+              ng-options="cv.id as cv.name for cv in contentViewsForEnvironment"
+              ng-model="selectedContentViewId"></select>
+      <i ng-show="fetchingViews" class="fa fa-spinner fa-spin"></i>
+      <span translate ng-hide="selectedEnvironment">
+        Please select an environment.
+      </span>
+      <span translate ng-show="!fetchingViews && selectedEnvironment && contentViewsForEnvironment.length === 0">
+        No Content Views available, please select another environment.
+      </span>
+    </div>
 
-      <div class="fr">
-        <a ui-sref="content-views.details.versions({contentViewId: contentView.id})" >
-          <button class="btn btn-default" translate>
-            Cancel
-          </button>
-        </a>
-        <button class="btn btn-default" ng-click="transitionBack()" translate>
-          Back
+    <div class="fr">
+      <a ui-sref="content-view.versions({contentViewId: contentView.id})" >
+        <button class="btn btn-default" translate>
+          Cancel
         </button>
-        <button class="btn btn-primary" ng-click="processSelection()" ng-disabled="selectedContentViewId === undefined" translate>
-          Next
-        </button>
-      </div>
+      </a>
+      <button class="btn btn-default" ng-click="transitionBack()" translate>
+        Back
+      </button>
+      <button class="btn btn-primary" ng-click="processSelection()" ng-disabled="selectedContentViewId === undefined" translate>
+        Next
+      </button>
     </div>
+  </div>
 
-    <br/><br/>
-    <a ng-click="toggleHosts()">
-      <p ng-show="!showHosts" translate>Show affected Content Hosts</p>
-      <p ng-show="showHosts" translate>Hide affected Content Hosts</p>
-    </a>
+  <br/><br/>
+  <a ng-click="toggleHosts()">
+    <p ng-show="!showHosts" translate>Show affected Content Hosts</p>
+    <p ng-show="showHosts" translate>Hide affected Content Hosts</p>
+  </a>
 
-    <div ng-show="showHosts">
-      <div data-extend-template="layouts/details-nutupane.html">
-        <h5 translate>Affected Content Hosts</h5>
+  <div ng-show="showHosts">
+    <div data-extend-template="layouts/partials/table.html">
+      <h5 translate>Affected Content Hosts</h5>
 
-        <div data-block="selection-summary"></div>
 
-        <table data-block="table"  class="table table-striped table-bordered">
-          <thead>
-            <tr bst-table-head>
-              <th bst-table-column="name"><span translate>Name</span></th>
-              <th bst-table-column="name"><span translate>Lifecycle Environment</span></th>
-            </tr>
-          </thead>
+      <table data-block="table"  class="table table-striped table-bordered">
+        <thead>
+          <tr bst-table-head>
+            <th bst-table-column="name"><span translate>Name</span></th>
+            <th bst-table-column="name"><span translate>Lifecycle Environment</span></th>
+          </tr>
+        </thead>
 
-          <tbody>
-            <tr bst-table-row ng-repeat="host in detailsTable.rows">
-              <td bst-table-cell>
-                  {{ host.name }}
-              </td>
-              <td bst-table-cell>
-                  {{ host.content_facet_attributes.lifecycle_environment_name }}
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
+        <tbody>
+          <tr bst-table-row ng-repeat="host in table.rows">
+            <td bst-table-cell>
+                {{ host.name }}
+            </td>
+            <td bst-table-cell>
+                {{ host.content_facet_attributes.lifecycle_environment_name }}
+            </td>
+          </tr>
+        </tbody>
+      </table>
     </div>
-
-  </section>
+  </div>
+</section>

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

@@ -4,8 +4,6 @@
 
   <h3 translate>Delete Version {{ version.version }}</h3>
 
-  <div data-extend-template="content-views/deletion/views/version-deletion-breadcrumb.html"></div>
-
   <div class="details details-full">
     <div bst-alert="warning" ng-hide="allSelectable()">
        <span translate> This Version cannot be deleted from some of the Lifecycle Environments due to one of the reasons below.</span>
@@ -60,7 +58,7 @@
 
     <br/>
     <div class="fr">
-      <a ui-sref="content-views.details.versions({contentViewId: contentView.id})" >
+      <a ui-sref="content-view.versions({contentViewId: contentView.id})" >
         <button class="btn btn-default" translate>
           Cancel
         </button>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/content-view-composite-available-content-views.controller.js

@@ -24,8 +24,9 @@ angular.module('Bastion.content-views').controller('ContentViewCompositeAvailabl
             };
 
             nutupane = new Nutupane(ContentView, params);
+            nutupane.masterOnly = true;
             nutupane.table.initialLoad = false;
-            $scope.detailsTable = nutupane.table;
+            $scope.table = nutupane.table;
 
             $scope.contentView.$promise.then(function (contentView) {
                 var filterIds = [];
@@ -44,7 +45,7 @@ angular.module('Bastion.content-views').controller('ContentViewCompositeAvailabl
 
             $scope.addContentViews = function () {
                 var selectedRows = nutupane.getAllSelectedResults().included.resources,
-                    components = [];
+                    components;
                 components = _.map(selectedRows, function (view) {
                     var component = {};
                     if ((!view.versionId) || view.versionId === "latest") {