Fixed tests and translation

elastic · Apr 23, 2020 · 69a01ba · 69a01ba
1 parent 0300b72
commit 69a01ba
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 22 deletions.
diff --git a/...plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/tabs/utils.ts b/...plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/tabs/utils.ts
@@ -31,7 +31,7 @@ function filterByName(items: IndexPatternField[], filter: string) {
 function getCounts(
   fields: IndexPatternField[],
   sourceFilters: {
-    excludes: any[];
+    excludes: string[];
   },
   fieldFilter = ''
 ) {
@@ -53,32 +53,30 @@ function getCounts(
 }
 
 function getTitle(type: string, filteredCount: Dictionary<number>, totalCount: Dictionary<number>) {
-  let translateKey = '';
-  let defaultMessage = '';
+  let title = '';
   switch (type) {
     case 'indexed':
-      translateKey = 'kbn.management.editIndexPattern.tabs.fieldsHeader';
-      defaultMessage = 'Fields';
+      title = i18n.translate('kbn.management.editIndexPattern.tabs.fieldsHeader', {
+        defaultMessage: 'Fields',
+      });
       break;
     case 'scripted':
-      translateKey = 'kbn.management.editIndexPattern.tabs.scriptedHeader';
-      defaultMessage = 'Scripted fields';
+      title = i18n.translate('kbn.management.editIndexPattern.tabs.scriptedHeader', {
+        defaultMessage: 'Scripted fields',
+      });
       break;
     case 'sourceFilters':
-      translateKey = 'kbn.management.editIndexPattern.tabs.sourceHeader';
-      defaultMessage = 'Source filters';
+      title = i18n.translate('kbn.management.editIndexPattern.tabs.sourceHeader', {
+        defaultMessage: 'Source filters',
+      });
       break;
   }
   const count = ` (${
     filteredCount[type] === totalCount[type]
       ? filteredCount[type]
       : filteredCount[type] + ' / ' + totalCount[type]
   })`;
-  return (
-    i18n.translate(translateKey, {
-      defaultMessage,
-    }) + count
-  );
+  return title + count;
 }
 
 export function getTabs(

diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts
@@ -206,15 +206,17 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider
 
     async getFieldsTabCount() {
       return retry.try(async () => {
-        const text = await testSubjects.getVisibleText('tab-count-indexedFields');
-        return text.replace(/\((.*)\)/, '$1');
+        const indexedFieldsTab = await find.byCssSelector('#indexedFields .euiTab__content');
+        const text = await indexedFieldsTab.getVisibleText();
+        return text.replace(/\w+\s+\((.*)\)/, '$1');
       });
     }
 
     async getScriptedFieldsTabCount() {
       return await retry.try(async () => {
-        const theText = await testSubjects.getVisibleText('tab-count-scriptedFields');
-        return theText.replace(/\((.*)\)/, '$1');
+        const indexedFieldsTab = await find.byCssSelector('#scriptedFields .euiTab__content');
+        const text = await indexedFieldsTab.getVisibleText();
+        return text.replace(/\w+\s+\((.*)\)/, '$1');
       });
     }
 
@@ -241,13 +243,13 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider
 
     async setFieldTypeFilter(type: string) {
       await find.clickByCssSelector(
-        'select[data-test-subj="indexedFieldTypeFilterDropdown"] > option[label="' + type + '"]'
+        'select[data-test-subj="indexedFieldTypeFilterDropdown"] > option[value="' + type + '"]'
       );
     }
 
     async setScriptedFieldLanguageFilter(language: string) {
       await find.clickByCssSelector(
-        'select[data-test-subj="scriptedFieldLanguageFilterDropdown"] > option[label="' +
+        'select[data-test-subj="scriptedFieldLanguageFilterDropdown"] > option[value="' +
           language +
           '"]'
       );

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -2215,7 +2215,6 @@
     "kbn.management.editIndexPattern.fields.table.typeHeader": "タイプ",
     "kbn.management.editIndexPattern.mappingConflictHeader": "マッピングの矛盾",
     "kbn.management.editIndexPattern.mappingConflictLabel": "{conflictFieldsLength, plural, one {フィールドが} other {# フィールドが}}このパターンと一致するインデックスの間で異なるタイプ (文字列、整数など) に定義されています。これらの矛盾したフィールドは Kibana の一部で使用できますが、Kibana がタイプを把握しなければならない機能には使用できません。この問題を修正するにはデータのレンダリングが必要です。",
-    "kbn.management.editIndexPattern.notDateErrorMessage": "このフィールドは日付ではなく {fieldType} です。",
     "kbn.management.editIndexPattern.refreshAria": "フィールドリストを再度読み込みます",
     "kbn.management.editIndexPattern.refreshButton": "更新",
     "kbn.management.editIndexPattern.refreshHeader": "フィールドリストを更新しますか？",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -2216,7 +2216,6 @@
     "kbn.management.editIndexPattern.fields.table.typeHeader": "类型",
     "kbn.management.editIndexPattern.mappingConflictHeader": "映射冲突",
     "kbn.management.editIndexPattern.mappingConflictLabel": "匹配此模式的各个索引中{conflictFieldsLength, plural, one {一个字段已} other {# 个字段已}}定义为若干类型（字符串、整数等）。您仍能够在 Kibana 的各个部分中使用这些冲突类型，但它们将无法用于需要 Kibana 知道其类型的函数。要解决此问题，需要重新索引您的数据。",
-    "kbn.management.editIndexPattern.notDateErrorMessage": "该字段是{fieldType}，不是日期。",
     "kbn.management.editIndexPattern.refreshAria": "重新加载字段列表",
     "kbn.management.editIndexPattern.refreshButton": "刷新",
     "kbn.management.editIndexPattern.refreshHeader": "刷新字段列表？",