katello 3.3.2 → 3.4.0.rc1

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

@@ -1,7 +1,9 @@
-<div ng-if="isState('content-view.filter.erratum.available')">
-  <form name="errataForm" class="col-sm-5">
-    <div ng-include="'content-views/details/filters/views/date-type-errata.html'"></div>
-  </form>
+<div ng-if="isState('content-view.yum.filter.erratum.available')">
+  <div class="row">
+    <form name="errataForm" class="col-sm-5">
+      <div ng-include="'content-views/details/filters/views/date-type-errata.html'"></div>
+    </form>
+  </div>
 </div>
 
 <div data-extend-template="layouts/partials/table.html">
@@ -14,14 +16,14 @@
   </span>
 
   <div data-block="list-actions">
-    <button class="btn btn-primary"
-            ng-show="isState('content-view.filter.erratum.list') && permitted('edit_content_views', contentView)"
+    <button type="button" class="btn btn-primary"
+            ng-show="isState('content-view.yum.filter.erratum.list') && permitted('edit_content_views', contentView)"
             ng-disabled="table.working || table.numSelected === 0"
             ng-click="removeErrata(contentView)">
       <span translate>Remove Errata</span>
     </button>
-    <button class="btn btn-primary"
-            ng-show="isState('content-view.filter.erratum.available') && permitted('edit_content_views', contentView)"
+    <button type="button" class="btn btn-primary"
+            ng-show="isState('content-view.yum.filter.erratum.available') && permitted('edit_content_views', contentView)"
             ng-disabled="table.working || table.numSelected === 0"
             ng-click="addErrata(filter)">
       <span translate>Add Errata</span>

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

@@ -1,53 +1,50 @@
 <span page-title ng-model="filter">{{ 'Errata Filter:' | translate }} {{ filter.name }}</span>
 
-<div class="details details-full">
-  
-  <nav>
-    <ul class="nav nav-tabs">
-
-      <li ng-class="{active: isState('content-view.filter.erratum.edit')}">
-        <a ui-sref="content-view.filter.erratum.edit">
-        <span translate>
-	  Details
-        </span>
-        </a>
-      </li>
-
-      <li ng-if="!filter.rules[0].types" ng-class="{active: isState('content-view.filter.erratum.list')}">
-        <a ui-sref="content-view.filter.erratum.list({filterId: filter.id})">
-        <span translate>
-          List/Remove
-        </span>
-        </a>
-      </li>
-
-      <li ng-if="!filter.rules[0].types" ng-class="{active: isState('content-view.filter.erratum.available')}"
-          ng-show="permitted('edit_content_views', contentView)">
-        <a ui-sref="content-view.filter.erratum.available({filterId: filter.id})">
-        <span translate>
-          Add
-        </span>
-        </a>
-      </li>
-
-      <li ng-if="filter.rules[0].types" ng-class="{active: isState('content-view.filter.erratum.dateType')}"
-          ng-show="permitted('edit_content_views', contentView)">
-        <a ui-sref="content-view.filter.erratum.dateType({filterId: filter.id})">
-        <span translate>
-          Erratum Date Range
-        </span>
-        </a>
-      </li>
-
-      <li ng-class="{active: isState('content-view.filter.erratum.repositories')}"
-          ng-show="permitted('edit_content_views', contentView)">
-        <a ui-sref="content-view.filter.erratum.repositories({filterId: filter.id})"
-           ng-include="'content-views/details/filters/views/partials/filter-repositories-count.html'">
-        </a>
-      </li>
-    </ul>
-  </nav>
-
-  <div ui-view></div>
-
-</div>
+<nav>
+  <ul class="nav nav-tabs nav-tabs-pf">
+
+    <li ng-class="{active: isState('content-view.yum.filter.erratum.edit')}">
+      <a ui-sref="content-view.yum.filter.erratum.edit">
+      <span translate>
+        Details
+      </span>
+      </a>
+    </li>
+
+    <li ng-if="!filter.rules[0].types" ng-class="{active: isState('content-view.yum.filter.erratum.list')}">
+      <a ui-sref="content-view.yum.filter.erratum.list({filterId: filter.id})">
+      <span translate>
+        List/Remove
+      </span>
+      </a>
+    </li>
+
+    <li ng-if="!filter.rules[0].types" ng-class="{active: isState('content-view.yum.filter.erratum.available')}"
+        ng-show="permitted('edit_content_views', contentView)">
+      <a ui-sref="content-view.yum.filter.erratum.available({filterId: filter.id})">
+      <span translate>
+        Add
+      </span>
+      </a>
+    </li>
+
+    <li ng-if="filter.rules[0].types" ng-class="{active: isState('content-view.yum.filter.erratum.dateType')}"
+        ng-show="permitted('edit_content_views', contentView)">
+      <a ui-sref="content-view.yum.filter.erratum.dateType({filterId: filter.id})">
+      <span translate>
+        Erratum Date Range
+      </span>
+      </a>
+    </li>
+
+    <li ng-class="{active: isState('content-view.yum.filter.erratum.repositories')}"
+        ng-show="permitted('edit_content_views', contentView)">
+      <a ui-sref="content-view.yum.filter.erratum.repositories({filterId: filter.id})"
+         ng-include="'content-views/details/filters/views/partials/filter-repositories-count.html'">
+      </a>
+    </li>
+  </ul>
+</nav>
+
+<div ui-view></div>
+

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filter-repositories.html

