github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add documentation link to query bar when Kuery is selected (#13300) (#13350)

Browse source 
* Add doc link to kuery bar
This commit is contained in:
Matt Bargar 2017-08-04 16:54:00 -04:00 • committed by GitHub
parent 27f5b775e6
commit 7c78872c51
4 changed files with 33 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/ui/public/documentation_links/documentation_links.js
View file

@ -25,6 +25,7 @@ export const documentationLinks = {
luceneQuerySyntax:
`${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}/query-dsl-query-string-query.html#query-string-syntax`,
queryDsl: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}/query-dsl.html`,
kueryQuerySyntax: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/kuery-query.html`,
},
date: {
dateMath: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}/common-options.html#date-math`

14
src/ui/public/query_bar/directive/__tests__/query_bar.js
View file

@ -120,20 +120,6 @@ describe('queryBar directive', function () {
expectDeepEqual($parentScope.submitHandler.getCall(0).args[0], { query: 'bar', language: 'lucene' });
});
it('should customize the input element for each language', function () {
init({ query: 'foo', language: 'lucene' }, 'discover', true);
const luceneInput = $elem.find('.kuiLocalSearchInput');
expect(luceneInput.attr('placeholder')).to.be('Search... (e.g. status:200 AND extension:PHP)');
const helpLink = $elem.find('.kuiLocalSearchAssistedInput__assistance .kuiLink');
expect(helpLink.text().trim()).to.be('Uses lucene query syntax');
$parentScope.query = { query: 'foo', language: 'kuery' };
$parentScope.$digest();
const kueryInput = $elem.find('.kuiLocalSearchInput');
expect(kueryInput.attr('placeholder')).to.be('Search with kuery...');
});
});
describe('typeahead key', function () {

42
src/ui/public/query_bar/directive/query_bar.html
View file

@ -15,7 +15,7 @@
ng-model="queryBar.localQuery.query"
placeholder="Search... (e.g. status:200 AND extension:PHP)"
aria-label="Search input"
aria-describedby="discover-lucene-syntax-hint"
aria-describedby="discoverLuceneSyntaxHint"
type="text"
class="kuiLocalSearchInput kuiLocalSearchInput--lucene"
ng-class="{'kuiLocalSearchInput-isInvalid': queryBarForm.$invalid}"
@ -24,7 +24,7 @@
<div class="kuiLocalSearchAssistedInput__assistance">
<p class="kuiText">
<a
id="discover-lucene-syntax-hint"
id="discoverLuceneSyntaxHint"
class="kuiLink"
ng-href="{{queryBar.queryDocLinks.luceneQuerySyntax}}"
target="_blank"
@ -36,18 +36,32 @@
</div>
<!-- kuery input -->
<input
ng-if="queryBar.localQuery.language === 'kuery'"
ng-model="queryBar.localQuery.query"
input-focus
kbn-typeahead-input
placeholder="Search with kuery..."
aria-label="Search input"
type="text"
class="kuiLocalSearchInput"
ng-class="{'kuiLocalSearchInput-isInvalid': queryBarForm.$invalid}"
data-test-subj="queryInput"
>
<div class="kuiLocalSearchAssistedInput" ng-if="queryBar.localQuery.language === 'kuery'">
<input
ng-model="queryBar.localQuery.query"
input-focus
kbn-typeahead-input
placeholder="Search... (e.g. status:200 AND extension:PHP)"
aria-label="Search input"
aria-describedby="discoverKuerySyntaxHint"
type="text"
class="kuiLocalSearchInput kuiLocalSearchInput--kuery"
ng-class="{'kuiLocalSearchInput-isInvalid': queryBarForm.$invalid}"
data-test-subj="queryInput"
>
<div class="kuiLocalSearchAssistedInput__assistance">
<p class="kuiText">
<a
id="discoverKuerySyntaxHint"
class="kuiLink"
ng-href="{{queryBar.queryDocLinks.kueryQuerySyntax}}"
target="_blank"
>
Uses kuery syntax
</a>
</p>
</div>
</div>
<select
class="kuiLocalSearchSelect"

4
src/ui/public/styles/local_search.less
View file

@ -6,3 +6,7 @@
.kuiLocalSearchInput--lucene {
padding-right: 13em; /* 1 */
}
.kuiLocalSearchInput--kuery {
padding-right: 10em; /* 1 */
}