foreman_pipeline 0.0.11 → 0.1.0

data/app/assets/javascripts/foreman_pipeline/jobs/details/project-discovery/views/job-projects-discovery.html

@@ -2,7 +2,7 @@
 
 <div class="details details-full">
   <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-  
+
   <div class="row">
     <div class="col-sm-5">
       <a href="" ui-sref="jobs.details.jenkins-projects.list({jobId: job.id})">
@@ -19,9 +19,9 @@
 
   <div class="details-header row">
     <form ng-submit="discover()" role="form" class="col-sm-6" ng-show="permitted('edit_jobs', job)">
-      <div class="input-group" >    
-                
-        <input type="text" 
+      <div class="input-group" >
+
+        <input type="text"
              class="form-control input-lg"
              placeholder="{{ 'Search by name...' | translate }}"
              ng-model="discovery.pattern"
@@ -31,10 +31,14 @@
           <button translate
                   class="btn btn-primary btn-lg"
                   ng-disabled="discovery.pending || discovery.pattern === '' ">
-            <i class="fa fa-search" ng-show="!discovery.pending"></i>
-            <i class="fa fa-spinner fa-spin" ng-show="discovery.pending"></i>
+            <span ng-show="!discovery.pending">
+              <i class="fa fa-search"></i>
+            </span>
+            <span ng-show="discovery.pending">
+              <i class="fa fa-spinner fa-spin"></i>
+            </span>
             Search
-          </button>       
+          </button>
         </span>
       </div>
     </form>
@@ -59,11 +63,15 @@
                 ng-disabled="projectsTable.numSelected === 0 || discovery.pending || projectsTable.working"
                 ng-show="isState('jobs.details.jenkins-projects.discovery') && permitted('edit_jobs', job)"
                 ng-click="addProjects(job)">
-          <i class="fa fa-plus" ng-hide="projectsTable.working"></i>
-          <i class="fa fa-spinner fa-spin" ng-show="projectsTable.working"></i>
+          <span ng-hide="projectsTable.working">
+            <i class="fa fa-plus"></i>
+          </span>
+          <span ng-show="projectsTable.working">
+            <i class="fa fa-spinner fa-spin"></i>
+          </span>
           <span translate>Add Projects</span>
-        </button>       
-      </div>   
+        </button>
+      </div>
     </div>
   </div>
 
@@ -78,7 +86,7 @@
         </thead>
 
         <tbody>
-          <tr bst-table-row 
+          <tr bst-table-row
               row-select="project"
               ng-repeat="project in projectsTable.rows | filter:projectsTable.filterTerm">
             <td bst-table-cell>{{ project.name }}</td>

data/app/assets/javascripts/foreman_pipeline/jobs/details/views/job-details-content-views.html

@@ -15,10 +15,10 @@
 
   <section ng-show="cvTable.rows.length > 0">
     <div class="details-header row">
-      
+
       <div class="col-sm-3">
         <input type="text"
-                class="form-control"  
+                class="form-control"
                 placeholder="{{ 'Filter' | translate }}"
                 ng-model="cvFilter" />
       </div>
@@ -27,10 +27,14 @@
 
         <button class="btn btn-default"
                 ng-hide="denied('edit_jobs')"
-                ng-disabled="!cvTable.chosenRow || cvTable.working" 
+                ng-disabled="!cvTable.chosenRow || cvTable.working"
                 ng-click="setContentView()">
-          <i class="fa fa-pencil" ng-hide="cvTable.working"></i>      
-          <i class="fa fa-spinner fa-spin" ng-show="cvTable.working"></i>      
+          <span ng-hide="cvTable.working">
+            <i class="fa fa-pencil" ></i>
+          </span>
+          <span ng-show="cvTable.working">
+            <i class="fa fa-spinner fa-spin"></i>
+          </span>
           {{ 'Set Content View' | translate }}
         </button>
 
@@ -38,7 +42,7 @@
     </div>
 
     <div bst-table="cvTable" class="nutupane">
-      <div bst-container-scroll bst-infinite-scroll="cvTable.nextPage()">       
+      <div bst-container-scroll bst-infinite-scroll="cvTable.nextPage()">
 
         <table ng-class="{'table-mask': cvTable.working}" class="table table-full table-striped">
           <thead>
@@ -51,7 +55,7 @@
 
           <tbody>
             <tr bst-table-row ng-repeat="contentView in cvTable.rows | filter:cvFilter" row-choice="contentView">
-              
+
               <td bst-table-cell>
                 <a ui-sref="content-views.details.info({ contentViewId: contentView.id })">
                   {{ contentView.name }}