@@ -1,7 +1,7 @@
 <span page-title ng-model="filter">{{ 'Repositories for Filter:' | translate }} {{ filter.name }}</span>
 
 <div class="row">
-  <div class="well col-sm-8">
+  <div class="col-sm-8">
     <div class="radio">
       <label>
         <input type="radio"
@@ -27,7 +27,7 @@
 <div ng-class="{'table-mask': !showRepos}">
   <div data-extend-template="layouts/partials/table.html">
     <div data-block="list-actions">
-      <button class="btn btn-default"
+      <button type="button" class="btn btn-default"
               translate
               ng-hide="denied('edit_content_views', contentView)"
               ng-disabled="!showRepos || table.numSelected === 0"
@@ -36,14 +36,14 @@
       </button>
     </div>
 
-    <div data-block="search" class="col-sm-5">
+    <div data-block="search">
       <div class="input-group">
         <span class="input-group-addon">
           <select ng-model="product" ng-options="product.name for (id, product) in products"></select>
         </span>
 
         <input type="text"
-               class="form-control filter-input"
+               class="form-control"
                placeholder="{{ 'Filter' | translate }}"
                ng-model="repositorySearch"/>
       </div>
@@ -102,7 +102,7 @@
                 </a>
               </div>
               <div ng-if="repository.content_counts.erratum && repository.content_counts.erratum > 0">
-                <a ui-sref="errata.index({repositoryId: repository.id})"
+                <a ui-sref="errata({repositoryId: repository.id})"
                    ng-show="repository.content_type == 'yum'"
                    translate>
                   {{ repository.content_counts.erratum }} Errata

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

@@ -2,12 +2,17 @@
 
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="list-actions">
-    <button class="btn btn-default"
-            ng-hide="denied('edit_content_views', contentView)"
-            ui-sref="content-view.filters.new">
+    <button type="button" class="btn btn-default"
+            ng-hide="denied('edit_content_views', contentView) || !stateIncludes('content-view.yum')"
+            ui-sref="content-view.yum.filters.new">
+      <span translate>New Filter</span>
+    </button>
+    <button type="button" class="btn btn-default"
+            ng-hide="denied('edit_content_views', contentView) || stateIncludes('content-view.yum')"
+            ui-sref="content-view.docker.filters.new">
       <span translate>New Filter</span>
     </button>
-    <button class="btn btn-default"
+    <button type="button" class="btn btn-default"
             ng-hide="denied('edit_content_views', contentView)"
             ng-disabled="table.numSelected === 0"
             ng-click="removeFilters()">
@@ -41,19 +46,23 @@
         <tr bst-table-row ng-repeat="filter in table.rows" row-select="filter">
           <td bst-table-cell>
             <a ng-if="filter.type === 'erratum' && !filter.rules[0].types"
