katello 3.3.2 → 3.4.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/details/views/file-info.html

@@ -0,0 +1,15 @@
+<span page-title ng-model="file">{{ 'File: ' | translate }} {{ file.name }}</span>
+
+<div data-extend-template="layouts/full-page-details.html">
+  <div data-block="content">
+    <h4 translate>Basic Information</h4>
+
+    <dl class="dl-horizontal dl-horizontal-left">
+      <dt translate>Path</dt>
+      <dd>{{ file.path }}</dd>
+
+      <dt translate>Checksum</dt>
+      <dd>{{ file.checksum }}</dd>
+    </dl>
+  </div>
+</div>

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

@@ -0,0 +1,54 @@
+<span page-title ng-model="file">{{ 'Repositories for File: ' | translate }} {{ file.name }}</span>
+
+<h3 translate>Library Repositories that contain this File.</h3>
+
+<div data-extend-template="layouts/partials/table.html">
+  <span data-block="no-rows-message" translate>
+    No Repositories contain this File
+  </span>
+
+  <span data-block="no-search-results-message" translate>
+    Your search returned zero Repositories
+  </span>
+
+  <div data-block="table">
+    <table class="table table-striped table-bordered"
+           ng-class="{'table-mask': table.working}"
+           ng-show="table.rows.length > 0">
+      <thead>
+        <tr bst-table-head>
+          <th bst-table-column="name"><span translate>Name</span></th>
+          <th bst-table-column="product"><span translate>Product</span></th>
+          <th bst-table-column="lastSync"><span translate>Last Sync</span></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="repository in table.rows">
+          <td bst-table-cell>
+            <a ui-sref="product.repository.info({productId: repository.product.id, repositoryId: repository.library_instance_id || repository.id})">
+              {{ repository.name }}
+            </a>
+          </td>
+          <td bst-table-cell>
+            <a ui-sref="repositories({productId: repository.product.id})">
+              {{ repository.product.name }}
+            </a>
+          </td>
+          <td bst-table-cell>
+              <span ng-show="repository.url">
+              <span ng-show="repository.last_sync == null" translate>
+                Not Synced
+              </span>
+              <span ng-hide="repository.last_sync == null">
+                <a ng-href="/foreman_tasks/tasks/{{repository.last_sync.id}}">{{ repository.last_sync.result | capitalize}}</a>
+                <span translate>{{ repository.last_sync_words }} ago</span>
+              </span>
+            </span>
+            <span ng-hide="repository.url" translate>N/A</span>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/details/views/file.html

@@ -0,0 +1,37 @@
+<span page-title ng-model="file">{{ 'File: ' | translate }} {{ file.name }}</span>
+
+<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
+  <div data-block="header" translate>
+    {{ file.name }}
+  </div>
+
+  <nav data-block="navigation">
+    <ul class="nav nav-tabs">
+      <li ng-class="{active: isState('file.info')}">
+        <a ui-sref="file.info">
+          <span translate>
+            Details
+          </span>
+        </a>
+      </li>
+      <li ng-show="permitted('view_products')" ng-class="{active: isState('file.repositories')}">
+        <a ui-sref="file.repositories">
+          <span translate>
+            Library Repositories
+          </span>
+        </a>
+      </li>
+      <li ng-show="permitted('view_content_views')" ng-class="{active: isState('file.content-views')}">
+        <a ui-sref="file.content-views">
+          <span translate>
+            Content Views
+          </span>
+        </a>
+      </li>
+    </ul>
+  </nav>
+
+  <div data-block="content">
+    <section ui-view></section>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/file.factory.js

@@ -0,0 +1,28 @@
+(function () {
+    'use strict';
+
+    /**
+     * @ngdoc factory
+     * @name  Bastion.puppet-modules.factory:File
+     *
+     * @description
+     *   Provides a BastionResource for interacting with Files
+     */
+    function File(BastionResource) {
+
+        return BastionResource('/katello/api/v2/files/:id',
+            {'id': '@id'},
+            {
+                autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}
+            }
+        );
+
+    }
+
+    angular
+        .module('Bastion.files')
+        .factory('File', File);
+
+    File.$inject = ['BastionResource'];
+
+})();

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

@@ -0,0 +1,35 @@
+(function () {
+    'use strict';
+
+    /**
+     * @ngdoc controller
+     * @name  Bastion.puppet-modules.controller:FilesController
+     *
+     * @description
+     *   Handles fetching puppet modules content and populating Nutupane based on the current
+     *   ui-router state.
+     */
+    function FilesController($scope, Nutupane, File, CurrentOrganization) {
+        var nutupane;
+
+        var params = {
+            'organization_id': CurrentOrganization,
+            'sort_by': 'name',
+            'sort_order': 'ASC'
+        };
+
+        nutupane = new Nutupane(File, params);
+        $scope.controllerName = 'katello_files';
+        nutupane.masterOnly = true;
+
+        $scope.table = nutupane.table;
+        $scope.controllerName = 'katello_files';
+    }
+
+    angular
+        .module('Bastion.files')
+        .controller('FilesController', FilesController);
+
+    FilesController.$inject = ['$scope', 'Nutupane', 'File', 'CurrentOrganization'];
+
+})();

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