@@ -71,7 +75,7 @@
   <div ng-show="cvTable.rows.length === 0">
     <div class="loading-mask loading-mask-panel" ng-show="cvTable.working">
       <i class="fa fa-spinner fa-spin"></i>
-        {{ "Loading..." | translate }}          
+        {{ "Loading..." | translate }}
     </div>
 
     <p class="alert alert-info"

data/app/assets/javascripts/foreman_pipeline/jobs/details/views/job-details-environments.html

@@ -12,11 +12,11 @@
 </div>
 
 <section class="nutupane-sub-section">
-  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>  
+  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
 
   <div class="loading-mask loading-mask-panel" ng-show="loading">
     <i class="fa fa-spinner fa-spin"></i>
-      {{ "Loading..." | translate }}          
+      {{ "Loading..." | translate }}
   </div>
 
 
@@ -33,13 +33,17 @@
             ng-hide="denied('edit_jobs')"
             ng-disabled="!chosenEnvironment || working"
             ng-click="setEnvironment()">
-      <i class="fa fa-pencil" ng-hide="working"></i>      
-      <i class="fa fa-spinner fa-spin" ng-show="working"></i>           
+      <span ng-hide="working">
+        <i class="fa fa-pencil"></i>
+      </span>
+      <span ng-show="working">
+        <i class="fa fa-spinner fa-spin"></i>
+      </span>
       <span translate>Set Environment</span>
     </button>
   </section>
-  
-  
+
+
   <div ng-show="environments.length === 0 && !loading" >
     <p class="alert alert-info"
        ng-hide="loading"

data/app/assets/javascripts/foreman_pipeline/jobs/details/views/job-details-hostgroups.html

@@ -40,8 +40,12 @@
                   ng-hide="edit_jobs"
                   ng-disabled="!hostgroupsTable.chosenRow || hostgroupsTable.working"
                   ng-click="setHostgroup()">
-            <i class="fa fa-pencil" ng-hide="hostgroupsTable.working"></i>
-            <i class="fa fa-spinner fa-spin" ng-show="hostgroupsTable.working"></i>
+            <span ng-hide="hostgroupsTable.working">
+              <i class="fa fa-pencil"></i>
+            </span>
+            <span ng-show="hostgroupsTable.working">
+              <i class="fa fa-spinner fa-spin"></i>
+            </span>
             {{ 'Set Hostgroup' | translate }}
           </button>
       </div>

data/app/assets/javascripts/foreman_pipeline/jobs/details/views/job-details-jenkins-projects.html

@@ -23,8 +23,12 @@
               ng-disabled="projectsTable.numSelected === 0 || projectsTable.working"
               ng-show="isState('jobs.details.jenkins-projects.list') && permitted('edit_jobs', job) && projectsTable.rows.length > 0"
               ng-click="removeProjects()">
-        <i class="fa fa-minus" ng-hide="projectsTable.working"></i>
-        <i class="fa fa-spinner fa-spin" ng-show="projectsTable.working"></i>
+      <span ng-hide="projectsTable.working">
+        <i class="fa fa-minus"></i>
+      </span>
+      <span ng-show="projectsTable.working">
+        <i class="fa fa-spinner fa-spin"></i>
+      </span>
         <span translate>Remove Projects</span>
       </button>
 
@@ -43,7 +47,6 @@
 
   <table bst-table="projectsTable"
          class="table table-striped"
-         ng-show="projectsTable.rows.length > 0 && !projectsTable.working"
          ng-class="{'table-mask': projectsTable.working}">
     <thead>
       <tr bst-table-head row-select="jenkinsProject">
@@ -51,7 +54,7 @@
       </tr>
     </thead>
 
-    <tbody>
+    <tbody ng-show="projectsTable.rows.length > 0 && !projectsTable.working">
       <tr bst-table-row ng-repeat="jenkinsProject in projectsTable.rows | filter:jenkinsFilter" row-select="jenkinsProject">
         <td bst-table-cell>
           <a href="" ui-sref="jobs.details.jenkins-projects.parameters({ projectId: jenkinsProject.id })">
@@ -60,8 +63,6 @@
         </td>
       </tr>
     </tbody>
-
   </table>
 
 </section>
-

data/app/assets/javascripts/foreman_pipeline/jobs/details/views/job-details-jenkins.html

@@ -6,32 +6,36 @@
   <h4>
     <span translate>Current Jenkins Instance: </span>
     <a ui-sref="jenkins-instances.details.info({ jenkinsInstanceId: job.jenkins_instance.id })">
