From 9e6c54651cee0fc068b6a37980b3ea1440f83f09 Mon Sep 17 00:00:00 2001 From: Pavel Date: Mon, 15 Oct 2018 13:00:17 +0300 Subject: [PATCH 01/14] translate discover plugin --- .../components/fetch_error/fetch_error.js | 21 ++- .../field_chooser/discover_field.html | 2 +- .../field_chooser/discover_field.js | 21 ++- .../field_chooser/field_chooser.html | 76 +++++---- .../components/field_chooser/field_chooser.js | 12 +- .../lib/detail_views/string.html | 35 +++- .../field_chooser/lib/field_calculator.js | 19 ++- .../public/discover/controllers/discover.js | 95 +++++++++-- .../controllers/get_painless_error.ts | 6 +- .../public/discover/directives/index.js | 5 +- .../public/discover/directives/no_results.js | 150 ++++++++++++++---- .../directives/unsupported_index_pattern.js | 13 +- .../kibana/public/discover/index.html | 49 ++++-- .../kibana/public/discover/index.js | 10 +- .../discover/saved_searches/_saved_search.js | 6 +- .../discover/top_nav/open_search_panel.js | 20 ++- 16 files changed, 414 insertions(+), 126 deletions(-) diff --git a/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js b/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js index 745693178d966..f732795f5672d 100644 --- a/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js +++ b/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js @@ -21,6 +21,7 @@ import 'ngreact'; import React, { Fragment } from 'react'; import { uiModules } from 'ui/modules'; import chrome from 'ui/chrome'; +import { FormattedMessage, injectI18nProvider } from '@kbn/i18n/react'; import { EuiFlexGroup, @@ -43,9 +44,21 @@ const DiscoverFetchError = ({ fetchError }) => { body = (

- You can address this error by editing the ‘{fetchError.script}’ field - in Management > Index Patterns, - under the “Scripted fields” tab. + + }} + />

); } @@ -77,4 +90,4 @@ const DiscoverFetchError = ({ fetchError }) => { const app = uiModules.get('apps/discover', ['react']); -app.directive('discoverFetchError', reactDirective => reactDirective(DiscoverFetchError)); +app.directive('discoverFetchError', reactDirective => reactDirective(injectI18nProvider(DiscoverFetchError))); diff --git a/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.html b/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.html index 76d7bec8e454c..206239f6ae3c4 100644 --- a/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.html +++ b/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.html @@ -17,7 +17,7 @@ ng-if="field.name !== '_source'" ng-click="toggleDisplay(field)" ng-class="::field.display ? 'kuiButton--danger' : 'kuiButton--primary'" - ng-bind="::field.display ? 'remove' : 'add'" + ng-bind="::addRemoveButtonLabel" class="dscSidebarItem__action kuiButton kuiButton--small" data-test-subj="fieldToggle-{{::field.name}}" > diff --git a/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js b/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js index 4627dfbdcf9e8..7472e1ff71790 100644 --- a/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js +++ b/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js @@ -26,7 +26,7 @@ import detailsHtml from './lib/detail_views/string.html'; import { uiModules } from 'ui/modules'; const app = uiModules.get('apps/discover'); -app.directive('discoverField', function ($compile) { +app.directive('discoverField', function ($compile, i18n) { return { restrict: 'E', template: html, @@ -42,11 +42,18 @@ app.directive('discoverField', function ($compile) { let detailsElem; let detailScope; - const init = function () { if ($scope.field.details) { $scope.toggleDetails($scope.field, true); } + + $scope.addRemoveButtonLabel = $scope.field.display + ? i18n('kbn.discover.fieldChooser.discoverField.removeButtonLabel', { + defaultMessage: 'remove', + }) + : i18n('kbn.discover.fieldChooser.discoverField.addButtonLabel', { + defaultMessage: 'add', + }); }; const getWarnings = function (field) { @@ -92,6 +99,16 @@ app.directive('discoverField', function ($compile) { $scope.onShowDetails(field, recompute); detailScope = $scope.$new(); detailScope.warnings = getWarnings(field); + detailScope.bucketAriaLabel = i18n('kbn.discover.fieldChooser.discoverField.bucketAriaLabel', { + defaultMessage: 'Value: {value}', + values: { + value: detailScope.bucket.display === '' + ? i18n('kbn.discover.fieldChooser.discoverField.emptyStringText', { + defaultMessage: 'Empty string', + }) + : detailScope.bucket.display, + }, + }); detailsElem = $(detailsHtml); $compile(detailsElem)(detailScope); diff --git a/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html b/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html index 2e64db6656bca..2fc2e03813180 100644 --- a/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html +++ b/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html @@ -1,4 +1,4 @@ -
+
- +
- +
+ i18n-id="kbn.discover.fieldChooser.resetFiltersButtonLabel" + i18n-default-message="Reset filters" + >
@@ -149,7 +166,10 @@
diff --git a/src/core_plugins/kibana/public/discover/index.js b/src/core_plugins/kibana/public/discover/index.js index d1a0bb1c9f1e6..383663fa9bd52 100644 --- a/src/core_plugins/kibana/public/discover/index.js +++ b/src/core_plugins/kibana/public/discover/index.js @@ -25,11 +25,15 @@ import './controllers/discover'; import 'ui/doc_table/components/table_row'; import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/registry/feature_catalogue'; -FeatureCatalogueRegistryProvider.register(() => { +FeatureCatalogueRegistryProvider.register((i18n) => { return { id: 'discover', - title: 'Discover', - description: 'Interactively explore your data by querying and filtering raw documents.', + title: i18n('kbn.discover.discoverTitle', { + defaultMessage: 'Discover', + }), + description: i18n('kbn.discover.discoverDescription', { + defaultMessage: 'Interactively explore your data by querying and filtering raw documents.', + }), icon: 'discoverApp', path: '/app/kibana#/discover', showOnHomePage: true, diff --git a/src/core_plugins/kibana/public/discover/saved_searches/_saved_search.js b/src/core_plugins/kibana/public/discover/saved_searches/_saved_search.js index 5a15c5a08c6be..89df75c753520 100644 --- a/src/core_plugins/kibana/public/discover/saved_searches/_saved_search.js +++ b/src/core_plugins/kibana/public/discover/saved_searches/_saved_search.js @@ -27,7 +27,7 @@ const module = uiModules.get('discover/saved_searches', [ 'kibana/courier' ]); -module.factory('SavedSearch', function (Private) { +module.factory('SavedSearch', function (Private, i18n) { const SavedObject = Private(SavedObjectProvider); createLegacyClass(SavedSearch).inherits(SavedObject); function SavedSearch(id) { @@ -38,7 +38,9 @@ module.factory('SavedSearch', function (Private) { id: id, defaults: { - title: 'New Saved Search', + title: i18n('kbn.discover.savedSearch.newSavedSearchTitle', { + defaultMessage: 'New Saved Search', + }), description: '', columns: [], hits: 0, diff --git a/src/core_plugins/kibana/public/discover/top_nav/open_search_panel.js b/src/core_plugins/kibana/public/discover/top_nav/open_search_panel.js index f06dcf5d9c3d6..1235272588fcb 100644 --- a/src/core_plugins/kibana/public/discover/top_nav/open_search_panel.js +++ b/src/core_plugins/kibana/public/discover/top_nav/open_search_panel.js @@ -21,6 +21,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder'; import rison from 'rison-node'; +import { FormattedMessage } from '@kbn/i18n/react'; import { EuiSpacer, @@ -40,7 +41,10 @@ export class OpenSearchPanel extends React.Component { onClick={this.props.onClose} href={`#/management/kibana/objects?_a=${rison.encode({ tab: SEARCH_OBJECT_TYPE })}`} > - Manage searches + ); } @@ -55,13 +59,23 @@ export class OpenSearchPanel extends React.Component { -

Open Search

+

+ +

+ } savedObjectType={SEARCH_OBJECT_TYPE} makeUrl={this.props.makeUrl} onChoose={this.props.onClose} From a80f58ad79b02244b531d26e08e917eb9f3741f2 Mon Sep 17 00:00:00 2001 From: tibmt Date: Mon, 22 Oct 2018 12:24:24 +0300 Subject: [PATCH 02/14] update discover translation PR --- .../components/fetch_error/fetch_error.js | 7 +-- .../field_chooser/field_chooser.html | 20 ++++---- .../lib/detail_views/string.html | 6 +-- .../field_chooser/lib/field_calculator.js | 6 +-- .../public/discover/controllers/discover.js | 47 +++++++++---------- .../public/discover/directives/no_results.js | 13 +++-- .../kibana/public/discover/index.html | 8 +++- .../kibana/public/discover/index.js | 2 +- 8 files changed, 57 insertions(+), 52 deletions(-) diff --git a/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js b/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js index f732795f5672d..4b86d8dac536b 100644 --- a/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js +++ b/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js @@ -46,12 +46,13 @@ const DiscoverFetchError = ({ fetchError }) => {

+

@@ -57,7 +57,7 @@ class="euiFlexItem sidebar-list-header-label" id="available_fields" tabindex="0" - i18n-id="kbn.discover.fieldChooser.availableFieldsTitle" + i18n-id="kbn.discover.fieldChooser.filter.availableFieldsTitle" i18n-default-message="Available fields" > @@ -95,7 +95,7 @@
@@ -155,7 +155,7 @@ ng-click="filter.reset()" ng-disabled="!filter.active" class="kuiButton kuiButton--danger kuiButton--fullWidth" - i18n-id="kbn.discover.fieldChooser.resetFiltersButtonLabel" + i18n-id="kbn.discover.fieldChooser.filter.resetFiltersButtonLabel" i18n-default-message="Reset filters" > @@ -167,7 +167,7 @@ class="list-unstyled sidebar-well dscFieldList--popular">
    • diff --git a/src/core_plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html b/src/core_plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html index d5cbafd2b1616..58b0846e093a4 100644 --- a/src/core_plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html +++ b/src/core_plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html @@ -37,7 +37,7 @@ css-truncate css-truncate-expandable="true" class="dscFieldDetails__value" - aria-label="{{bucketAriaLabel}}" + aria-label="{{::bucketAriaLabel}}" > {{::bucket.display}} - ( {{::warnings.length}} ) diff --git a/src/core_plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js b/src/core_plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js index 9f846828ab7ca..5f5f577f715b1 100644 --- a/src/core_plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js +++ b/src/core_plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js @@ -62,9 +62,9 @@ function getFieldValueCounts(params) { if (params.hits.length - missing === 0) { return { - error: i18n.translate('kbn.discover.fieldChooser.fieldCalculator.fieldIsNorPresentInDocumentsErrorMessage', { - defaultMessage: 'This field is present in your Elasticsearch mapping \ -but not in the {hitsLength} documents shown in the doc table. You may still be able to visualize or search on it.', + error: i18n.translate('kbn.discover.fieldChooser.fieldCalculator.fieldIsNotPresentInDocumentsErrorMessage', { + // eslint-disable-next-line max-len + defaultMessage: 'This field is present in your Elasticsearch mapping but not in the {hitsLength} documents shown in the doc table. You may still be able to visualize or search on it.', values: { hitsLength: params.hits.length, }, diff --git a/src/core_plugins/kibana/public/discover/controllers/discover.js b/src/core_plugins/kibana/public/discover/controllers/discover.js index 5e60800b43e6f..67d5bcf4f1251 100644 --- a/src/core_plugins/kibana/public/discover/controllers/discover.js +++ b/src/core_plugins/kibana/public/discover/controllers/discover.js @@ -194,19 +194,19 @@ function discoverController( }; $scope.topNavMenu = [{ - key: i18n('kbn.discover.newSearchTitle', { + key: i18n('kbn.discover.localMenu.localMenu.newSearchTitle', { defaultMessage: 'new', }), - description: i18n('kbn.discover.newSearchDescription', { + description: i18n('kbn.discover.localMenu.newSearchDescription', { defaultMessage: 'New Search', }), run: function () { kbnUrl.change('/discover'); }, testId: 'discoverNewButton', }, { - key: i18n('kbn.discover.saveTitle', { + key: i18n('kbn.discover.localMenu.saveTitle', { defaultMessage: 'save', }), - description: i18n('kbn.discover.saveSearchDescription', { + description: i18n('kbn.discover.localMenu.saveSearchDescription', { defaultMessage: 'Save Search', }), testId: 'discoverSaveButton', @@ -240,10 +240,10 @@ function discoverController( showSaveModal(saveModal); } }, { - key: i18n('kbn.discover.openTitle', { + key: i18n('kbn.discover.localMenu.openTitle', { defaultMessage: 'open', }), - description: i18n('kbn.discover.openSavedSearchDescription', { + description: i18n('kbn.discover.localMenu.openSavedSearchDescription', { defaultMessage: 'Open Saved Search', }), testId: 'discoverOpenButton', @@ -255,10 +255,10 @@ function discoverController( }); } }, { - key: i18n('kbn.discover.shareTitle', { + key: i18n('kbn.discover.localMenu.shareTitle', { defaultMessage: 'share', }), - description: i18n('kbn.discover.shareSearchDescription', { + description: i18n('kbn.discover.localMenu.shareSearchDescription', { defaultMessage: 'Share Search', }), testId: 'shareTopNavButton', @@ -279,10 +279,10 @@ function discoverController( }); } }, { - key: i18n('kbn.discover.inspectTitle', { + key: i18n('kbn.discover.localMenu.inspectTitle', { defaultMessage: 'inspect', }), - description: i18n('kbn.discover.openInspectorForSearchDescription', { + description: i18n('kbn.discover.localMenu.openInspectorForSearchDescription', { defaultMessage: 'Open Inspector for search', }), testId: 'openInspectorButton', @@ -312,15 +312,14 @@ function discoverController( const pageTitleSuffix = savedSearch.id && savedSearch.title ? `: ${savedSearch.title}` : ''; docTitle.change(`Discover${pageTitleSuffix}`); + const discoverBreadcrumbText = i18n('kbn.discover.discoverBreadcrumbText', { + defaultMessage: 'Discover', + }); if (savedSearch.id && savedSearch.title) { - breadcrumbState.set([{ text: i18n('kbn.discover.discoverBreadcrumbText', { - defaultMessage: 'Discover', - }), href: '#/discover' }, { text: savedSearch.title }]); + breadcrumbState.set([{ text: discoverBreadcrumbText, href: '#/discover' }, { text: savedSearch.title }]); } else { - breadcrumbState.set([{ text: i18n('kbn.discover.discoverBreadcrumbText', { - defaultMessage: 'Discover', - }) }]); + breadcrumbState.set([{ text: discoverBreadcrumbText }]); } let stateMonitor; @@ -410,8 +409,8 @@ function discoverController( $scope.getBucketIntervalToolTipText = () => { return ( i18n('kbn.discover.bucketIntervalTooltip', { - defaultMessage: 'This interval creates {bucketsDescription} \ -to show in the selected time range, so it has been scaled to {bucketIntervalDescription}', + // eslint-disable-next-line max-len + defaultMessage: 'This interval creates {bucketsDescription} to show in the selected time range, so it has been scaled to {bucketIntervalDescription}', values: { bucketsDescription: $scope.bucketInterval.scale > 1 ? i18n('kbn.discover.tooLargeBucketsText', { @@ -568,7 +567,7 @@ to show in the selected time range, so it has been scaled to {bucketIntervalDesc stateMonitor.setInitialState($state.toJSON()); if (id) { toastNotifications.addSuccess({ - title: i18n('kbn.discover.searchTitleSuccessfullySavedTitle', { + title: i18n('kbn.discover.notifications.savedSearchTitle', { defaultMessage: 'Search \'{savedSearchTitle}\' was saved', values: { savedSearchTitle: savedSearch.title, @@ -589,7 +588,7 @@ to show in the selected time range, so it has been scaled to {bucketIntervalDesc return { id }; } catch(saveError) { toastNotifications.addDanger({ - title: i18n('kbn.discover.searchTitleNotSavedTitle', { + title: i18n('kbn.discover.notifications.notSavedSearchTitle', { defaultMessage: 'Search \'{savedSearchTitle}\' was not saved.', values: { savedSearchTitle: savedSearch.title, @@ -691,14 +690,14 @@ to show in the selected time range, so it has been scaled to {bucketIntervalDesc if (status.remaining > 0) { const inspectorRequest = inspectorAdapters.requests.start( - i18n('kbn.discover.segmentFetchCompleteStatusTitle', { + i18n('kbn.discover.inspectorRequest.segmentFetchCompleteStatusTitle', { defaultMessage: 'Segment {fetchCompleteStatus}', values: { fetchCompleteStatus: $scope.fetchStatus.complete, } }), { - description: i18n('kbn.discover.segmentFetchCompleteStatusDescription', { + description: i18n('kbn.discover.inspectorRequest.segmentFetchCompleteStatusDescription', { defaultMessage: 'This request queries Elasticsearch to fetch the data for the search.', }), }); @@ -929,9 +928,9 @@ to show in the selected time range, so it has been scaled to {bucketIntervalDesc if (stateVal && !stateValFound) { const warningTitle = i18n('kbn.discover.valueIsNotConfiguredIndexPatternIDWarningTitle', { - defaultMessage: '"{stateVal}" is not a configured index pattern ID', + defaultMessage: '{stateVal} is not a configured index pattern ID', values: { - stateVal, + stateVal: '"' + stateVal + '"', }, }); diff --git a/src/core_plugins/kibana/public/discover/directives/no_results.js b/src/core_plugins/kibana/public/discover/directives/no_results.js index 7fdf27ebc4425..eed9edb33f65a 100644 --- a/src/core_plugins/kibana/public/discover/directives/no_results.js +++ b/src/core_plugins/kibana/public/discover/directives/no_results.js @@ -64,20 +64,20 @@ export class DiscoverNoResults extends Component { ), - failureShard: failure.shard, + failureShard: '"' + failure.shard + '"', }} /> @@ -99,7 +99,7 @@ export class DiscoverNoResults extends Component {

    @@ -137,8 +137,7 @@ export class DiscoverNoResults extends Component { id="kbn.discover.noResults.queryMayNotMatchTitle" defaultMessage="One or more of the indices you’re looking at contains a date field. Your query may not match anything in the current time range, or there may not be any data at all in - the currently selected time range. You can try {timepickerLink} and changing the time range to one which contains data. - " + the currently selected time range. You can try {timepickerLink} and changing the time range to one which contains data." values={{ timepickerLink: ( >  {{(hits || 0) | number:0}} - +
    diff --git a/src/core_plugins/kibana/public/discover/index.js b/src/core_plugins/kibana/public/discover/index.js index 383663fa9bd52..68685a9d5b28b 100644 --- a/src/core_plugins/kibana/public/discover/index.js +++ b/src/core_plugins/kibana/public/discover/index.js @@ -25,7 +25,7 @@ import './controllers/discover'; import 'ui/doc_table/components/table_row'; import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/registry/feature_catalogue'; -FeatureCatalogueRegistryProvider.register((i18n) => { +FeatureCatalogueRegistryProvider.register(i18n => { return { id: 'discover', title: i18n('kbn.discover.discoverTitle', { From eaf9147092d2ab31ee6c246656bd126e21ad9433 Mon Sep 17 00:00:00 2001 From: tibmt Date: Mon, 22 Oct 2018 14:09:35 +0300 Subject: [PATCH 03/14] Update fetch_error.js --- .../public/discover/components/fetch_error/fetch_error.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js b/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js index 4b86d8dac536b..7d0f79cb56561 100644 --- a/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js +++ b/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js @@ -48,8 +48,7 @@ const DiscoverFetchError = ({ fetchError }) => { id="kbn.discover.fetchError.howToAddressErrorDescription" defaultMessage="You can address this error by editing the {fetchErrorScript} field in {managementLink}, - under the {scriptFaild} tab. - " + under the {scriptFaild} tab." values={{ fetchErrorScript: '‘' + fetchError.script + '’', scriptFaild: '“Scripted fields”', From 2fba3f3439d7149558c46c871f06a3fe5591fea2 Mon Sep 17 00:00:00 2001 From: maryia-lapata Date: Thu, 1 Nov 2018 23:08:33 +0300 Subject: [PATCH 04/14] Update unit tests --- .../discover/directives/no_results.test.js | 16 +++++++-------- .../open_search_panel.test.js.snap | 20 ++++++++++++++++--- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/core_plugins/kibana/public/discover/directives/no_results.test.js b/src/core_plugins/kibana/public/discover/directives/no_results.test.js index f4d72a321324e..1aeb66ceccc91 100644 --- a/src/core_plugins/kibana/public/discover/directives/no_results.test.js +++ b/src/core_plugins/kibana/public/discover/directives/no_results.test.js @@ -18,7 +18,7 @@ */ import React from 'react'; -import { render, mount } from 'enzyme'; +import { renderWithIntl, mountWithIntl } from 'test_utils/enzyme_helpers'; import sinon from 'sinon'; import { findTestSubject } from '@elastic/eui/lib/test'; @@ -40,7 +40,7 @@ describe('DiscoverNoResults', () => { reason: { reason: 'Bad error' }, }]; - const component = render( + const component = renderWithIntl( { test(`doesn't render failures list when there are no failures`, () => { const shardFailures = []; - const component = render( + const component = renderWithIntl( { describe('isTimePickerOpen', () => { test('false is reflected in the aria-expanded state of the button', () => { - const component = render( + const component = renderWithIntl( { }); test('true is reflected in the aria-expanded state of the button', () => { - const component = render( + const component = renderWithIntl( { describe('timeFieldName', () => { test('renders time range feedback', () => { - const component = render( + const component = renderWithIntl( { describe('queryLanguage', () => { test('supports lucene and renders doc link', () => { - const component = render( + const component = renderWithIntl( { describe('topNavToggle', () => { test('is called whe time picker button is clicked', () => { const topNavToggleSpy = sinon.stub(); - const component = mount( + const component = mountWithIntl(

    - Open Search +

    - Manage searches + } makeUrl={[Function]} - noItemsMessage="No matching searches found." + noItemsMessage={ + + } onChoose={[Function]} savedObjectType="search" /> From 9567b0707d11a3d0b916499978f9f8ed3d7c268c Mon Sep 17 00:00:00 2001 From: maryia-lapata Date: Fri, 2 Nov 2018 10:44:09 +0300 Subject: [PATCH 05/14] Fix eslint --- .../discover/components/fetch_error/fetch_error.js | 13 ++++++++----- .../kibana/public/discover/controllers/discover.js | 7 +------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js b/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js index 7d0f79cb56561..8f8df390fd8cf 100644 --- a/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js +++ b/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js @@ -52,11 +52,14 @@ const DiscoverFetchError = ({ fetchError }) => { values={{ fetchErrorScript: '‘' + fetchError.script + '’', scriptFaild: '“Scripted fields”', - managementLink: + managementLink: ( + + + + ) }} />

    diff --git a/src/core_plugins/kibana/public/discover/controllers/discover.js b/src/core_plugins/kibana/public/discover/controllers/discover.js index 60234cb673ed4..2ab537910528f 100644 --- a/src/core_plugins/kibana/public/discover/controllers/discover.js +++ b/src/core_plugins/kibana/public/discover/controllers/discover.js @@ -63,7 +63,6 @@ import { showOpenSearchPanel } from '../top_nav/show_open_search_panel'; import { tabifyAggResponse } from 'ui/agg_response/tabify'; import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal'; import { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal'; -import { i18n } from '@kbn/i18n'; const app = uiModules.get('apps/discover', [ 'kibana/notify', @@ -319,11 +318,7 @@ function discoverController( const pageTitleSuffix = savedSearch.id && savedSearch.title ? `: ${savedSearch.title}` : ''; docTitle.change(`Discover${pageTitleSuffix}`); - const discoverBreadcrumbText = i18n('kbn.discover.discoverBreadcrumbText', { - defaultMessage: 'Discover', - }); - - const discoverBreadcrumbsTitle = i18n.translate('kbn.discover.discoverBreadcrumbsTitle', { + const discoverBreadcrumbsTitle = i18n('kbn.discover.discoverBreadcrumbTitle', { defaultMessage: 'Discover', }); From af732e34c16059dc6b40ec42737887270971655f Mon Sep 17 00:00:00 2001 From: Pavel Date: Mon, 5 Nov 2018 10:51:56 +0300 Subject: [PATCH 06/14] use separate span tag for label --- .../components/field_chooser/field_chooser.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html b/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html index 56a6be9bc82e4..73442a4ec74b8 100644 --- a/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html +++ b/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html @@ -145,11 +145,13 @@ >
    - +
    From 0aac7fb9988572a9500ff7181eb8b1ebb18496fe Mon Sep 17 00:00:00 2001 From: Pavel Date: Mon, 5 Nov 2018 15:58:53 +0300 Subject: [PATCH 08/14] resolve review comments --- .../discover/components/fetch_error/fetch_error.js | 8 +++++--- .../kibana/public/discover/controllers/discover.js | 10 +++++----- src/core_plugins/kibana/public/discover/index.html | 6 ++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js b/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js index 8f8df390fd8cf..52dd71325a2a0 100644 --- a/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js +++ b/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js @@ -47,11 +47,13 @@ const DiscoverFetchError = ({ fetchError }) => { , managementLink: ( 1 - ? i18n('kbn.discover.tooLargeBucketsText', { + ? i18n('kbn.discover.bucketIntervalTooltip.tooLargeBucketsText', { defaultMessage: 'buckets that are too large', }) - : i18n('kbn.discover.tooManyBucketsText', { + : i18n('kbn.discover.bucketIntervalTooltip.tooManyBucketsText', { defaultMessage: 'too many buckets', }), bucketIntervalDescription: $scope.bucketInterval.description, @@ -576,7 +576,7 @@ function discoverController( if (id) { toastNotifications.addSuccess({ title: i18n('kbn.discover.notifications.savedSearchTitle', { - defaultMessage: 'Search \'{savedSearchTitle}\' was saved', + defaultMessage: `Search '{savedSearchTitle}' was saved`, values: { savedSearchTitle: savedSearch.title, } @@ -597,7 +597,7 @@ function discoverController( } catch(saveError) { toastNotifications.addDanger({ title: i18n('kbn.discover.notifications.notSavedSearchTitle', { - defaultMessage: 'Search \'{savedSearchTitle}\' was not saved.', + defaultMessage: `Search '{savedSearchTitle}' was not saved.`, values: { savedSearchTitle: savedSearch.title, } @@ -938,7 +938,7 @@ function discoverController( const warningTitle = i18n('kbn.discover.valueIsNotConfiguredIndexPatternIDWarningTitle', { defaultMessage: '{stateVal} is not a configured index pattern ID', values: { - stateVal: '"' + stateVal + '"', + stateVal: `"${stateVal}"`, }, }); diff --git a/src/core_plugins/kibana/public/discover/index.html b/src/core_plugins/kibana/public/discover/index.html index c56953f67c02b..a267544bdffcb 100644 --- a/src/core_plugins/kibana/public/discover/index.html +++ b/src/core_plugins/kibana/public/discover/index.html @@ -20,10 +20,8 @@

    {{(hits || 0) | number:0}}

    From 809286aa042279f4677f57f04a48ac6a9d2e5db5 Mon Sep 17 00:00:00 2001 From: maryia-lapata Date: Tue, 6 Nov 2018 17:32:06 +0300 Subject: [PATCH 09/14] Update snapshot --- .../directives/__snapshots__/no_results.test.js.snap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap b/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap index 56d7135b157fa..160e17c4273b1 100644 --- a/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap +++ b/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap @@ -317,9 +317,9 @@ Array [ class="euiText euiText--extraSmall" > - Index ‘A’ + Index "A" - , shard ‘1’ + , shard "1"
    - Index ‘B’ + Index "B" - , shard ‘2’ + , shard "2"
    Date: Thu, 8 Nov 2018 16:35:23 +0300 Subject: [PATCH 10/14] fix issue with bucket aria-label --- .../field_chooser/discover_field.js | 22 ++++++++++--------- .../lib/detail_views/string.html | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js b/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js index 7472e1ff71790..8ff6e3a5751f6 100644 --- a/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js +++ b/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js @@ -99,16 +99,18 @@ app.directive('discoverField', function ($compile, i18n) { $scope.onShowDetails(field, recompute); detailScope = $scope.$new(); detailScope.warnings = getWarnings(field); - detailScope.bucketAriaLabel = i18n('kbn.discover.fieldChooser.discoverField.bucketAriaLabel', { - defaultMessage: 'Value: {value}', - values: { - value: detailScope.bucket.display === '' - ? i18n('kbn.discover.fieldChooser.discoverField.emptyStringText', { - defaultMessage: 'Empty string', - }) - : detailScope.bucket.display, - }, - }); + detailScope.getBucketAriaLabel = (bucket) => { + return i18n('kbn.discover.fieldChooser.discoverField.bucketAriaLabel', { + defaultMessage: 'Value: {value}', + values: { + value: bucket.display === '' + ? i18n('kbn.discover.fieldChooser.discoverField.emptyStringText', { + defaultMessage: 'Empty string', + }) + : bucket.display, + }, + }); + }; detailsElem = $(detailsHtml); $compile(detailsElem)(detailScope); diff --git a/src/core_plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html b/src/core_plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html index 58b0846e093a4..6f9a42aeb758f 100644 --- a/src/core_plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html +++ b/src/core_plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html @@ -37,7 +37,7 @@ css-truncate css-truncate-expandable="true" class="dscFieldDetails__value" - aria-label="{{::bucketAriaLabel}}" + aria-label="{{::getBucketAriaLabel(bucket)}}" > {{::bucket.display}} Date: Mon, 19 Nov 2018 13:43:37 +0300 Subject: [PATCH 11/14] fix quotes --- .../kibana/public/discover/directives/no_results.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core_plugins/kibana/public/discover/directives/no_results.js b/src/core_plugins/kibana/public/discover/directives/no_results.js index eed9edb33f65a..65f0a610fcdaf 100644 --- a/src/core_plugins/kibana/public/discover/directives/no_results.js +++ b/src/core_plugins/kibana/public/discover/directives/no_results.js @@ -72,7 +72,7 @@ export class DiscoverNoResults extends Component { id="kbn.discover.noResults.indexFailureIndexText" defaultMessage="Index {failureIndex}" values={{ - failureIndex: '"' + failure.index + '"', + failureIndex: `‘${failure.index}’`, }} /> From 48e5c51d27b9b6389c13d2bcc5ec7dc3b7516466 Mon Sep 17 00:00:00 2001 From: maryia-lapata Date: Tue, 20 Nov 2018 11:59:11 +0300 Subject: [PATCH 12/14] Update snapshot --- .../discover/directives/__snapshots__/no_results.test.js.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap b/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap index c0081257666cc..8a1104df6657e 100644 --- a/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap +++ b/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap @@ -317,7 +317,7 @@ Array [ class="euiText euiText--extraSmall" > - Index "A" + Index ‘A’ , shard "1"
    @@ -346,7 +346,7 @@ Array [ class="euiText euiText--extraSmall" > - Index "B" + Index ‘B’ , shard "2" From 83593814d91283ba89624212da9b87bf53d6b7ad Mon Sep 17 00:00:00 2001 From: Pavel Date: Tue, 20 Nov 2018 14:42:36 +0300 Subject: [PATCH 13/14] fix quotes --- .../kibana/public/discover/directives/no_results.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core_plugins/kibana/public/discover/directives/no_results.js b/src/core_plugins/kibana/public/discover/directives/no_results.js index 65f0a610fcdaf..4427658a2792f 100644 --- a/src/core_plugins/kibana/public/discover/directives/no_results.js +++ b/src/core_plugins/kibana/public/discover/directives/no_results.js @@ -77,7 +77,7 @@ export class DiscoverNoResults extends Component { /> ), - failureShard: '"' + failure.shard + '"', + failureShard: `‘${failure.shard}’`, }} /> From d8fba05fc16a21bc03a73f3107a40498cfecfad7 Mon Sep 17 00:00:00 2001 From: Pavel Date: Tue, 20 Nov 2018 14:46:51 +0300 Subject: [PATCH 14/14] update snapshots --- .../discover/directives/__snapshots__/no_results.test.js.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap b/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap index 8a1104df6657e..a6eacbf0ec7fb 100644 --- a/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap +++ b/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap @@ -319,7 +319,7 @@ Array [ Index ‘A’ - , shard "1" + , shard ‘1’
    Index ‘B’ - , shard "2" + , shard ‘2’