You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2018/01/23 14:08:51 UTC
lucene-solr:master: SOLR-11648: Reverting until license files can be
added
Repository: lucene-solr
Updated Branches:
refs/heads/master 653935bbd -> 471a56ab1
SOLR-11648: Reverting until license files can be added
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/471a56ab
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/471a56ab
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/471a56ab
Branch: refs/heads/master
Commit: 471a56ab10143a3c628c9ce224cc240ffe194b80
Parents: 653935b
Author: Ishan Chattopadhyaya <is...@apache.org>
Authored: Tue Jan 23 19:38:27 2018 +0530
Committer: Ishan Chattopadhyaya <is...@apache.org>
Committed: Tue Jan 23 19:38:27 2018 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 2 -
solr/webapp/web/css/angular/menu.css | 1 -
solr/webapp/web/css/angular/suggestions.css | 46 -----------------
solr/webapp/web/img/ico/idea.png | Bin 732 -> 0 bytes
solr/webapp/web/img/ico/run.png | Bin 1205 -> 0 bytes
solr/webapp/web/index.html | 4 --
solr/webapp/web/js/angular/app.js | 4 --
.../angular/controllers/cluster-suggestions.js | 45 -----------------
.../web/partials/cluster_suggestions.html | 49 -------------------
9 files changed, 151 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/471a56ab/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d0700b6..bbd91f7 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
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/471a56ab/solr/webapp/web/css/angular/menu.css
----------------------------------------------------------------------
diff --git a/solr/webapp/web/css/angular/menu.css b/solr/webapp/web/css/angular/menu.css
index 998c5e3..0e73a59 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 ); }
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/471a56ab/solr/webapp/web/css/angular/suggestions.css
----------------------------------------------------------------------
diff --git a/solr/webapp/web/css/angular/suggestions.css b/solr/webapp/web/css/angular/suggestions.css
deleted file mode 100644
index ef764f3..0000000
--- 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;
-}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/471a56ab/solr/webapp/web/img/ico/idea.png
----------------------------------------------------------------------
diff --git a/solr/webapp/web/img/ico/idea.png b/solr/webapp/web/img/ico/idea.png
deleted file mode 100644
index 8b3abbd..0000000
Binary files a/solr/webapp/web/img/ico/idea.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/471a56ab/solr/webapp/web/img/ico/run.png
----------------------------------------------------------------------
diff --git a/solr/webapp/web/img/ico/run.png b/solr/webapp/web/img/ico/run.png
deleted file mode 100644
index dc35fe3..0000000
Binary files a/solr/webapp/web/img/ico/run.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/471a56ab/solr/webapp/web/index.html
----------------------------------------------------------------------
diff --git a/solr/webapp/web/index.html b/solr/webapp/web/index.html
index 54203bc..35cd196 100644
--- a/solr/webapp/web/index.html
+++ b/solr/webapp/web/index.html
@@ -41,7 +41,6 @@ limitations under the License.
<link rel="stylesheet" type="text/css" href="css/angular/stream.css?_=${version}">
<link rel="stylesheet" type="text/css" href="css/angular/replication.css?_=${version}">
<link rel="stylesheet" type="text/css" href="css/angular/schema.css?_=${version}">
- <link rel="stylesheet" type="text/css" href="css/angular/suggestions.css?_=${version}">
<link rel="stylesheet" type="text/css" href="css/angular/segments.css?_=${version}">
<link rel="stylesheet" type="text/css" href="css/angular/threads.css?_=${version}">
<link rel="stylesheet" type="text/css" href="css/angular/chosen.css?_=${version}">
@@ -79,8 +78,6 @@ limitations under the License.
<script src="js/angular/controllers/replication.js"></script>
<script src="js/angular/controllers/schema.js"></script>
<script src="js/angular/controllers/segments.js"></script>
- <script src="js/angular/controllers/cluster-suggestions.js"></script>
-
</head>
<body ng-controller="MainController">
@@ -160,7 +157,6 @@ limitations under the License.
<li id="java-properties" class="global" ng-class="{active:page=='java-props'}"><p><a href="#/~java-properties">Java Properties</a></li>
<li id="threads" class="global" ng-class="{active:page=='threads'}"><p><a href="#/~threads">Thread Dump</a></p></li>
- <li id="cluster-suggestions" class="global" ng-class="{active:page=='cluster-suggestions'}"><p><a href="#/~cluster-suggestions">Suggestions</a></p></li>
</ul>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/471a56ab/solr/webapp/web/js/angular/app.js
----------------------------------------------------------------------
diff --git a/solr/webapp/web/js/angular/app.js b/solr/webapp/web/js/angular/app.js
index ad96ce0..1b7aa00 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'
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/471a56ab/solr/webapp/web/js/angular/controllers/cluster-suggestions.js
----------------------------------------------------------------------
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 d75622e..0000000
--- 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;
- };
-});
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/471a56ab/solr/webapp/web/partials/cluster_suggestions.html
----------------------------------------------------------------------
diff --git a/solr/webapp/web/partials/cluster_suggestions.html b/solr/webapp/web/partials/cluster_suggestions.html
deleted file mode 100644
index cbb05b2..0000000
--- a/solr/webapp/web/partials/cluster_suggestions.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<div id="cluster-suggestions">
- <h1>Cluster Suggestions</h1>
- <br/>
- <table id="s-table">
- <tr>
- <td>Type</td>
- <td>Reason</td>
- <td>Action</td>
- </tr>
- <tr ng-if="parsedData.length==0">
- <td>NA</td>
- <td>NA</td>
- <td>NA</td>
- </tr>
- <tr ng-repeat="x in parsedData">
- <td>{{ x.type }}</td>
- <td>{{ x.violation.clause }}</td>
- <td>
- <div class="s-container">
- <input class="s-box1" ng-hide="x.run" type="button"
- title="{{ x.operation }}" ng-click="postdata(x)" ng-mouseover="showPopover()"
- ng-mouseleave="hidePopover()"/>
- <div class="s-box2" ng-show="x.loading"><img src="img/loader.gif"></div>
- <div class="s-box3" ng-show="x.done"><img src="img/ico/tick.png"></div>
- <div class="s-box4" ng-show="x.failed"><img src="img/ico/cross.png"></div>
- </div>
- </td>
- </tr>
- </table>
-
-</div>
-