Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-11905 New Admin UI input boxes for JSON query and facet DSL (#576)

Jan Høydahld405cf463c65
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 4623c7e4748..507fd0a94f2 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -275,6 +275,8 @@ when told to. The admin UI now tells it to. (Nazerke Seidan, David Smiley)
* SOLR-15755: Parse collection, shard, core, replica info from newSearcher events in postlogs tool (Joel Bernstein)
+* SOLR-11905: New Admin UI Query screen input boxes for JSON query and facet DSL (janhoy)
+
Build
---------------------
* LUCENE-9077 LUCENE-9433: Support Gradle build, remove Ant support from trunk (Dawid Weiss, Erick Erickson, Uwe Schindler et.al.)
diff --git a/solr/webapp/web/css/angular/query.css b/solr/webapp/web/css/angular/query.css
index dc0c4574c73..6f83e40aec1 100644
--- a/solr/webapp/web/css/angular/query.css
+++ b/solr/webapp/web/css/angular/query.css
@@ -165,3 +165,12 @@ limitations under the License.
#content #query #result #response
{
}
+
+#content #query #form label a.help
+{
+ background-image: url( ../../img/ico/question-white.png );
+ background-position: 0 50%;
+ color: #4D4D4D;
+ padding-left: 21px;
+ margin-left: 5px;
+}
diff --git a/solr/webapp/web/partials/query.html b/solr/webapp/web/partials/query.html
index 6427a3a41da..f063c374065 100644
--- a/solr/webapp/web/partials/query.html
+++ b/solr/webapp/web/partials/query.html
@@ -269,6 +269,11 @@ limitations under the License.
<input type="checkbox" ng-model="val['facet.missing']" name="facet.missing" id="facet_missing">
facet.missing
</label>
+
+ <label for="json_facet" title="JSON Facet API">
+ json.facet <a href="https://solr.apache.org/guide/json-facet-api.html" target="_blank" class="help"></a>
+ </label>
+ <textarea ng-model="val['json.facet']" name="json.facet" id="json_facet" rows="6"></textarea>
</div>
</fieldset>
@@ -359,6 +364,10 @@ limitations under the License.
</div>
</div>
+ <label for="json_query" title="JSON Request API">
+ JSON Query <a href="https://solr.apache.org/guide/json-request-api.html" target="_blank" class="help"></a>
+ </label>
+ <textarea name="json" ng-model="val['json']" id="json_query" title="JSON Query"></textarea>
<button type="submit" ng-click="doQuery()">Execute Query</button>
</form>