Skip to content

Some design polish for kql autocomplete #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukasolson merged 1 commit into from
Mar 15, 2018
Merged

Some design polish for kql autocomplete #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/ui/public/kuery/suggestions/operator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ const operators = {
fieldTypes: ['number', 'date', 'ip']
},
':*': {
description: '<span class="suggestionItem__callout">exists</span>'
description: '<span class="suggestionItem__callout">exists</span> in any form'
},
};

function getDescription({ fieldName, operator }) {
function getDescription({ operator }) {
const { description } = operators[operator];
return `<p>Filter results where <span class="suggestionItem__callout">${fieldName}</span> ${description}</p>`;
return `<p>${description}</p>`;
}

export function getSuggestionsProvider({ indexPattern }) {
Expand All @@ -41,7 +41,7 @@ export function getSuggestionsProvider({ indexPattern }) {
});
const suggestions = matchingOperators.map(operator => {
const text = operator + ' ';
const description = getDescription({ fieldName, operator });
const description = getDescription({ operator });
return { type, text, description, start: end, end };
});
return suggestions;
Expand Down
11 changes: 2 additions & 9 deletions src/ui/public/kuery/suggestions/value.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
import chrome from 'ui/chrome';
import { escapeQuotes } from './escape_kql';
import { escape } from 'lodash';

const baseUrl = chrome.addBasePath('/api/kibana/suggestions/values');
const type = 'value';

function getDescription({ fieldName, value }) {
return `
<p>Find results where <span class="suggestionItem__callout">${escape(fieldName)}</span>
is <span class="suggestionItem__callout">${escape(value)}</span></p>
`;
}

export function getSuggestionsProvider({ $http, config, indexPattern }) {
const shouldSuggestValues = config.get('filterEditor:suggestValues');
return shouldSuggestValues ? getValueSuggestions : () => Promise.resolve([]);
Expand Down Expand Up @@ -40,7 +32,8 @@ export function getSuggestionsProvider({ $http, config, indexPattern }) {
.filter(value => value.toLowerCase().includes(query.toLowerCase()))
.map(value => {
const text = `${value} `;
const description = getDescription({ fieldName, value });
// Values can get long, and they don't really need a description.
const description = '';
Copy link
Author

@snide snide Mar 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dunno if there was a better way to handle this.

return { type, text, description, start, end };
});
}
Expand Down
10 changes: 7 additions & 3 deletions src/ui/public/query_bar/directive/suggestion.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
background-color: tint(@globalColorTeal, 90%);
color: @globalColorTeal;
}

.suggestionItem__text {
width: auto;
}
}

&.suggestionItem--operator {
Expand All @@ -49,8 +53,8 @@

&.suggestionItem--conjunction {
.suggestionItem__type {
background-color: tint(@globalColorLightGray, 15%);
color: @globalColorMediumGray;
background-color: tint(@globalColorPurple, 90%);
color: @globalColorPurple;
}
}

Expand Down Expand Up @@ -141,7 +145,7 @@

.suggestionItem--conjunction {
.suggestionItem__type {
background-color: @globalColorLightGray;
background-color: tint(@globalColorPurple, 80%);
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/ui/public/styles/variables/colors.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
@globalColorWhite: #FFF;
@globalColorTeal: #00A69B;
@globalColorOrange: #E5830E;
@globalColorPurple: #7800A6;

//## Gray and brand colors for use across Bootstrap.

Expand Down