-               ui-sref="content-view.filter.erratum.list({filterId: filter.id})">
+               ui-sref="content-view.yum.filter.erratum.list({filterId: filter.id})">
               {{ filter.name }}
             </a>
             <a ng-if="filter.type === 'erratum' && filter.rules[0].types"
-               ui-sref="content-view.filter.erratum.dateType({filterId: filter.id})">
+               ui-sref="content-view.yum.filter.erratum.dateType({filterId: filter.id})">
               {{ filter.name }}
             </a>
             <a ng-if="filter.type === 'rpm'"
-               ui-sref="content-view.filter.rpm.details({filterId: filter.id})">
+               ui-sref="content-view.yum.filter.rpm.details({filterId: filter.id})">
               {{ filter.name }}
             </a>
             <a ng-if="filter.type === 'package_group'"
-               ui-sref="content-view.filter.package_group.list({filterId: filter.id})">
+               ui-sref="content-view.yum.filter.package_group.list({filterId: filter.id})">
+              {{ filter.name }}
+            </a>
+            <a ng-if="filter.type === 'docker'"
+               ui-sref="content-view.docker.filter.tag.details({filterId: filter.id})">
               {{ filter.name }}
             </a>
           </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/new-filter.html

@@ -1,55 +1,62 @@
 <span page-title ng-model="contentView">{{ 'New Filter for Content View:' | translate }} {{ contentView.name }}</span>
 
-<header data-block="sub-header`">
-  <h3 translate>Add New Filter</h3>
-</header>
+<h3 ng-show="stateIncludes('content-view.yum')" translate>Add New Yum Filter</h3>
+<h3 ng-show="stateIncludes('content-view.docker')" translate>Add New Docker Tag Filter</h3>
 
-<form name="filterForm" class="col-sm-5" role="form" novalidate>
-  <div bst-form-group label="{{ 'Name' | translate }}">
-    <input id="name"
-           name="name"
-           ng-model="filter.name"
-           type="text"
-           tabindex="1"
-           autofocus
-           required/>
-  </div>
+<div class="row">
+  <div class="col-sm-5">
+    <form name="filterForm" role="form" novalidate>
+      <div bst-form-group label="{{ 'Name' | translate }}">
+        <input id="name"
+               name="name"
+               ng-model="filter.name"
+               type="text"
+               tabindex="1"
+               autofocus
+               required/>
+      </div>
 
-  <div bst-form-group label="{{ 'Content Type' | translate }}">
-    <select id="type"
-            name="type"
-            ng-model="filter.type"
-            tabindex="2"
-            required>
-      <option value="rpm" translate>Package</option>
-      <option value="package_group" translate>Package Group</option>
-      <option value="erratumId" translate>Erratum - by ID</option>
-      <option value="erratumDateType" translate>Erratum - by Date and Type</option>
-    </select>
-  </div>
+      <div bst-form-group ng-show="filterChoices.length > 1" label="{{ 'Content Type' | translate }}">
+        <select id="type"
+                name="type"
+                ng-model="filter.type"
+                ng-options="filterChoice.id as filterChoice.name for filterChoice in filterChoices"
+                tabindex="2"
+                required>
+        </select>
+      </div>
 
-  <div bst-form-group label="{{ 'Inclusion Type' | translate }}">
-    <select id="inclusion"
-            name="inclusion"
-            ng-model="filter.inclusion"
-            tabindex="3"
-            required>
-      <option value="true" translate>Include</option>
-      <option value="false" translate>Exclude</option>
-    </select>
-  </div>
+      <div bst-form-group label="{{ 'Inclusion Type' | translate }}">
+        <select id="inclusion"
+                name="inclusion"
+                ng-model="filter.inclusion"
+                tabindex="3"
+                required>
+          <option value="true" translate>Include</option>
+          <option value="false" translate>Exclude</option>
+        </select>
+      </div>
 
-  <div bst-form-group label="{{ 'Description' | translate }}">
+      <div bst-form-group label="{{ 'Description' | translate }}">
     <textarea id="description"
               name="description"
               ng-model="filter.description"
               tabindex="3">
     </textarea>
