chef-server-webui 0.9.18 → 0.10.0.beta.0

data/app/views/roles/_run_lists.html.erb

@@ -0,0 +1,26 @@
+<div class="runListWithControlsContainer <%= environment == @current_env ? 'active' : 'inactive' -%>" id="<%= environment %>">
+  <div class="sortable runListContainer">
+
+    <% run_list_class, empty_controls_class = run_list ? %w{active inactive} : %w{inactive active} -%>
+
+    <ul class="ui-sortable connectedSortable runListItemList <%= run_list_class -%>" id="<%= environment %>">
+      <% Array(run_list).each do |item| %>
+        <li id="<%=h(item)%>" class="<%= class_for_run_list_item(item) -%> runListItem"><%=h display_run_list_item(item)-%></li>
+      <% end %>
+    </ul>
+    <div class="emptyRunListControlsContainer <%= empty_controls_class -%>" id="<%=environment -%>">
+      <div class="cloneRunListTitle">This role has no environment specific run list for the (<%= environment -%>) environment.</div>
+      <div class="cloneRunListOption">
+        <a href="javascript:void(0)" class="createEmptyRunListControl" id="<%= environment -%>">Create a new empty run list</a>
+      </div>
+      <div class="cloneRunListOption">
+        Or, clone an existing run list: <%= select :environment_to_clone, :collection => @existing_run_list_environments, :id => environment, :class => 'environmentToClone' %>
+      </div>
+    </div>
+  </div>
+    <div class="runListAdditionalControls" id="<%= environment -%>">
+      <% if run_list && (environment != '_default')%>
+        <a href="javascript:void(0);" class="deleteEnvRunList" id="<%= environment -%>">Remove environment specific run list for <%= environment %></a>
+      <% end %>
+    </div>
+</div>

data/app/views/roles/edit.html.haml

@@ -3,4 +3,4 @@
     %h2.title= "Role #{h @role.name}"
     .inner
       = partial('navigation', :active => 'edit')
-  = partial('form', :header => "Edit Role #{@role.name}", :form_id => 'edit_role', :submit_name => "Save Role", :submit_id => "edit_role_button", :form_for => 'edit', :form_url => url(:role, @role.name) )
+      = partial('form', :header => "Edit Role #{@role.name}", :form_id => 'edit_role', :submit_name => "Save Role", :submit_id => "edit_role_button", :form_for => 'edit', :form_url => url(:role, @role.name), :method => :put)

data/app/views/roles/new.html.haml

@@ -3,4 +3,4 @@
     %h2.title= "Role"
     .inner
       = partial('navigation', :active => 'create')
-  = partial('form', :header => "Create new Role", :form_id => 'create_role', :submit_name => "Create Role", :submit_id => "create_role_button", :form_for => 'create', :form_url => url(:roles))
+  = partial('form', :header => "Create new Role", :form_id => 'create_role', :submit_name => "Create Role", :submit_id => "create_role_button", :method => :post, :form_for => 'create', :form_url => url(:roles))

data/app/views/roles/show.html.haml

@@ -10,24 +10,27 @@
             = @role.description
 
           .left
-            %h3 Run List
+            %h3
+              = "Run List for Environment \"#{@current_env}\""
+              = @env_run_list_exists ? "" : "(_default)"
             %table.table
               %tr
                 %th.first Position
                 %th Name
+                %th Version
                 %th.last Type
-                - if @role.run_list.empty?
+                - if @run_list.empty?
                   %tr
                     %td{:colspan => 2} This role does not include any roles or recipes.
                 - else
-                  -@role.run_list.each_with_index do |run_list_item, i|
+                  -@run_list.each_with_index do |run_list_item, i|
                     %tr
                       %td.position= i
                       %td= run_list_item.name 
+                      %td= run_list_item.version 
                       %td= run_list_item.type 
           .left.accordion
             %h3.head= link_to("Recipes", "#")
-            - recipes = @role.run_list.expand('server').recipes
             %div
               %span.description.form.help
                 This is the list of recipes, fully expanded, as they will be applied to the node in question.  
@@ -35,14 +38,14 @@
                 %tr
                   %th.first Position
                   %th.last Name