-      <span ng-show="job.jenkins_instance.name" ng-bind="job.jenkins_instance.name"></span>
+      <span class="no-capitalize" ng-show="job.jenkins_instance.name" ng-bind="job.jenkins_instance.name"></span>
     </a>
-    <span ng-show="!job.jenkins_instance.name" translate>none</span>
+    <span class="no-capitalize" ng-show="!job.jenkins_instance.name" translate>none</span>
   </h4>
 
-  <br/> 
+  <br/>
 
   <section>
     <div class="details-header row">
-      
+
       <div class="col-sm-3" ng-show="jenkinsTable.rows.length > 0">
         <input type="text"
-                class="form-control"  
+                class="form-control"
                 placeholder="{{ 'Filter' | translate }}"
                 ng-model="jenkinsFilter" />
       </div>
 
       <div class="fr select-action">
-        
+
         <span ng-show="jenkinsTable.rows.length > 0">
           <button class="btn btn-default"
                   ng-hide="denied('edit_jobs')"
-                  ng-disabled="!jenkinsTable.chosenRow || jenkinsTable.working" 
+                  ng-disabled="!jenkinsTable.chosenRow || jenkinsTable.working"
                   ng-click="setJenkins()">
-            <i class="fa fa-pencil" ng-hide="jenkinsTable.working"></i>
-            <i class="fa fa-spinner fa-spin" ng-show="jenkinsTable.working"></i> 
+            <span ng-hide="jenkinsTable.working">
+              <i class="fa fa-pencil" ></i>
+            </span>
+            <span ng-show="jenkinsTable.working">
+              <i class="fa fa-spinner fa-spin"></i>
+            </span>
             {{ 'Set Jenkins Instance' | translate }}
           </button>
         </span>
@@ -56,7 +60,7 @@
 
           <tbody>
             <tr bst-table-row ng-repeat="jenkinsInstance in jenkinsTable.rows | filter:jenkinsFilter" row-choice="jenkinsInstance">
-              
+
               <td bst-table-cell>
                 <a ui-sref="jenkins-instances.details.info({ jenkinsInstanceId: jenkinsInstance.id })">
                   {{ jenkinsInstance.name }}
@@ -76,7 +80,7 @@
   <div ng-show="jenkinsTable.rows.length === 0">
     <div class="loading-mask loading-mask-panel" ng-show="jenkinsTable.working">
       <i class="fa fa-spinner fa-spin"></i>
-        {{ "Loading..." | translate }}          
+        {{ "Loading..." | translate }}
     </div>
 
     <p class="alert alert-info"

data/app/assets/javascripts/foreman_pipeline/jobs/details/views/job-details-resources.html

@@ -10,9 +10,9 @@
   <h4>
     <span translate>Current Compute Resource: </span>
     <a ng-click="transitionToResource(job.resource)" ng-show="job.compute_resource.name">
-      <span ng-bind="job.compute_resource.name"></span>
+      <span class="no-capitalize" ng-bind="job.compute_resource.name"></span>
     </a>
-      <span ng-show="!job.compute_resource.name" translate>none</span>
+      <span class="no-capitalize" ng-show="!job.compute_resource.name" translate>none</span>
   </h4>
 
   <br/>
@@ -25,8 +25,8 @@
 
     <p class="alert alert-info"
        ng-hide="table.working"
-       translate> No Compute Resources to show.          
-    </p>        
+       translate> No Compute Resources to show.
+    </p>
   </div>
 
   <section ng-show="table.rows.length > 0">
@@ -43,17 +43,21 @@
                 ng-hide="edit_jobs"
                 ng-disabled="!table.chosenRow || table.working"
                 ng-click="setResource()">
-          <i class="fa fa-pencil" ng-hide="table.working"></i>
-          <i class="fa fa-spinner fa-spin" ng-show="table.working"></i>
+          <span ng-hide="table.working">
+            <i class="fa fa-pencil"></i>
+          </span>
+          <span ng-show="table.working">
+            <i class="fa fa-spinner fa-spin"></i>
+          </span>
           {{ 'Set Compute Resource' | translate }}
-        </button>      
+        </button>
       </div>
     </div>
 
     <div bst-table="table" class="nutupane">
       <div bst-container-scroll bst-infinite-scroll="table.nextPage()">
-                
-        <table 
+
+        <table
                ng-class="{'table-mask': table.working}"
                class="table table-striped table-full">
 
@@ -67,7 +71,7 @@
 
           <tbody>
             <tr bst-table-row ng-repeat="resource in table.rows | filter:resourceFilter" row-choice="resource">