-  </div>
+      </div>
 
-  <div bst-form-buttons
-       on-cancel="transitionTo('content-view.filters', {contentViewId: contentView.id})"
-       on-save="save(filter, contentView)"
-       working="working">
+      <div bst-form-buttons
+           on-cancel="transitionTo('content-view.yum.filters', {contentViewId: contentView.id})"
+           on-save="save(filter, contentView)"
+           ng-show="stateIncludes('content-view.yum')"
+           working="working">
+      </div>
+      <div bst-form-buttons
+           on-cancel="transitionTo('content-view.docker.filters', {contentViewId: contentView.id})"
+           on-save="save(filter, contentView)"
+           ng-show="stateIncludes('content-view.docker')"
+           working="working">
+      </div>
+    </form>
   </div>
-</form>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/package-filter-details.html

@@ -1,12 +1,12 @@
-<div class="row header-bar">
-  <div class="col-sm-3">
-    <div>
-      <input type="text"
-             class="form-control filter-input"
-             placeholder="{{ 'Filter' | translate }}"
-             ng-model="packageFilter"/>
-    </div>
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="search">
+    <input type="text"
+           class="form-control"
+           placeholder="{{ 'Filter' | translate }}"
+           ng-model="packageFilter"/>
+  </div>
 
+  <div data-block="filters">
     <div class="checkbox">
       <label>
         <input type="checkbox"
@@ -24,130 +24,88 @@
     </div>
   </div>
 
-  <button class="btn btn-default fr"
-          ng-disabled="getSelectedRules(filter).length === 0"
-          ng-hide="denied('edit_content_views', contentView)"
-          ng-click="removeRules(filter)">
-    <span translate>Remove RPMs</span>
-  </button>
-</div>
-
-<table class="table table-bordered table-striped">
-  <thead>
-    <tr>
-      <th class="row-select">
-        <input type="checkbox"
-               ng-model="allSelected"
-               ng-change="selectAll(allSelected)"
-               ng-hide="denied('edit_content_views', contentView)"/>
-      </th>
-      <th class="col-sm-3" translate>RPM Name</th>
-      <th class="col-sm-1" translate>Architecture</th>
-      <th class="col-sm-6" translate>Detail</th>
-      <th></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <tr>
-      <td></td><!-- Empty cell since the first row is special -->
-      <td>
-        <input type="text"
-               class="form-control"
-               uib-typeahead="package for package in fetchAutocompleteName($viewValue)"
-               ng-hide="denied('edit_content_views', contentView)"
-               ng-model="rule.name"/>
-      </td>
-
-      <td>
-        <input type="text"
-               class="form-control"
-               uib-typeahead="arch for arch in fetchAutocompleteArch($viewValue)"
-               ng-hide="denied('edit_content_views', contentView)"
-               ng-model="rule.architecture"/>
-      </td>
-
-      <td class="container">
-              <span ng-class="{ 'col-sm-12': rule.type === 'all', 'col-sm-5': rule.type != 'all'}">
-                <select class="form-control"
-                        ng-model="rule.type"
-                        ng-change="clearValues(rule)"
-                        ng-hide="denied('edit_content_views', contentView)">
-                  <option value="all" translate>All Versions</option>
-                  <option value="equal" translate>Equal To</option>
-                  <option value="greater" translate>Greater Than</option>
-                  <option value="less" translate>Less Than</option>
-                  <option value="range" translate>Range</option>
-                </select>
-              </span>
+  <div data-block="list-actions">
+    <button type="button" class="btn btn-default"
+            ng-click="addRule()"
+            ng-hide="denied('edit_content_views', contentView)">
+      <span translate>Add Rule</span>
+    </button>
+
+    <button type="button" class="btn btn-default"
+            ng-disabled="getSelectedRules(filter).length === 0"
+            ng-hide="denied('edit_content_views', contentView)"
+            ng-click="removeRules(filter)">
+      <span translate>Remove Rule</span>
+    </button>
+  </div>
 
