katello 3.3.0.rc1.1 → 3.3.0.rc2

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

@@ -21,7 +21,8 @@ angular.module('Bastion.content-views').controller('ContentViewCompositeContentV
             'full_result': true
         }, 'contentViewComponents');
 
-        $scope.detailsTable = nutupane.table;
+        nutupane.masterOnly = true;
+        $scope.table = nutupane.table;
 
         $scope.saveContentViewComponent = function (contentViewComponent) {
             var component = {

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

@@ -1,6 +1,12 @@
 <span page-title ng-model="contentView">{{ 'Available Content Views for Composite Content View:' | translate }} {{ contentView.name }}</span>
 
-<div data-extend-template="layouts/details-nutupane.html">
+<header data-block="sub-header">
+  <h3 translate>
+    Add Content Views to {{ contentView.name }}
+  </h3>
+</header>
+
+<div data-extend-template="layouts/partials/table.html">
   <div data-block="messages">
     <p bst-alert="info" ng-show="contentView.components.length === 0">
       <span translate>
@@ -9,23 +15,21 @@
     </p>
   </div>
 
-  <div data-block="actions">
-    <button class="btn btn-primary fr"
-            ng-disabled="detailsTable.numSelected === 0"
+  <div data-block="list-actions">
+    <button class="btn btn-primary"
+            ng-disabled="table.numSelected === 0"
             ng-click="addContentViews()">
-      <i class="fa fa-plus"></i>
       <span translate>Add Content Views</span>
     </button>
   </div>
 
-  <div data-block="search">
-    <input type="text"
-           class="form-control"
-           placeholder="{{ 'Filter...' | translate }}"
-           ng-model="contentViewFilter"/>
-  </div>
+  <span data-block="no-rows-message" translate>
+    No Content Views available to add to {{ contentView.name }}.  Create some non-composite Content Views first.
+  </span>
 
-  <span data-block="result-count"></span>
+  <span data-block="no-search-results-message" translate>
+    No Content Views match the search.
+  </span>
 
   <div data-block="table">
     <table class="table table-bordered table-striped">
@@ -41,7 +45,7 @@
 
       <tbody>
       <tr bst-table-row
-          ng-repeat="componentContentView in detailsTable.rows | filter:contentViewFilter | orderBy:'name'"
+          ng-repeat="componentContentView in table.rows"
           row-select="componentContentView" ng-init="componentContentView.versionId='latest'">
         <td bst-table-cell>{{ componentContentView.name }}</td>
         <td bst-table-cell ng-init="availableVersions = getAvailableVersions(componentContentView)">
@@ -66,12 +70,12 @@
         <td bst-table-cell>{{ componentContentView.description }}</td>
         <td bst-table-cell>
           <div>
-            <a ui-sref="content-views.details.repositories.yum.list({contentViewId: componentContentView.id})" translate>
+            <a ui-sref="content-view.repositories.yum.list({contentViewId: componentContentView.id})" translate>
               {{ componentContentView.repositories.length || 0 }} Repositories
             </a>
           </div>
           <div>
-            <a ui-sref="content-views.details.puppet-modules.list({contentViewId: componentContentView.id})" translate>
+            <a ui-sref="content-view.puppet-modules.list({contentViewId: componentContentView.id})" translate>
               {{ componentContentView.puppet_modules.length || 0 }} Puppet Modules
             </a>
           </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/views/content-view-composite-content-views-list.html

@@ -1,86 +1,88 @@
 <span page-title ng-model="contentView">{{ 'Content Views for Composite Content View:' | translate }} {{ contentView.name }}</span>
 
-<div data-extend-template="layouts/details-nutupane.html">
-  <div data-block="messages"></div>
+<header data-block="sub-header">
+  <h3 translate>
+    Content Views for {{ contentView.name }}
+  </h3>
+</header>
 
-  <div data-block="actions">
-    <button class="btn btn-primary fr"
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="list-actions">
+    <button class="btn btn-default fr"
             ng-hide="denied('edit_content_views', contentView)"
-            ng-disabled="detailsTable.numSelected === 0"
+            ng-disabled="table.numSelected === 0"
             ng-click="removeContentViewComponents()">
-      <i class="fa fa-trash-o"></i>
       <span translate>Remove Content Views</span>
     </button>
   </div>
 
-  <div data-block="search">
-    <input type="text"
-           class="form-control"
-           placeholder="{{ 'Filter...' | translate }}"
-           ng-model="componentContentViewFilter"/>
-  </div>
+  <span data-block="no-rows-message" translate>
+    No Content Views belong to {{ contentView.name }}.  Use the add tab to add Content Views.
+  </span>
 
-  <span data-block="result-count"></span>
+  <span data-block="no-search-results-message" translate>
+    No Content Views match the search.
+  </span>
 
   <div data-block="table">
     <table class="table table-bordered table-striped">
       <thead>
-      <tr bst-table-head row-select>
-        <th bst-table-column translate>Name</th>
-        <th bst-table-column translate>Version</th>
-        <th bst-table-column translate>Environment</th>
-        <th bst-table-column translate>Description</th>
-        <th bst-table-column translate>Content</th>
-      </tr>
+        <tr bst-table-head row-select>
+          <th bst-table-column translate>Name</th>
+          <th bst-table-column translate>Version</th>
+          <th bst-table-column translate>Environment</th>
+          <th bst-table-column translate>Description</th>
+          <th bst-table-column translate>Content</th>
+        </tr>
       </thead>
 
       <tbody>
-      <tr bst-table-row ng-repeat="contentViewComponent in detailsTable.rows | filter:componentContentViewFilter | orderBy:'content_view.name'"
-          row-select="contentViewComponent">
-        <td bst-table-cell>{{ contentViewComponent.content_view.name }}</td>
-        <td bst-table-cell ng-init="contentViewComponent.versionId = getVersionId(contentViewComponent)">
-          <span bst-edit-select="contentViewComponent.versionId"
-                display-value="getVersionString(contentViewComponent)"
-                display-value-default="getVersionString(contentViewComponent)"
-                readonly="denied('edit_content_views', contentView)"
-                selector="contentViewComponent.versionId"
-                options="getAvailableVersions(contentViewComponent.content_view)"
-                options-format="option.id as option.version for option in options"
-                on-save="saveContentViewComponent(contentViewComponent)"
-                ng-if="contentViewComponent.content_view.version_count > 0">
+        <tr bst-table-row ng-repeat="contentViewComponent in table.rows" row-select="contentViewComponent">
+          <td bst-table-cell>{{ contentViewComponent.content_view.name }}</td>
+          <td bst-table-cell ng-init="contentViewComponent.versionId = getVersionId(contentViewComponent)">
+            <span bst-edit-select="contentViewComponent.versionId"
+                  display-value="getVersionString(contentViewComponent)"
+                  display-value-default="getVersionString(contentViewComponent)"
+                  readonly="denied('edit_content_views', contentView)"
+                  selector="contentViewComponent.versionId"
+                  options="getAvailableVersions(contentViewComponent.content_view)"
+                  options-format="option.id as option.version for option in options"
+                  on-save="saveContentViewComponent(contentViewComponent)"
+                  ng-if="contentViewComponent.content_view.version_count > 0">
+            </span>
+            <div  ng-if="contentViewComponent.content_view.version_count > 0" ng-show="(!contentViewComponent.latest) && contentViewComponent.content_view_version.version != contentViewComponent.content_view.latest_version" translate>
+                A newer version is available: {{ contentViewComponent.content_view.latest_version }}
+            </div>
+            <div ng-if="contentViewComponent.content_view.version_count === 0 " translate>
+                Latest (Currently no version)
+            </div>
+          </td>
+          <td bst-table-cell>
+          <span ng-show="contentViewComponent.content_view_version.environments.length !== 0"
+                ng-repeat="environment in contentViewComponent.content_view_version.environments">
+            {{ environment.name }}<span ng-if="!$last">, </span>
+          </span>
+          <span ng-show="contentViewComponent.content_view.version_count === 0 || contentViewComponent.content_view_version.environments.length === 0" translate>
+            Not yet published
           </span>
-          <div  ng-if="contentViewComponent.content_view.version_count > 0" ng-show="(!contentViewComponent.latest) && contentViewComponent.content_view_version.version != contentViewComponent.content_view.latest_version" translate>
-              A newer version is available: {{ contentViewComponent.content_view.latest_version }}
-          </div>
-          <div ng-if="contentViewComponent.content_view.version_count === 0 " translate>
-              Latest (Currently no version)
-          </div>
-        </td>
-        <td bst-table-cell>
-        <span ng-show="contentViewComponent.content_view_version.environments.length !== 0"
-              ng-repeat="environment in contentViewComponent.content_view_version.environments">
-          {{ environment.name }}<span ng-if="!$last">, </span>
-        </span>
-        <span ng-show="contentViewComponent.content_view.version_count === 0 || contentViewComponent.content_view_version.environments.length === 0" translate>
-          Not yet published
-        </span>
-        </td>
-        <td bst-table-cell>{{ contentViewComponent.content_view.description }}</td>
-        <td bst-table-cell>
-          <div>
-            <a ui-sref="content-views.details.repositories.yum.list({contentViewId: contentViewComponent.content_view.id})" translate>
-              {{ contentViewComponent.content_view_version.repositories.length || 0 }} Repositories
-            </a>
-          </div>
-          <div>
-            <a ui-sref="content-views.details.puppet-modules.list({contentViewId: contentViewComponent.content_view.id})" translate>
-              {{ contentViewComponent.content_view_version.puppet_module_count || 0 }} Puppet Modules
-            </a>
-          </div>
-        </td>
-      </tr>
+          </td>
+          <td bst-table-cell>{{ contentViewComponent.content_view.description }}</td>
+          <td bst-table-cell>
+            <div>
+              <a ui-sref="content-view.repositories.yum.list({contentViewId: contentViewComponent.content_view.id})" translate>
+                {{ contentViewComponent.content_view_version.repositories.length || 0 }} Repositories
+              </a>
+            </div>
+            <div>
+              <a ui-sref="content-view.puppet-modules.list({contentViewId: contentViewComponent.content_view.id})" translate>
+                {{ contentViewComponent.content_view_version.puppet_module_count || 0 }} Puppet Modules
+              </a>
+            </div>
+          </td>
+        </tr>
       </tbody>
     </table>
   </div>
 </div>
 
+

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

@@ -2,16 +2,16 @@
 
   <nav>
     <ul class="nav nav-tabs" ng-show="permitted('edit_content_views', contentView)">
-      <li ng-class="{active: isState('content-views.details.components.composite-content-views.list')}">
-        <a ui-sref="content-views.details.components.composite-content-views.list">
+      <li ng-class="{active: isState('content-view.components.composite-content-views.list')}">
+        <a ui-sref="content-view.components.composite-content-views.list">
           <span translate>
             List/Remove
           </span>
         </a>
       </li>
 
-      <li ng-class="{active: isState('content-views.details.components.composite-content-views.available')}" ng-show="!contentView.permissions.editable">
-        <a ui-sref="content-views.details.components.composite-content-views.available">
+      <li ng-class="{active: isState('content-view.components.composite-content-views.available')}" ng-show="!contentView.permissions.editable">
+        <a ui-sref="content-view.components.composite-content-views.available">
           <span translate>
             Add
           </span>

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

@@ -28,9 +28,9 @@ angular.module('Bastion.content-views').controller('ContentViewAvailableDockerRe
         },
         'queryUnpaged');
 
-        nutupane.load();
+        nutupane.masterOnly = true;
 
-        $scope.repositoriesTable = nutupane.table;
+        $scope.table = nutupane.table;
 
         $scope.addRepositories = function (contentView) {
             $scope.addSelectedRepositoriesToContentView(nutupane, contentView);

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

@@ -29,7 +29,7 @@
 
         nutupane.load();
 
-        $scope.repositoriesTable = nutupane.table;
+        $scope.table = nutupane.table;
 
         $scope.addRepositories = function (contentView) {
             $scope.addSelectedRepositoriesToContentView(nutupane, contentView);

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

@@ -28,9 +28,9 @@ angular.module('Bastion.content-views').controller('ContentViewAvailableOstreeRe
         },
         'queryUnpaged');
 
-        nutupane.load();
+        nutupane.masterOnly = true;
 
-        $scope.repositoriesTable = nutupane.table;
+        $scope.table = nutupane.table;
 
         $scope.addRepositories = function (contentView) {
             $scope.addSelectedRepositoriesToContentView(nutupane, contentView);

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

@@ -32,7 +32,7 @@ angular.module('Bastion.content-views').controller('ContentViewAvailableReposito
 
         nutupane.load();
 
-        $scope.repositoriesTable = nutupane.table;
+        $scope.table = nutupane.table;
 
         $scope.addRepositories = function (contentView) {
             $scope.addSelectedRepositoriesToContentView(nutupane, contentView);

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

@@ -5,127 +5,26 @@
  * @requires $scope
  * @requires $q
  * @requires ContentView
- * @requires Nutupane
  * @requires translate
  * @requires ApiErrorHandler
+ * @requires GlobalNotification
  *
  * @description
- *   Provides the functionality specific to ContentViews for use with the Nutupane UI pattern.
- *   Defines the columns to display and the transform function for how to generate each row
- *   within the table.
+ *   Provides the functionality specific to the Content View Details page.
  */
 angular.module('Bastion.content-views').controller('ContentViewDetailsController',
-    ['$scope', '$q', 'ContentView', 'ContentViewVersion', 'Nutupane', 'AggregateTask', 'translate', 'ApiErrorHandler',
-    function ($scope, $q, ContentView, ContentViewVersion, Nutupane, AggregateTask, translate, ApiErrorHandler) {
-        var nutupane, contentViewId = $scope.$stateParams.contentViewId;
-
-        $scope.panel = {
-            error: false,
-            loading: true
-        };
-
-        if ($scope.contentView) {
-            $scope.panel.loading = false;
-            contentViewId = $scope.contentView.id;
-        }
-
-        nutupane = new Nutupane(ContentViewVersion, {'content_view_id': contentViewId});
-        nutupane.setSearchKey('contentViewVersionSearch');
-        nutupane.masterOnly = true;
-
+    ['$scope', '$q', 'ContentView', 'translate', 'ApiErrorHandler', 'GlobalNotification',
+    function ($scope, $q, ContentView, translate, ApiErrorHandler, GlobalNotification) {
         $scope.saveSuccess = function () {
-            $scope.successMessages = [translate('Content View updated.')];
+            GlobalNotification.setSuccessMessage(translate('Content View updated.'));
         };
 
         $scope.saveError = function (response) {
             angular.forEach(response.data.errors, function (errorMessage) {
-                $scope.errorMessages = [translate("An error occurred updating the Content View: ") + errorMessage];
+                GlobalNotification.setErrorMessage(translate("An error occurred updating the Content View: ") + errorMessage);
             });
         };
 
-        function promotionMessage(version, task) {
-            return translate("Successfully promoted %cv version %ver to %env")
-                .replace('%cv', version['content_view'].name)
-                .replace('%ver', version.version)
-                .replace('%env', task.input['environment_name']);
-        }
-
-        function deletionMessage(version, task) {
-            var message;
-
-            if (task.input['content_view_ids'] && task.input['content_view_ids'].length > 0) {
-                message = translate("Successfully deleted %cv version %ver.")
-                                .replace('%cv', version['content_view'].name)
-                                .replace('%ver', version.version);
-            } else {
-                message = translate("Successfully removed %cv version %ver from environments: %env")
-                                .replace('%cv', version['content_view'].name)
-                                .replace('%ver', version.version)
-                                .replace('%env', task.input['environment_names'].join(', '));
-            }
-            return message;
-        }
-
-        function publishMessage(version) {
-            return translate("Successfully published %cv version %ver and promoted to Library")
-                .replace('%cv', version['content_view'].name)
-                .replace('%ver', version.version);
-        }
-
-        function taskUpdated(version, task) {
-            var taskTypes = $scope.taskTypes;
-
-            if (!task.pending) {
-                $scope.pendingVersionTask = false;
-
-                if (task.result === 'success') {
-                    if (task.label === taskTypes.promotion) {
-                        $scope.successMessages.push(promotionMessage(version, task));
-                    } else if (task.label === taskTypes.publish) {
-                        $scope.successMessages.push(publishMessage(version));
-                    } else if (task.label === taskTypes.deletion) {
-                        $scope.successMessages.push(deletionMessage(version, task));
-                        $scope.reloadVersions();
-                    }
-                }
-            } else {
-                $scope.pendingVersionTask = true;
-            }
-        }
-
-        function updateVersion(version) {
-            var versionIds = _.map($scope.detailsTable.rows, 'id'),
-                versionIndex = versionIds.indexOf(version.id);
-
-            ContentViewVersion.get({'id': version.id}).$promise.then(function (newVersion) {
-                $scope.contentView.versions[versionIndex] = newVersion;
-                $scope.detailsTable.rows[versionIndex] = newVersion;
-            });
-        }
-
-        function processTasks(versions) {
-            _.each(versions, function (version) {
-                var taskIds = _.map(version['active_history'], function (history) {
-                                    return history.task.id;
-                                });
-
-                if (taskIds.length > 0) {
-                    version.task = AggregateTask.new(taskIds, function (task) {
-                        taskUpdated(version, task);
-                        if (task.label === $scope.taskTypes.publish && !task.pending && task.result === 'success') {
-                            updateVersion(version);
-                        }
-                    });
-                }
-            });
-        }
-
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-
-        $scope.detailsTable = nutupane.table;
-        $scope.pendingVersionTask = false;
-
         $scope.panel = {
             error: false,
             loading: true
@@ -133,10 +32,8 @@ angular.module('Bastion.content-views').controller('ContentViewDetailsController
 
         $scope.contentView = ContentView.get({id: $scope.$stateParams.contentViewId}, function () {
             $scope.panel.loading = false;
-            $scope.loading = false;
         }, function (response) {
             $scope.panel.loading = false;
-            $scope.loading = false;
             ApiErrorHandler.handleGETRequestErrors(response, $scope);
         });
 
@@ -150,25 +47,12 @@ angular.module('Bastion.content-views').controller('ContentViewDetailsController
 
         $scope.copy = function (newName) {
             ContentView.copy({id: $scope.contentView.id, 'content_view': {name: newName}}, function (response) {
-                $scope.showCopy = false;
-                $scope.table.addRow(response);
-                $scope.transitionTo('content-views.details.info', {contentViewId: response.id});
+                $scope.transitionTo('content-view.info', {contentViewId: response.id});
             }, function (response) {
-                $scope.copyErrorMessages.push(response.data.displayMessage);
+                GlobalNotification.setErrorMessage(response.data.displayMessage);
             });
         };
 
-        $scope.reloadVersions = function () {
-            $scope.detailsTable.rows = [];
-            nutupane.refresh();
-        };
-
-        $scope.$watch('detailsTable.rows', function () {
-            if ($scope.detailsTable && $scope.detailsTable.rows.length > 0) {
-                processTasks($scope.detailsTable.rows);
-            }
-        });
-
         $scope.save = function (contentView) {
             return contentView.$update($scope.saveSuccess, $scope.saveError);
         };