-              
+
               <td bst-table-cell>
                 <a ng-click="transitionToResource(resource)">
                   {{ resource.name }}
@@ -76,9 +80,9 @@
               <td bst-table-cell>{{ resource.provider }}</td>
               <td bst-table-cell>{{ resource.url }}</td>
             </tr>
-            
+
           </tbody>
-          
+
         </table>
       </div>
     </div>

data/app/assets/javascripts/foreman_pipeline/jobs/details/views/job-details-to-environments.html

@@ -9,13 +9,13 @@
     </div>
 </div>
 <h4 translate>Lifecycle Environment selection: select target environment</h4>
-<section class="nutupane-sub-section"> 
-  
+<section class="nutupane-sub-section">
+
   <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
 
   <div class="loading-mask loading-mask-panel" ng-show="loading">
     <i class="fa fa-spinner fa-spin"></i>
-      {{ "Loading..." | translate }}          
+      {{ "Loading..." | translate }}
   </div>
 
 
@@ -31,13 +31,17 @@
             ng-hide="denied('edit_jobs')"
             ng-disabled="working"
             ng-click="setToEnvironments()">
-      <i class="fa fa-pencil" ng-hide="working"></i>      
-      <i class="fa fa-spinner fa-spin" ng-show="working"></i>           
+      <span ng-hide="working">
+        <i class="fa fa-pencil"></i>
+      </span>
+      <span ng-show="working">
+        <i class="fa fa-spinner fa-spin"></i>
+      </span>
       <span translate>Set To Environments</span>
     </button>
   </section>
-  
-  
+
+
   <div ng-show="availableEnvironments.length === 0" >
     <p class="alert alert-info"
        ng-hide="loading"

data/app/assets/javascripts/foreman_pipeline/jobs/jobs.module.js

@@ -3,7 +3,10 @@ angular.module('ForemanPipeline.jobs', [
     'Bastion.components',
     'ui.router',
     'Bastion',
-]);
+])
+.run(["FencedPages", function (FencedPages) {
+    FencedPages.addPages("jobs");
+}]);
 
 angular.module('ForemanPipeline.jobs').config(['$stateProvider', function ($stateProvider) {
     $stateProvider.state('jobs', {

data/app/assets/stylesheets/foreman_pipeline/foreman_pipeline.css

@@ -11,3 +11,7 @@
  *= require_self
  *= require_tree .
  */
+
+.details > h4 span.no-capitalize {
+  text-transform: none;
+}

data/app/controllers/foreman_pipeline/api/jenkins_instances_controller.rb

@@ -24,7 +24,10 @@ module ForemanPipeline
     param :organization_id, :number, :desc => N_("organization identifier"), :required => true
     param :name, String, :desc => N_("Name of the jenkins instance")
     def index
-      respond_for_index(:collection => scoped_search(index_relation.uniq, params[:sort_by], params[:sort_order]))
+      respond_for_index(:collection => scoped_search(index_relation.uniq,
+                                                     params[:sort_by],
+                                                     params[:sort_order],
+                                                     :includes => jenkins_instance_includes))
     end
 
     def index_relation
@@ -109,13 +112,17 @@ module ForemanPipeline
     protected
 
     def find_jenkins_instance
-      @jenkins_instance = JenkinsInstance.find_by_id(params[:id])
+      @jenkins_instance = JenkinsInstance.includes(jenkins_instance_includes).find_by_id(params[:id])
       fail ::Katello::HttpErrors::NotFound, "Could not find Jenkins Instance with id: #{params[:id]}" if @jenkins_instance.nil?
       @jenkins_instance
     end
 
+    def jenkins_instance_includes
+      [:jenkins_user]
+    end
+
     def jenkins_instance_params
-      params.require(:jenkins_instance).permit(:name, :url, :jenkins_home, :cert_path)
+      params.require(:jenkins_instance).permit(:name, :url, :jenkins_home, :cert_path, :timeout)
     end
   end
 end

data/app/controllers/foreman_pipeline/api/jenkins_projects_controller.rb

@@ -16,7 +16,7 @@ module ForemanPipeline
     private
 
     def find_jenkins_project
-      @jenkins_project = JenkinsProject.find_by_id(params[:id])
+      @jenkins_project = JenkinsProject.includes([:jenkins_project_params]).find_by_id(params[:id])
       fail ::Katello::HttpErrors::NotFound, "Could not find Jenkins Project with id: #{params[:id]}" if @jenkins_project.nil?
       @jenkins_project
     end