-              <span ng-show="rule.type === 'greater' || rule.type === 'less' || rule.type === 'range'">
-                <span class="col-sm-3">
-                  <input type="text"
-                         class="form-control"
-                         ng-model="rule.min_version"
-                         ng-hide="denied('edit_content_views', contentView)"
-                         ng-disabled="rule.type === 'less'"/>
+  <span data-block="no-rows-message" translate>
+     Create a rule using the add button above.
+  </span>
+
+  <div data-block="table">
+    <table class="table table-bordered table-striped">
+      <thead>
+        <tr bst-table-head row-select>
+          <th translate>RPM Name</th>
+          <th translate>Architecture</th>
+          <th translate>Version</th>
+          <th></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="rule in table.rows | filter:packageFilter" row-select="rule">
+          <td bst-table-cell>
+            <div class="form-group">
+              <input class="form-control"
+                     ng-hide="denied('edit_content_views', contentView)"
+                     ng-model="rule.name"
+                     uib-typeahead="name for name in fetchAutocompleteName($viewValue)"
+                     ng-readonly="!rule.editMode"/>
+            </div>
+          </td>
+
+          <td bst-table-cell>
+            <div class="form-group">
+              <input class="form-control"
+                     ng-hide="denied('edit_content_views', contentView)"
+                     ng-model="rule.architecture"
+                     uib-typeahead="arch for arch in fetchAutocompleteArch($viewValue)"
+                     ng-readonly="!rule.editMode"/>
+            </div>
+          </td>
+
+          <td bst-table-cell>
+            <span ng-hide="rule.editMode">
+              <span ng-switch="rule.type">
+                <span ng-switch-when="equal">
+                  <span translate>Version {{ rule.version }}</span>
                 </span>
-                <span class="fl">-</span>
-                <span class="col-sm-3">
-                  <input type="text"
-                         class="form-control"
-                         ng-model="rule.max_version"
-                         ng-hide="denied('edit_content_views', contentView)"
-                         ng-disabled="rule.type === 'greater'"/>
+
+                <span ng-switch-when="greater">
+                  <span translate>Greater than version {{ rule.min_version }}</span>
+                </span>
+
+                <span ng-switch-when="less">
+                  <span translate>Less than version {{ rule.max_version }}</span>
+                </span>
+
+                <span ng-switch-when="range">
+                  <span translate>Between versions {{ rule.min_version }} and {{ rule.max_version }}</span>
                 </span>
-              </span>
 
-              <span ng-show="rule.type === 'equal'">
-                <span class="col-sm-5">
-                  <input type="text" class="form-control"
-                         ng-model="rule.version"
-                         ng-hide="denied('edit_content_views', contentView)"/>
+                <span ng-switch-default>
+                  <span translate>All Versions</span>
                 </span>
               </span>
-      </td>
-
-      <td class="action-cell">
-        <button class="btn btn-default"
-                ng-click="addRule(rule, filter)"
-                ng-hide="denied('edit_content_views', contentView)"
-                ng-disabled="!valid(rule)">
-          <i class="fa fa-plus"></i>
-          <span translate>Add</span>
-        </button>
-      </td>
-    </tr>
-
-    <tr ng-repeat="rule in filter.rules | filter:packageFilter" row-select="rule">
-      <td class="row-select">
-        <input type="checkbox"
-               ng-hide="denied('edit_content_views', contentView)"
-               ng-model="rule.selected"/>
-      </td>
-
-      <td>
-        <input class="form-control"
-               ng-hide="denied('edit_content_views', contentView)"
-               ng-model="rule.name"
-               ng-readonly="!rule.editMode"/>
-      </td>
-
-      <td>
-        <input class="form-control"
-               ng-hide="denied('edit_content_views', contentView)"
-               ng-model="rule.architecture"
-               typeahead="arch for arch in fetchAutocompleteArch($viewValue)"
-               ng-readonly="!rule.editMode"/>
-      </td>
-
-      <td>
-              <span ng-class="{ 'col-sm-12': rule.type === 'all', 'col-sm-3': rule.type != 'all'}">
+            </span>
+
+            <div ng-show="rule.editMode">
+              <div class="form-group">
                 <select class="form-control"
                         ng-model="rule.type"
                         ng-hide="denied('edit_content_views', contentView)"
