Fix rebase

elastic · Jun 19, 2023 · 80cf142 · 80cf142
1 parent 4ec909c
commit 80cf142
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 16 deletions.
diff --git a/x-pack/plugins/observability/public/hooks/__storybook_mocks__/use_fetch_indices.ts b/x-pack/plugins/observability/public/hooks/__storybook_mocks__/use_fetch_indices.ts
@@ -15,15 +15,10 @@ export const useFetchIndices = (): UseFetchIndicesResponse => {
     data: [
       ...Array(10)
         .fill(0)
-        .map((_, i) => ({
-          name: `.index-${i}`,
-        })),
+        .map((_, i) => `.index-${i}`),
       ...Array(10)
         .fill(0)
-        .map((_, i) => ({
-          name: `.some-other-index-${i}`,
-        })),
+        .map((_, i) => `.some-other-index-${i}`),
     ] as Index[],
-    refetch: function () {} as UseFetchIndicesResponse['refetch'],
   };
 };
diff --git a/...ervability/public/pages/slo_edit/components/custom_kql/custom_kql_indicator_type_form.tsx b/...ervability/public/pages/slo_edit/components/custom_kql/custom_kql_indicator_type_form.tsx
@@ -32,15 +32,9 @@ interface Option {
 
 export function CustomKqlIndicatorTypeForm() {
   const { control, watch, getFieldState } = useFormContext<CreateSLOInput>();
-<<<<<<< HEAD
-  const { isLoading, data: indexFields } = useFetchIndexPatternFields(
-    watch('indicator.params.index')
-  );
-=======
   const index = watch('indicator.params.index');
 
   const { isLoading, data: indexFields } = useFetchIndexPatternFields(index);
->>>>>>> b1704f5365a (Extract index variable)
   const timestampFields = (indexFields ?? []).filter((field) => field.type === 'date');
 
   return (

diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
@@ -26967,7 +26967,6 @@
     "xpack.observability.slo.sloEdit.createAlert.title": "Créer",
     "xpack.observability.slo.sloEdit.createSloButton": "Créer un SLO",
     "xpack.observability.slo.sloEdit.customKql.indexSelection.helpText": "Utilisez le caractère * pour élargir votre recherche.",
-    "xpack.observability.slo.sloEdit.customKql.indexSelection.indexOptionsLabel": "Sélectionner un index existant",
     "xpack.observability.slo.sloEdit.customKql.indexSelection.indexPatternLabel": "Utiliser un modèle d'indexation",
     "xpack.observability.slo.sloEdit.customKql.indexSelection.label": "Index",
     "xpack.observability.slo.sloEdit.customKql.indexSelection.placeholder": "Sélectionner un index ou un modèle d'indexation",

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -26949,7 +26949,6 @@
     "xpack.observability.slo.sloEdit.createAlert.title": "作成",
     "xpack.observability.slo.sloEdit.createSloButton": "SLOの作成",
     "xpack.observability.slo.sloEdit.customKql.indexSelection.helpText": "* で検索クエリの範囲を広げます。",
-    "xpack.observability.slo.sloEdit.customKql.indexSelection.indexOptionsLabel": "既存のインデックスを選択",
     "xpack.observability.slo.sloEdit.customKql.indexSelection.indexPatternLabel": "インデックスパターンを使用",
     "xpack.observability.slo.sloEdit.customKql.indexSelection.label": "インデックス",
     "xpack.observability.slo.sloEdit.customKql.indexSelection.placeholder": "インデックスまたはインデックスパターンを選択",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -26947,7 +26947,6 @@
     "xpack.observability.slo.sloEdit.createAlert.title": "创建",
     "xpack.observability.slo.sloEdit.createSloButton": "创建 SLO",
     "xpack.observability.slo.sloEdit.customKql.indexSelection.helpText": "使用 * 可扩大您的查询范围。",
-    "xpack.observability.slo.sloEdit.customKql.indexSelection.indexOptionsLabel": "选择现有索引",
     "xpack.observability.slo.sloEdit.customKql.indexSelection.indexPatternLabel": "使用索引模式",
     "xpack.observability.slo.sloEdit.customKql.indexSelection.label": "索引",
     "xpack.observability.slo.sloEdit.customKql.indexSelection.placeholder": "选择索引或索引模式",