Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15414 Use ConfigSetAPI to list configs on AdminUI (#140)

Nazerke Seidan18e57cdb653c
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 457f64010dd..2129d2f4c38 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -129,6 +129,8 @@ when told to. The admin UI now tells it to. (Nazerke Seidan, David Smiley)
* SOLR-15335: Docker: Solr has capability to build functionally-identical local and official Docker image. (hossman, Houston Putman)
+* SOLR-15414: Use ConfigSet API instead of Zookeeper data node to list out configsets available in Solr Admin UI. (Nazerke Seidan via Eric Pugh)
+
Other Changes
----------------------
* SOLR-14656: Autoscaling framework removed (Ishan Chattopadhyaya, noble, Ilan Ginzburg)
diff --git a/solr/webapp/web/js/angular/controllers/collections.js b/solr/webapp/web/js/angular/controllers/collections.js
index 8675ededa2b..754e91fdb25 100644
--- a/solr/webapp/web/js/angular/controllers/collections.js
+++ b/solr/webapp/web/js/angular/controllers/collections.js
@@ -16,7 +16,7 @@
*/
solrAdminApp.controller('CollectionsController',
- function($scope, $routeParams, $location, $timeout, Collections, Zookeeper, Constants){
+ function($scope, $routeParams, $location, $timeout, Collections, Zookeeper, Constants, ConfigSets){
$scope.resetMenu("collections", Constants.IS_ROOT_PAGE);
$scope.refresh = function() {
@@ -75,11 +75,11 @@ solrAdminApp.controller('CollectionsController',
$scope.liveNodes = data.cluster.liveNodes;
});
- Zookeeper.configs(function(data) {
+ ConfigSets.configs(function(data) {
$scope.configs = [];
- var items = data.tree[0].children;
+ var items = data.configSets;
for (var i in items) {
- $scope.configs.push({name: items[i].text});
+ $scope.configs.push({name: items[i]});
}
});
};
diff --git a/solr/webapp/web/js/angular/services.js b/solr/webapp/web/js/angular/services.js
index 4c409a684fc..d8e39efd320 100644
--- a/solr/webapp/web/js/angular/services.js
+++ b/solr/webapp/web/js/angular/services.js
@@ -43,6 +43,11 @@ solrAdminServices.factory('System',
"reload": {method: "GET", params:{action:"RELOAD", core: "@core"}}
});
}])
+.factory('ConfigSets',
+ ['$resource', function ($resource) {
+ return $resource('admin/configs', {'wt': 'json', '_': Date.now()}, {"configs": {params: {action: "LIST"}}
+ });
+ }])
.factory('Cores',
['$resource', function($resource) {
return $resource('admin/cores',