-                        ng-readonly="!rule.editMode"
-                        ng-disabled="!rule.editMode"
                         ng-change="clearValues(rule)">
                   <option value="all" translate>All Versions</option>
                   <option value="equal" translate>Equal To</option>
@@ -155,51 +113,66 @@
                   <option value="less" translate>Less Than</option>
                   <option value="range" translate>Range</option>
                 </select>
-              </span>
-
-              <span ng-show="rule.type === 'greater' || rule.type === 'less' || rule.type === 'range'">
-                <span class="col-sm-4">
-                  <input type="text"
-                         class="form-control"
-                         ng-model="rule.min_version"
-                         ng-readonly="!rule.editMode"
-                         ng-disabled="rule.type === 'less'"/>
-                </span>
-                <span class="fl">-</span>
-                <span class="col-sm-4">
-                  <input type="text"
-                         class="form-control"
-                         ng-model="rule.max_version"
-                         ng-readonly="!rule.editMode"
-                         ng-disabled="rule.type === 'greater'"/>
-                </span>
-              </span>
-
-              <span ng-show="rule.type === 'equal'">
-                <span class="col-sm-9">
-                  <input type="text"
-                         class="form-control"
-                         ng-model="rule.version"
-                         ng-readonly="!rule.editMode"/>
-                </span>
-              </span>
-      </td>
-
-      <td class="action-cell">
-        <button class="btn btn-default" ng-click="rule.editMode = true; backupPrevious(rule)" ng-hide="rule.editMode">
-          <i class="fa fa-edit"></i>
-          <span translate>Edit</span>
-        </button>
-
-        <button bst-save-control
-                on-cancel="restorePrevious(rule); rule.editMode = false"
-                on-save="updateRule(rule, filter)"
-                working="rule.working"
-                invalid="!valid(rule)"
-                ng-show="rule.editMode">
-        </button>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
+              </div>
+
+              <div class="row">
+                <div ng-class="{ 'col-sm-12': rule.type != 'range', 'col-sm-5': rule.type === 'range'}"
+                     ng-show="rule.type === 'greater' || rule.type === 'range'">
+
+                  <div class="form-group">
+                    <label for="minVersion" translate>Minimum Version</label>
+
+                    <input id="minVersion" type="text"
+                           class="form-control"
+                           placeholder="{{ 'Minimum Version' | translate }}"
+                           ng-model="rule.min_version"
+                           ng-hide="denied('edit_content_views', contentView)"/>
+                  </div>
+                </div>
+
+                <div ng-class="{ 'col-sm-12': rule.type != 'range', 'col-sm-5': rule.type === 'range'}"
+                     ng-show="rule.type === 'less' || rule.type === 'range'">
+
+                  <div class="form-group">
+                    <label for="maxVersion" translate>Maximum Version</label>
+
+                    <input id="maxVersion" type="text"
+                           class="form-control"
+                           placeholder="{{ 'Maximum Version' | translate }}"
+                           ng-model="rule.max_version"
+                           ng-hide="denied('edit_content_views', contentView)"/>
+                  </div>
+                </div>
+
+                <div class="col-sm-12">
+                  <div class="form-group" ng-show="rule.type === 'equal'">
+                    <label for="version" translate>Version</label>
+
+                    <input id="version" type="text" class="form-control"
+                           placeholder="{{ 'Version' | translate }}"
+                           ng-model="rule.version"
+                           ng-hide="denied('edit_content_views', contentView)"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </td>
+
+          <td bst-table-cell class="action-cell">
+            <button type="button" class="btn btn-default" ng-click="rule.editMode = true; backupPrevious(rule)" ng-hide="rule.editMode">
+              <span translate>Edit</span>
+            </button>
+
+            <button bst-save-control
+                    on-cancel="restorePrevious(rule); rule.editMode = false"
+                    on-save="saveRule(rule)"
+                    working="rule.working"
+                    invalid="!valid(rule)"
+                    ng-show="rule.editMode">
+            </button>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>