@@ -0,0 +1,20 @@
+(function () {
+    'use strict';
+
+    /**
+     * @ngdoc module
+     * @name  Bastion.files
+     *
+     * @description
+     *   Module for File related functionality.
+     */
+    angular
+        .module('Bastion.files', [
+            'ngResource',
+            'ui.router',
+            'Bastion',
+            'Bastion.common',
+            'Bastion.i18n'
+        ]);
+
+})();

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

@@ -0,0 +1,71 @@
+(function () {
+    'use strict';
+
+    /**
+     * @ngdoc object
+     * @name Bastion.files.config
+     *
+     * @requires $stateProvider
+     *
+     * @description
+     *   State routes defined for the files module
+     */
+    function FilesConfig($stateProvider) {
+        $stateProvider.state('files', {
+            url: '/files',
+            permission: ['view_products', 'view_content_views'],
+            views: {
+                '@': {
+                    controller: 'FilesController',
+                    templateUrl: 'files/views/files.html'
+                }
+            },
+            ncyBreadcrumb: {
+                label: "{{ 'Files' | translate }}"
+            }
+        })
+        .state('file', {
+            abstract: true,
+            url: '/files/:fileId',
+            permission: ['view_products', 'view_content_views'],
+            controller: 'FileController',
+            templateUrl: 'files/details/views/file.html'
+        })
+        .state('file.info', {
+            url: '',
+            permission: ['view_products', 'view_content_views'],
+            templateUrl: 'files/details/views/file-info.html',
+            ncyBreadcrumb: {
+                label: "{{ file.name }}",
+                parent: 'files'
+            }
+        })
+        .state('file.repositories', {
+            url: '/repositories',
+            permission: ['view_products'],
+            controller: 'FileRepositoriesController',
+            templateUrl: 'files/details/views/file-repositories.html',
+            ncyBreadcrumb: {
+                label: "{{ 'Repositories' | translate }}",
+                parent: 'file.info'
+            }
+        })
+        .state('file.content-views', {
+            url: '/content_views',
+            collapsed: true,
+            permission: ['view_content_views'],
+            controller: 'FileContentViewsController',
+            templateUrl: 'files/details/views/file-content-views.html',
+            ncyBreadcrumb: {
+                label: "{{ 'Content Views' | translate }}",
+                parent: 'file.info'
+            }
+        });
+    }
+
+    angular
+        .module('Bastion.files')
+        .config(FilesConfig);
+
+    FilesConfig.$inject = ['$stateProvider'];
+})();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/views/files.html

