merge conflicts in snapshot (#28773)

2025-04-23 17:28:26 -04:00 · 2019-01-15 15:38:37 -07:00 · 2019-01-15 15:38:37 -07:00 · 973eeb9a1d
commit 973eeb9a1d
parent 394d4f5769
18 changed files with 33 additions and 9 deletions
--- a/package.json
+++ b/package.json
@ -110,7 +110,7 @@
  },
  "dependencies": {
    "@elastic/datemath": "5.0.2",
-    "@elastic/eui": "6.0.1",
+    "@elastic/eui": "6.3.1",
    "@elastic/filesaver": "1.1.2",
    "@elastic/good": "8.1.1-kibana2",
    "@elastic/numeral": "2.3.2",
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/indexed_fields_table/components/table/jest/snapshots/table.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/indexed_fields_table/components/table/jest/snapshots/table.test.js.snap
@ -93,6 +93,7 @@ exports[`Table should render normally 1`] = `
      },
    ]
  }
+  executeQueryOptions={Object {}}
  items={
    Array [
      Object {
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/scripted_fields_table/components/table/jest/snapshots/table.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/scripted_fields_table/components/table/jest/snapshots/table.test.js.snap
@ -55,6 +55,7 @@ exports[`Table should render normally 1`] = `
      },
    ]
  }
+  executeQueryOptions={Object {}}
  items={
    Array [
      Object {
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/table/jest/snapshots/table.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/table/jest/snapshots/table.test.js.snap
@ -86,6 +86,7 @@ exports[`Table should render normally 1`] = `
      },
    ]
  }
+  executeQueryOptions={Object {}}
  items={
    Array [
      Object {
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/jest/snapshots/objects_table.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/jest/snapshots/objects_table.test.js.snap
@ -50,6 +50,7 @@ exports[`ObjectsTable delete should show a confirm modal 1`] = `
        },
      ]
    }
+    executeQueryOptions={Object {}}
    items={
      Array [
        Object {
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/jest/snapshots/flyout.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/jest/snapshots/flyout.test.js.snap
@ -93,6 +93,7 @@ exports[`Flyout conflicts should allow conflict resolution 1`] = `
          },
        ]
      }
+      executeQueryOptions={Object {}}
      items={
        Array [
          Object {
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/jest/snapshots/relationships.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/jest/snapshots/relationships.test.js.snap
@ -95,6 +95,7 @@ exports[`Relationships should render dashboards normally 1`] = `
              },
            ]
          }
+          executeQueryOptions={Object {}}
          items={
            Array [
              Object {
@ -302,6 +303,7 @@ exports[`Relationships should render searches normally 1`] = `
              },
            ]
          }
+          executeQueryOptions={Object {}}
          items={
            Array [
              Object {
@ -369,6 +371,7 @@ exports[`Relationships should render searches normally 1`] = `
              },
            ]
          }
+          executeQueryOptions={Object {}}
          items={
            Array [
              Object {
@ -481,6 +484,7 @@ exports[`Relationships should render visualizations normally 1`] = `
              },
            ]
          }
+          executeQueryOptions={Object {}}
          items={
            Array [
              Object {
--- a/x-pack/package.json
+++ b/x-pack/package.json
@ -119,7 +119,7 @@
  },
  "dependencies": {
    "@elastic/datemath": "5.0.2",
-    "@elastic/eui": "6.0.1",
+    "@elastic/eui": "6.3.1",
    "@elastic/node-crypto": "0.1.2",
    "@elastic/node-phantom-simple": "2.2.4",
    "@elastic/numeral": "2.3.2",
--- a/x-pack/plugins/infra/types/eui.d.ts
+++ b/x-pack/plugins/infra/types/eui.d.ts
@ -13,7 +13,7 @@ declare module '@elastic/eui' {
  export const EuiWrappingPopover: React.SFC<any>;
 }

-import { EuiToolTipPosition, IconType } from '@elastic/eui';
+import { IconType, ToolTipPositions } from '@elastic/eui';
 import { CommonProps } from '@elastic/eui/src/components/common';
 import moment from 'moment';
 import { MouseEventHandler, ReactType, Ref } from 'react';
--- a/x-pack/plugins/logstash/public/components/pipeline_list/snapshots/pipelines_table.test.js.snap
+++ b/x-pack/plugins/logstash/public/components/pipeline_list/snapshots/pipelines_table.test.js.snap
@ -55,6 +55,7 @@ exports[`PipelinesTable component renders component as expected 1`] = `
    ]
  }
  data-test-subj="pipelineTable"
+  executeQueryOptions={Object {}}
  isSelectable={true}
  itemId="id"
  items={
--- a/x-pack/plugins/ml/public/components/annotations_table/snapshots/annotations_table.test.js.snap
+++ b/x-pack/plugins/ml/public/components/annotations_table/snapshots/annotations_table.test.js.snap
@ -57,6 +57,7 @@ exports[`AnnotationsTable Initialization with annotations prop. 1`] = `
    ]
  }
  compressed={true}
+  executeQueryOptions={Object {}}
  items={
    Array [
      Object {
--- a/x-pack/plugins/ml/public/settings/calendars/edit/events_table/snapshots/events_table.test.js.snap
+++ b/x-pack/plugins/ml/public/settings/calendars/edit/events_table/snapshots/events_table.test.js.snap
@ -33,6 +33,7 @@ exports[`EventsTable Renders events table with no search bar 1`] = `
        },
      ]
    }