-                - if @role.run_list.empty?
+                - if @run_list.empty?
                   %tr
                     %td{:colspan => 2} This node has no recipes applied.
                 - else
-                  - recipes.each_with_index do |recipe, i|
+                  - @recipes.each_with_index do |recipe, i|
                     %tr
                       %td.position= i
-                      %td= recipes
+                      %td= recipe
           .left 
             %h3 Default Attributes
             = build_tree('defattrs', @role.default_attributes)

data/app/views/status/index.html.haml

@@ -79,6 +79,7 @@
                             %tr
                               %th.first Position
                               %th Name
+                              %th Version
                               %th.last Type
                           %tbody
                             - if node[1].run_list.empty?
@@ -89,5 +90,5 @@
                                 %tr
                                   %td.position= i
                                   %td= run_list_item.name
+                                  %td= run_list_item.version
                                   %td= run_list_item.type
-

data/bin/chef-server-webui

@@ -28,6 +28,7 @@ require "merb-core"
 
 # Load chef and chef-server-api from source rather than gem, if present
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../chef/lib'))
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../chef-solr/lib/'))
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 
 # Print the version if we have -v or --version

data/config/router.rb

@@ -19,9 +19,20 @@
 
 Merb::Router.prepare do
   resources :nodes, :id => /[^\/]+/
+  match("/nodes/_environments/:environment_id").to(:controller => "nodes", :action => "index").name(:nodes_by_environment)
+
   resources :clients, :id => /[^\/]+/
   resources :roles
 
+  resources :environments do |e|
+    e.match("/recipes", :method => "get").to(:controller=>"environments", :action=>"list_recipes")
+    e.match("/cookbooks").to(:contoller => "environments", :action => "list_cookbooks").name(:cookbooks)
+    e.match("/nodes").to(:controller => "environments", :action => "list_nodes").name(:nodes)
+    e.match("/select").to(:controller => "environments", :action => "select_environment").name(:select)
+  end
+
+  #match('/environments/create').to(:controller => "environments", :action => "create").name(:environments_create)
+
   match("/status").to(:controller => "status", :action => "index").name(:status)
 
   resources :searches, :path => "search", :controller => "search"
@@ -36,17 +47,12 @@ Merb::Router.prepare do
   match("/cookbooks/_recipe_files").to(:controller => "cookbooks", :action => "recipe_files")
   match("/cookbooks/_definition_files").to(:controller => "cookbooks", :action => "definition_files")
   match("/cookbooks/_library_files").to(:controller => "cookbooks", :action => "library_files")
+  match("/cookbooks/_environments/:environment_id").to(:controller => "cookbooks", :action => "index").name(:cookbooks_by_environment)
 