@@ -0,0 +1,39 @@
+<span page-title>{{ 'Files' | translate }}</span>
+
+<div data-extend-template="layouts/table-with-header.html">
+  <div data-block="header" translate>
+    Files
+  </div>
+
+  <span data-block="no-rows-message" translate>
+    You currently don't have any Files.
+  </span>
+
+  <span data-block="no-search-results-message" translate>
+    Your search returned zero Files.
+  </span>
+
+  <div data-block="table">
+    <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
+      <thead>
+        <tr bst-table-head>
+          <th bst-table-column="name"><span translate>Name</span></th>
+          <th bst-table-column="path"><span translate>Path</span></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="file in table.rows">
+          <td bst-table-cell>
+            <a ui-sref="file.info({fileId: file.id})">
+              {{ file.name }}
+            </a>
+          </td>
+          <td bst-table-cell>
+            {{ file.path }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/details/gpg-key-products.controller.js

@@ -15,6 +15,7 @@
         var nutupane = new Nutupane(GPGKey, {
             id: $scope.$stateParams.gpgKeyId
         }, 'products');
+        $scope.controllerName = 'katello_gpg_keys';
         nutupane.masterOnly = true;
 
         $scope.panel = $scope.panel || {error: false, loading: false};

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/details/gpg-key-repositories.controller.js

@@ -15,6 +15,7 @@
         var nutupane = new Nutupane(GPGKey, {
             id: $scope.$stateParams.gpgKeyId
         }, 'repositories');
+        $scope.controllerName = 'katello_gpg_keys';
         nutupane.masterOnly = true;
 
         $scope.panel = $scope.panel || {error: false, loading: false};

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

@@ -28,7 +28,7 @@
           </div>
 
           <div class="form-group">
-            <button class="btn btn-default" upload-submit ng-click="progress.uploading = true">
+            <button type="button" class="btn btn-default" upload-submit ng-click="progress.uploading = true">
               <i class="fa fa-spinner fa-spin" ng-show="progress.uploading"></i>
               <span ng-show="progress.uploading" translate>Uploading...</span>
               <span ng-hide="progress.uploading" translate>Upload</span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/gpg-keys.controller.js

@@ -25,9 +25,9 @@ angular.module('Bastion.gpg-keys').controller('GPGKeysController',
         };
 
         var nutupane = new Nutupane(GPGKey, params);
+        $scope.controllerName = 'katello_gpg_keys';
         $scope.table = nutupane.table;
         $scope.panel = {loading: false};
         $scope.removeRow = nutupane.removeRow;
-        $scope.controllerName = 'katello_gpg_keys';
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/new/views/new-gpg-key.html

@@ -1,6 +1,6 @@
 <div data-extend-template="layouts/details-page-with-breadcrumbs.html">
   <header data-block="header">
-    <h2 translate>New GPG Key</h2>
+    <h2 translate>Create GPG Key</h2>
   </header>
 
   <div data-block="content">
@@ -41,4 +41,4 @@
       </div>
     </form>
   </div>
-</div>
+</div>

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

@@ -6,8 +6,8 @@
   </div>
 
   <div data-block="list-actions">
-    <button class="btn btn-default" ui-sref="gpg-keys.new" ng-hide="denied('create_gpg_keys')">
-      <span translate>New GPG Key</span>
+    <button type="button" class="btn btn-primary" ui-sref="gpg-keys.new" ng-hide="denied('create_gpg_keys')">
+      <span translate>Create GPG Key</span>
     </button>
   </div>
 
@@ -21,6 +21,7 @@
 
   <div data-block="table">
     <table bst-table="table"
+           type="button"
            class="table table-striped table-bordered"
            ng-class="{'table-mask': table.working}"
            ng-show="table.rows.length > 0">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-add-hosts.controller.js

@@ -28,6 +28,7 @@ angular.module('Bastion.host-collections').controller('HostCollectionAddHostsCon
         };
 
         contentNutupane = new Nutupane(Host, params);
+        $scope.controllerName = 'hosts';
         contentNutupane.searchTransform = function (term) {
             var addition = "-host_collection_id=" + $scope.$stateParams.hostCollectionId;
             if (term === "" || angular.isUndefined(term)) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-hosts.controller.js

@@ -28,6 +28,7 @@ angular.module('Bastion.host-collections').controller('HostCollectionHostsContro
         };
 
         $scope.contentNutupane = new Nutupane(Host, params);
+        $scope.controllerName = 'hosts';
         $scope.contentNutupane.searchTransform = function (term) {
             var addition = "host_collection_id=" + $scope.$stateParams.hostCollectionId;
             if (term === "" || angular.isUndefined(term)) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-add-hosts.html

@@ -4,12 +4,11 @@
 
   <div data-block="list-actions">
     <div ng-hide="hostCollection.readonly" class="nutupane-actions fr">
-       <button class="btn btn-default"
-               translate
+       <button type="button" class="btn btn-default"
                ng-hide="denied('edit_hosts')"
                ng-disabled="disableAddButton()"
                ng-click="addSelected()">
-         {{ 'Add Selected' | translate }}
+         <span translate>Add Selected</span>
        </button>
     </div>
   </div>
@@ -42,7 +41,7 @@
                  ng-change="itemSelected(host)"/>
         </td>
         <td bst-table-cell >
-          <a ui-sref="content-hosts.details.info({hostId: host.id})">
+          <a ui-sref="content-host.info({hostId: host.id})">
             {{ host.name}}
           </a>
         </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-copy.html

@@ -9,7 +9,7 @@
                ng-model="copyName" tabindex="1" autofocus required/>
       </div>
 
-      <button class="btn btn-default" type="submit" ng-click="copy(copyName)">
+      <button type="button" class="btn btn-default" type="submit" ng-click="copy(copyName)">
         <span translate>Create</span>
       </button>
     </form>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-details.html

@@ -7,11 +7,11 @@
 
   <div data-block="item-actions">
     <div class="btn-group" uib-dropdown keyboard-nav bst-feature-flag="custom_products">
-      <button class="btn btn-default" ui-sref="host-collection.copy" ng-disabled="denied('create_host_collections')">
-        <span translate>Copy Host Collection</span>
+      <button type="button" class="btn btn-default" uib-dropdown-toggle>
+        <span translate>Select Action</span>
       </button>
 
-      <button type="button" class="btn btn-default" uib-dropdown-toggle>
+      <button type="button" type="button" class="btn btn-default" uib-dropdown-toggle>
         <span class="caret"></span>
         <span class="sr-only" translate>Toggle Dropdown</span>
       </button>