+    executeQueryOptions={Object {}}
    itemId="event_id"
    items={
      Array [
@ -100,6 +101,7 @@ exports[`EventsTable Renders events table with search bar 1`] = `
        },
      ]
    }
+    executeQueryOptions={Object {}}
    itemId="event_id"
    items={
      Array [
--- a/x-pack/plugins/ml/public/settings/calendars/list/table/snapshots/table.test.js.snap
+++ b/x-pack/plugins/ml/public/settings/calendars/list/table/snapshots/table.test.js.snap
@ -26,6 +26,7 @@ exports[`CalendarsListTable renders the table with all calendars 1`] = `
        },
      ]
    }
+    executeQueryOptions={Object {}}
    isSelectable={true}
    itemId="calendar_id"
    items={
--- a/x-pack/plugins/ml/public/settings/filter_lists/list/snapshots/table.test.js.snap
+++ b/x-pack/plugins/ml/public/settings/filter_lists/list/snapshots/table.test.js.snap
@ -31,6 +31,7 @@ exports[`Filter Lists Table renders with filter lists and selection supplied 1`]
          },
        ]
      }
+      executeQueryOptions={Object {}}
      isSelectable={true}
      itemId="filter_id"
      items={
@ -139,6 +140,7 @@ exports[`Filter Lists Table renders with filter lists supplied 1`] = `
          },
        ]
      }
+      executeQueryOptions={Object {}}
      isSelectable={true}
      itemId="filter_id"
      items={
--- a/x-pack/plugins/monitoring/public/components/elasticsearch/ccr/snapshots/ccr.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/elasticsearch/ccr/snapshots/ccr.test.js.snap
@ -50,6 +50,7 @@ exports[`Ccr that it renders normally 1`] = `
              },
            ]
          }
+          executeQueryOptions={Object {}}
          itemId="id"
          itemIdToExpandedRowMap={Object {}}
          items={
--- a/x-pack/plugins/reporting/public/components/snapshots/report_info_button.test.tsx.snap
+++ b/x-pack/plugins/reporting/public/components/snapshots/report_info_button.test.tsx.snap
@ -57,7 +57,7 @@ Array [
    size="s"
  >
    <span>
-      <WindowEvent
+      <EuiWindowEvent
        event="keydown"
        handler={[Function]}
      />
@ -281,7 +281,7 @@ Array [
    size="s"
  >
    <span>
-      <WindowEvent
+      <EuiWindowEvent
        event="keydown"
        handler={[Function]}
      />
--- a/x-pack/plugins/spaces/public/views/management/spaces_grid/snapshots/spaces_grid_pages.test.tsx.snap
+++ b/x-pack/plugins/spaces/public/views/management/spaces_grid/snapshots/spaces_grid_pages.test.tsx.snap
@ -101,6 +101,7 @@ exports[`SpacesGridPage renders as expected 1`] = `
              },
            ]
          }
+          executeQueryOptions={Object {}}
          hasActions={true}
          itemId="id"
          items={Array []}
--- a/yarn.lock
+++ b/yarn.lock
@ -803,11 +803,12 @@
    tabbable "^1.1.0"
    uuid "^3.1.0"

-"@elastic/eui@6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-6.0.1.tgz#6dd60ee534f5a5d99e28913b9d7dd6df96af0596"
-  integrity sha512-l/3s5ea13Um2A4aa4KXRbA8nAXyC0nz5S/w8Sr96ok8qtM1PT+SuBPq9CTEdZ89MHfC9EIwezBFX1pU8sX194A==
+"@elastic/eui@6.3.1":
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-6.3.1.tgz#5808086484b8e2178a6cf57ef0a3c1b60090b79b"
+  integrity sha512-6t5is08ERJTTmVlm6B6xy7GsY8l0NMTVvbw5FJOD/CY2zlMzFXBlrm+0zWfm2rMo4GJxus0AQVqdL+1sDDv7+Q==
  dependencies:
+    "@types/lodash" "^4.14.116"
    "@types/numeral" "^0.0.25"
    classnames "^2.2.5"
    core-js "^2.5.1"
@ -1527,6 +1528,11 @@
  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.117.tgz#695a7f514182771a1e0f4345d189052ee33c8778"
  integrity sha512-xyf2m6tRbz8qQKcxYZa7PA4SllYcay+eh25DN3jmNYY6gSTL7Htc/bttVdkqj2wfJGbeWlQiX8pIyJpKU+tubw==

+"@types/lodash@^4.14.116":
+  version "4.14.119"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.119.tgz#be847e5f4bc3e35e46d041c394ead8b603ad8b39"
+  integrity sha512-Z3TNyBL8Vd/M9D9Ms2S3LmFq2sSMzahodD6rCS9V2N44HUMINb75jNkSuwAx7eo2ufqTdfOdtGQpNbieUjPQmw==
+
 "@types/log-symbols@^2.0.0":
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/@types/log-symbols/-/log-symbols-2.0.0.tgz#7919e2ec3c8d13879bfdcab310dd7a3f7fc9466d"