diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index d0700b6e4e7..bbd91f72cca 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -103,8 +103,6 @@ New Features * SOLR-11592: Add OpenNLP language detection to the langid contrib. (Koji, Steve Rowe) -* SOLR-11648: A new admin UI to display and execute suggestions (Apoorv Bhawsar , noble) - Bug Fixes ---------------------- diff --git a/solr/webapp/web/css/angular/menu.css b/solr/webapp/web/css/angular/menu.css index 998c5e3fd66..0e73a59a8cf 100644 --- a/solr/webapp/web/css/angular/menu.css +++ b/solr/webapp/web/css/angular/menu.css @@ -257,7 +257,6 @@ limitations under the License. #menu #collections.global p a { background-image: url( ../../img/ico/documents-stack.png ); } #menu #cores.global p a { background-image: url( ../../img/ico/databases.png ); } -#menu #cluster-suggestions.global p a { background-image: url( ../../img/ico/idea.png ); } #menu #cloud.global p a { background-image: url( ../../img/ico/network-cloud.png ); } #menu #cloud.global .tree a { background-image: url( ../../img/ico/folder-tree.png ); } diff --git a/solr/webapp/web/css/angular/suggestions.css b/solr/webapp/web/css/angular/suggestions.css deleted file mode 100644 index ef764f36a47..00000000000 --- a/solr/webapp/web/css/angular/suggestions.css +++ /dev/null @@ -1,46 +0,0 @@ -#cluster-suggestions -.s-container{ - text-align:center; -} -#cluster-suggestions -.s-box1{ - background-image: url( ../../img/ico/run.png ); - background-color: transparent; - background-repeat: no-repeat; - border: none; - cursor: pointer; - vertical-align: middle; - display:inline-block; - width:20px; -} -#cluster-suggestions -.s-box2{ - display:inline-block; -} -#cluster-suggestions -.s-box3{ - display:inline-block; -} -#cluster-suggestions -.s-box4{ - display:inline-block; -} -#s-table { - border-collapse: collapse; - width: 60%; -} - -#s-table td, #customers th { - border: 1px solid #ddd; - padding: 8px; -} - -#cluster-suggestions #s-table tr:nth-child(even){background-color: #f2f2f2;} - -#cluster-suggestions #s-table th { - padding-top: 12px; - padding-bottom: 12px; - text-align: left; - background-color: #4CAF50; - color: white; -} diff --git a/solr/webapp/web/img/ico/idea.png b/solr/webapp/web/img/ico/idea.png deleted file mode 100644 index 8b3abbd5e9b..00000000000 Binary files a/solr/webapp/web/img/ico/idea.png and /dev/null differ diff --git a/solr/webapp/web/img/ico/run.png b/solr/webapp/web/img/ico/run.png deleted file mode 100644 index dc35fe3cb29..00000000000 Binary files a/solr/webapp/web/img/ico/run.png and /dev/null differ diff --git a/solr/webapp/web/index.html b/solr/webapp/web/index.html index 54203bc00e4..35cd19600cf 100644 --- a/solr/webapp/web/index.html +++ b/solr/webapp/web/index.html @@ -41,7 +41,6 @@ limitations under the License. - @@ -79,8 +78,6 @@ limitations under the License. - - @@ -160,7 +157,6 @@ limitations under the License.
  • Java Properties

  • Thread Dump

  • -
  • Suggestions

  • diff --git a/solr/webapp/web/js/angular/app.js b/solr/webapp/web/js/angular/app.js index ad96ce0d3c0..1b7aa00afee 100644 --- a/solr/webapp/web/js/angular/app.js +++ b/solr/webapp/web/js/angular/app.js @@ -67,10 +67,6 @@ solrAdminApp.config([ templateUrl: 'partials/java-properties.html', controller: 'JavaPropertiesController' }). - when('/~cluster-suggestions', { - templateUrl: 'partials/cluster_suggestions.html', - controller: 'ClusterSuggestionsController' - }). when('/:core', { templateUrl: 'partials/core_overview.html', controller: 'CoreOverviewController' diff --git a/solr/webapp/web/js/angular/controllers/cluster-suggestions.js b/solr/webapp/web/js/angular/controllers/cluster-suggestions.js deleted file mode 100644 index d75622e5641..00000000000 --- a/solr/webapp/web/js/angular/controllers/cluster-suggestions.js +++ /dev/null @@ -1,45 +0,0 @@ -solrAdminApp.controller('ClusterSuggestionsController', -function($scope,$http) { - $scope.data={} - var dataArr =[]; - var dataJson = {}; - //function to display suggestion - $http({ - method: 'GET', - url: '/api/cluster/autoscaling/suggestions' - }).then(function successCallback(response) { - $scope.data = response.data; - $scope.parsedData = $scope.data.suggestions; - }, function errorCallback(response) { - }); - //function to perform operation - $scope.postdata = function (x) { - x.loading = true; - var path=x.operation.path; - var command=x.operation.command; - var fullPath='/api/'+path; - console.log(fullPath); - console.log(command); - $http.post(fullPath, JSON.stringify(command)).then(function (response) { - if (response.data) - console.log(response.data); - x.loading = false; - x.done = true; - x.run=true; - $scope.msg = "Command Submitted Successfully!"; - }, function (response) { - x.failed=true; - $scope.msg = "Service does not exist"; - $scope.statusval = response.status; - $scope.statustext = response.statusText; - $scope.headers = response.headers(); - }); - }; - $scope.showPopover = function() { - $scope.popup = true; - }; - - $scope.hidePopover = function () { - $scope.popup = false; - }; -}); diff --git a/solr/webapp/web/partials/cluster_suggestions.html b/solr/webapp/web/partials/cluster_suggestions.html deleted file mode 100644 index cbb05b2d903..00000000000 --- a/solr/webapp/web/partials/cluster_suggestions.html +++ /dev/null @@ -1,49 +0,0 @@ - - -
    -

    Cluster Suggestions

    -
    - - - - - - - - - - - - - - - - -
    TypeReasonAction
    NANANA
    {{ x.type }}{{ x.violation.clause }} -
    - -
    -
    -
    -
    -
    - -
    -