-  match("/cookbooks/:cookbook_id/templates", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_templates", :action => "index")
-  match("/cookbooks/:cookbook_id/libraries", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_libraries", :action => "index")
-  match("/cookbooks/:cookbook_id/definitions", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_definitions", :action => "index")
-  match("/cookbooks/:cookbook_id/recipes", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_recipes", :action => "index")
-  match("/cookbooks/:cookbook_id/attributes", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_attributes", :action => "index")
-  match("/cookbooks/:cookbook_id/files", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_files", :action => "index")
-
+  match("/cookbooks/:cookbook_id", :cookbook_id => /[\w\.]+/, :method => 'get').to(:controller => "cookbooks", :action => "cb_versions")
   match("/cookbooks/:cookbook_id/:cb_version", :cb_version => /[\w\.]+/, :method => 'get').to(:controller => "cookbooks", :action => "show").name(:show_specific_version_cookbook)
   resources :cookbooks
-  
+
   resources :clients
 
   match("/databags/:databag_id/databag_items", :method => 'get').to(:controller => "databags", :action => "show", :id=>":databag_id")

data/lib/chef-server-webui/version.rb

@@ -1,3 +1,3 @@
 module ChefServerWebui
-  VERSION = '0.9.18'
+  VERSION = '0.10.0.beta.0'
 end

data/public/javascripts/chef.js

@@ -7,9 +7,9 @@
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,23 +17,45 @@
 // limitations under the License.
 //
 
+
 $(document).ready(function(){
 
-  $('form#edit_role, form#create_role').submit(function(event) {
-    var form = $(this);
-    var to_role = $('ul#for_role').sortable('toArray');
-    if (form.attr('id') == 'edit_role') {
-      form.append('<input type="hidden" name="_method" value="put">');
-    }
-    form.append($('input#role_name')).css('display', 'none');
-    form.append($('textarea#role_description')).css('display', 'none');
+  var buildHiddenFormFromDragDrop = function(form, runListSet) {
+    runListSet.each(function(i, envRunListUl) {
+      runListItemList = $(envRunListUl).find('li.runListItem')
+      if(runListItemList.length == 0){
+        activeRunListUl = envRunListUl.getAttribute("class").split(" ").indexOf('active')
+        if(activeRunListUl >= 0){
+          form.append('<input type="hidden" name="env_run_lists[' + envRunListUl.id + ']"/>');
+        }
+      }
+      else{
+        runListItemList.each(function(i, field) {
+          form.append('<input type="hidden" name="env_run_lists[' + envRunListUl.id + '][]" value="' + field.id + '"/>');
+        });
+      }
+    });
+  };
+
+  var buildHiddenFormFromJSONEditor = function(form) {
     form.append('<input type="hidden" id="default_attributes" name="default_attributes"/>');
-    $('input#default_attributes').attr('value', BCJTEP.save('json["defaults"]'))
+    $('input#default_attributes').attr('value', BCJTEP.save('json["defaults"]'));
     form.append('<input type="hidden" id="override_attributes" name="override_attributes"/>');
     $('input#override_attributes').attr('value', BCJTEP.save('json["overrides"]'));
-    jQuery.each(to_role, function(i, field) {
-      form.append('<input type="hidden" name="for_role[]" value="' + field + '"/>');
-    });
+  };
+
+  $('a#debugFormBuild').click(function(event) {buildHiddenFormFromDragDrop(event)});
+
+
+  $('form.roleForm').submit(function(event) {
+    buildHiddenFormFromDragDrop($(this), $('ul.runListItemList'));
+    buildHiddenFormFromJSONEditor($(this));
+  });
+
+  $('form#edit_environment, form#create_environment').submit(function(event) {
+    var form = $(this);
+    form.append('<input type="hidden" id="attributes" name="attributes"/>');
+    $('input#attributes').attr('value', BCJTEP.save('json'))
   });
 
   $('form#edit_node, form#create_node').submit(function(event) {
@@ -59,7 +81,7 @@ $(document).ready(function(){
     form.append($('input#json_data').attr('value', BCJTEP.save()));
   });
 
-	$('form#edit_databag, form#create_databag').submit(function(event) {
+  $('form#edit_databag, form#create_databag').submit(function(event) {
     var form = $(this);
     if (form.attr('id') == 'edit_databag') {
       form.append('<input type="hidden" name="_method" value="put">');
@@ -84,77 +106,212 @@ $(document).ready(function(){
     var form = $(this);
     if (form.attr('id') == 'edit_user') {
       form.append('<input type="hidden" name="_method" value="put">');
-    	form.append($('input#user_new_password')).css('display', 'none');
-    	form.append($('input#user_admin')).css('display', 'none');
-    	form.append($('input#user_confirm_new_password')).css('display', 'none');
-			form.append($('input#openid')).css('display', 'none');
-		}
-		if (form.attr('id') == 'login') {
-			form.append($('input#user_name')).css('display', 'none');
-			form.append($('input#password')).css('display', 'none');
-  	}
+      form.append($('input#user_new_password')).css('display', 'none');
+      form.append($('input#user_admin')).css('display', 'none');
+      form.append($('input#user_confirm_new_password')).css('display', 'none');
+      form.append($('input#openid')).css('display', 'none');
+    }
+    if (form.attr('id') == 'login') {
+      form.append($('input#user_name')).css('display', 'none');
+      form.append($('input#password')).css('display', 'none');
+    }
   });
 
   // livequery hidden form for link_to ajax magic
   $('a[method]').livequery(function(){
     var message = $(this).attr('confirm');
     var method  = $(this).attr('method');
-    
+
     if (!method && !message) return;
-    
+
     $(this).click(function(event){
       if (message && !confirm(message)) {
         event.preventDefault();
         return;
       }
-      
-      if (method == 'post' || method == 'put' || method == 'delete') {
+
+      if (method === 'post' || method === 'put' || method === 'delete') {
         event.preventDefault();
         var form = $("<form/>").attr('method', 'post').attr('action', this.href).attr('style', 'display: none');
-        if (method != "post") {
+        if (method !== "post") {
           form.append($('<input type="hidden" name="_method"/>').attr('value', method));
         }
         form.insertAfter(this).submit();
       }
     });
   });
-  
+
   // accordion for the cookbooks show view
-	$('.accordion .head').click(function() {
-		$(this).next().toggle('slow');
-		return false;
-	}).next().hide();
-	
-	// global facebox callback
-	$('a[rel*=facebox]').facebox();
-	
-
-  $('.connectedSortable').sortable({
-    placeholder: 'ui-state-highlight',
-    connectWith: $('.connectedSortable')
-  }).disableSelection();
+  $('.accordion .head').click(function() {
+    $(this).next().toggle('slow');
+    return false;
+  }).next().hide();
+
+  // global facebox callback
+  $('a[rel*=facebox]').facebox();
+
+
+  var enableDragDropBehavior = function() {
+    $('.connectedSortable').sortable({
+      placeholder: 'ui-state-highlight',
+      connectWith: $('.connectedSortable')
+    }).disableSelection();
+  };
+
+  var disableDragDropBehavior = function() {
+    $('.connectedSortable').sortable("destroy");
+  };
+
+  enableDragDropBehavior();
 
   // The table tree!
   $('table.tree').treeTable({ expandable: true });
   $('span.expander').click(function() { $('tr#' + $(this).attr('toggle')).toggleBranch(); });
-  
+
   // Tooltips
-  $("div.tooltip").tooltip({ 
+  $("div.tooltip").tooltip({
       position: ['center', 'right'],
       offset: [-5, 10],
       effect: 'toggle',
-      opacity: 0.7 
+      opacity: 0.7
   });
-  
+
   // Show the sidebars if they have text in them!
   var sidebar_block_notice_children = $("#sidebar_block_notice").children().length;
   var sidebar_block_children = $("#sidebar_block").children().length;
-  
+
   if (sidebar_block_notice_children > 0) {
     $("#sidebar_block_notice").fadeIn();
   }
-  
+
   if (sidebar_block_children > 0) {
     $("#sidebar_block").fadeIn();
   }
+
+  // Run list editor with per-env run lists for roles
+
+  var populateAvailableRecipesForEnv = function(currentEnvironment, callback) {
+    $.getJSON('/environments/' + currentEnvironment + '/recipes', function(data) {
+      $('div#available_recipes_container .spinner').hide();
+      for (var i=0; i < data['recipes'].length; i++) {
+        var recipe = data['recipes'][i];
+        $('ul.availableRecipes').append('<li id="recipe[' + recipe + ']" class="ui-state-default runListItem">' +  recipe + '</li>');
+      }
+    });
+    if (callback) { callback(); }
+  };
+
+  var depopulateAvailableRecipesForEnv = function() {
+    $('ul.availableRecipes li').remove();
+    $('div#available_recipes_container .spinner').show();
+  };
+
+  // If the attribute 'data-initial-env' exists on this element, use it to load
+  // the recipes for that environment via ajax.
+  var initialEnvironment = $('div#environmentRunListSelector').data('initial-env');
+  if (initialEnvironment) {
+    populateAvailableRecipesForEnv(initialEnvironment);
+  }
+
+  var resetAvailableRoleList = function() {
+    $('ul#availableRoles li').remove();
+    var allRoles = $('ul#availableRoles').data('role-list');
+    for (var i=0; i < allRoles.length; i++) {
+      var role = allRoles[i];
+      $('ul#availableRoles').append('<li id="role[' + role + ']" class="ui-state-highlight runListItem">' + role + '</li>');
+    }
+
+  };
+
+  var clearRunListFor = function(environment) {
+    $('ul.runListItemList#' + environment).children().remove();
+  };
+
+  var removeEnvironmentFromCloneControls = function(environment) {
+    $('select.environmentToClone option[value="' + environment + '"]').remove();
+  };
+
+  var addEnvironmentToCloneControls = function(environment) {
+    $('select.environmentToClone').append('<option value="' + environment + '">' + environment + '</option>');
+  };
+
+  var deleteEnvRunList = function(environment) {
+    clearRunListFor(environment);
+    $('ul.runListItemList#' + environment).removeClass('active').addClass('inactive');
+    $('div.emptyRunListControlsContainer#' + environment).removeClass('inactive').addClass('active');
+    $('div.runListAdditionalControls#' + environment + " a").remove();
+    removeEnvironmentFromCloneControls(environment);
+  };
+
+  var createRunListDeleteLinkFor = function(environment) {
+    // remove any existing link
+    $('a.deleteEnvRunList#' + environment).remove();
+    var containerDiv = $('div.runListAdditionalControls#' + environment);
+    var link = '<a href="javascript:void(0);" class="deleteEnvRunList" id="' + environment  + '">Remove environment specific run list for ' + environment + '</a>';
+    containerDiv.append(link);
+    containerDiv.find('a').click(function(j) {deleteEnvRunList(environment);});
+  };
+
+  $('a.createEmptyRunListControl').each(function(i) {
+    var environment = $(this).attr('id');
+    $(this).click(function(event) {
+      $('div.emptyRunListControlsContainer#' + environment).removeClass('active').addClass('inactive');
+      var runListContainerForEnv = $('div.runListContainer#' + environment + 'RunListContainer');
+      $('ul.runListItemList#' + environment).removeClass('inactive').addClass('active');
+      // remove all previous drag/drop events/behavior/whatever, then re-add it for the new run list container
+      disableDragDropBehavior();
+      enableDragDropBehavior();
+      createRunListDeleteLinkFor(environment);
+      addEnvironmentToCloneControls(environment);
+    });
+  });
+
+  var setActiveRunListLabelFor = function(environment) {
+    var labelElement = $('span#selectedRunListEditorLabel');
+    if (environment === '_default') {
+      labelElement.html('Default Run List');
+    }
+    else {
+      labelElement.html('Run List for ' + environment);
+    }
+  };
+
+  $('a.deleteEnvRunList').each(function(i) {
+   var environment = $(this).attr('id');
+   $(this).click(function(j) {deleteEnvRunList(environment);});
+  });
+
+  $('select#activeEnvironment').change(function() {
+    // set the active run list editor
+    var newActiveEnvironment = $(this).val();
+    if (newActiveEnvironment !== 'noop') {
+      $('div.runListWithControlsContainer.active').removeClass('active').addClass('inactive');
+      $('div.runListWithControlsContainer#' + newActiveEnvironment).addClass('active', 10000).removeClass('inactive');
+      setActiveRunListLabelFor(newActiveEnvironment);
+      depopulateAvailableRecipesForEnv();
+      var selector = $(this);
+      populateAvailableRecipesForEnv(newActiveEnvironment, function() { selector.val('noop');});
+      resetAvailableRoleList();
+    }
+  });
+
+  $('select.environmentToClone').change(function() {
+    var environmentToClone = $(this).val();
+    var targetEnvironment = $(this).attr('id');
+    var targetRunList = $('ul.runListItemList#' + targetEnvironment);
+    clearRunListFor(targetEnvironment); // be sure we start with a clean slate
+    $('ul.runListItemList#' + environmentToClone).children().clone().appendTo(targetRunList);
+    $('ul.runListItemList#' + targetEnvironment).removeClass('inactive').addClass('active');
+    $('div.emptyRunListControlsContainer#' + targetEnvironment).removeClass('active').addClass('inactive');
+    createRunListDeleteLinkFor(targetEnvironment);
+    addEnvironmentToCloneControls(targetEnvironment);
+  });
+
+  $('select#nodeEnvironment').change(function() {
+    // set the active run list editor
+    var newNodeEnvironment = $(this).val();
+    depopulateAvailableRecipesForEnv();
+    populateAvailableRecipesForEnv(newNodeEnvironment);
+  });
+
 });