SOLR-3851: create a new core/delete an existing core should also update the main/left list of cores on the admin UI

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1429286 13f79535-47bb-0310-9956-ffa450edef68

solr/CHANGES.txt

@@ -222,6 +222,9 @@ Optimizations
 
 * SOLR-4261: Percentage Infos on Dashboard have a fixed width (steffkes)
 
+* SOLR-3851: create a new core/delete an existing core should also update 
+  the main/left list of cores on the admin UI (steffkes)
+
 Bug Fixes
 ----------------------
 

solr/webapp/web/js/scripts/app.js

@@ -172,29 +172,40 @@ var solr_admin = function( app_config )
     }
   };
 
-  this.run = function()
+  sort_cores_data = function sort_cores_data( cores_status )
   {
-    $.ajax
+    // build array of core-names for sorting
-    (
+    var core_names = [];
+    for( var core_name in cores_status )
     {
-        url : config.solr_path + config.core_admin_path + '?wt=json',
+      core_names.push( core_name );
-        dataType : 'json',
+    }
-        beforeSend : function( arr, form, options )
+    core_names.sort();
-        {               
-          $( '#content' )
-            .html( '<div id="index"><div class="loader">Loading ...</div></div>' );
-        },
-        success : function( response )
-        {
-          self.cores_data = response.status;
-          var core_count = 0;
 
-          for( var core_name in response.status )
+    var core_count = core_names.length;
+    var cores = {};
+
+    for( var i = 0; i < core_count; i++ )
+    {
+      var core_name = core_names[i];
+      cores[core_name] = cores_status[core_name];
+    }
+
+    return cores;
+  };
+
+  this.set_cores_data = function set_cores_data( cores )
+  {
+    self.cores_data = sort_cores_data( cores.status );
+    
+    self.menu_element
+      .empty();
+
+    var core_count = 0;
+    for( var core_name in self.cores_data )
     {
       core_count++;
       var core_path = config.solr_path + '/' + core_name;
-            var schema =  response['status'][core_name]['schema'];
-            var solrconfig =  response['status'][core_name]['config'];
       var classes = [];
 
       if( !environment_basepath )
@@ -202,7 +213,7 @@ var solr_admin = function( app_config )
         environment_basepath = core_path;
       }
 
-            if( response['status'][core_name]['isDefaultCore'] )
+      if( cores.status[core_name]['isDefaultCore'] )
       {
         classes.push( 'default' );
       }
@@ -210,8 +221,8 @@ var solr_admin = function( app_config )
       var core_tpl = '<li id="' + core_name.replace( /\./g, '__' ) + '" '
                    + '    class="' + classes.join( ' ' ) + '"'
                    + '    data-basepath="' + core_path + '"'
-                         + '    schema="' + schema + '"'
+                   + '    schema="' + cores.status[core_name]['schema'] + '"'
-                         + '    config="' + solrconfig + '"'
+                   + '    config="' + cores.status[core_name]['config'] + '"'
                    + '>' + "\n"
                    + '  <p><a href="#/' + core_name + '">' + core_name + '</a></p>' + "\n"
                    + '  <ul>' + "\n"
@@ -233,16 +244,16 @@ var solr_admin = function( app_config )
         .append( core_tpl );
     }
 
-          if( response.initFailures )
+    if( cores.initFailures )
     {
       var failures = [];
-            for( var core_name in response.initFailures )
+      for( var core_name in cores.initFailures )
       {
         failures.push
         (
           '<li>' +
             '<strong>' + core_name.esc() + ':</strong>' + "\n" +
-                  response.initFailures[core_name].esc() + "\n" +
+            cores.initFailures[core_name].esc() + "\n" +
           '</li>'
         );
       }
@@ -262,8 +273,33 @@ var solr_admin = function( app_config )
       ( 
         '<div class="message">There are no SolrCores running. <br/> Using the Solr Admin UI currently requires at least one SolrCore.</div>'
       );
-            return;
     } // else: we have at least one core....
+  };
+
+  this.run = function()
+  {
+    $.ajax
+    (
+      {
+        url : config.solr_path + config.core_admin_path + '?wt=json',
+        dataType : 'json',
+        beforeSend : function( arr, form, options )
+        {               
+          $( '#content' )
+            .html( '<div id="index"><div class="loader">Loading ...</div></div>' );
+        },
+        success : function( response )
+        {
+          self.set_cores_data( response );
+
+          for( var core_name in response.status )
+          {
+            var core_path = config.solr_path + '/' + core_name;
+            if( !environment_basepath )
+            {
+              environment_basepath = core_path;
+            }
+          }
 
           var system_url = environment_basepath + '/admin/system?wt=json';
           $.ajax

solr/webapp/web/js/scripts/cores.js

@@ -36,7 +36,7 @@ sammy.bind
         },
         success : function( response, text_status, xhr )
         {
-          app.cores_data = response.status;
+          app.set_cores_data( response );
           params.callback( app.cores_data );
         },
         error : function( xhr, text_status, error_thrown)
@@ -189,7 +189,7 @@ sammy.get
                 // index-data
 
                 $( '.lastModified dd', index_data_element )
-                  .html( core_data.index.lastModified );
+                  .html( core_data.index.lastModified || '-' );
 
                 $( '.version dd', index_data_element )
                   .html( core_data.index.version );
@@ -201,7 +201,7 @@ sammy.get
                   .html( core_data.index.maxDoc );
                 
                 $( '.deletedDocs dd', index_data_element )
-                  .html( core_data.index.deletedDocs );
+                  .html( core_data.index.deletedDocs || '-' );
 
                 $( '.optimized dd', index_data_element )
                   .addClass( !core_data.index.hasDeletions ? 'ico-1' : 'ico-0' );