Merge branch '2.x' into backport/backport-5087-to-2.x

opensearch-project · Sep 26, 2023 · 0f5bcf9 · 0f5bcf9
2 parents 9f846b1 + 5a049c9
commit 0f5bcf9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/packages/osd-optimizer/src/worker/webpack.config.ts b/packages/osd-optimizer/src/worker/webpack.config.ts
@@ -235,6 +235,21 @@ export function getWebpackConfig(bundle: Bundle, bundleRefs: BundleRefs, worker:
             },
           },
         },
+        {
+          test: /\.js$/,
+          /* reactflow and some of its dependencies don't have es5 builds
+           * so we need to build from source and transpile for webpack v4
+           */
+          include: /node_modules[\\/]@?reactflow/,
+          use: {
+            loader: 'babel-loader',
+            options: {
+              babelrc: false,
+              envName: worker.dist ? 'production' : 'development',
+              presets: [BABEL_PRESET_PATH],
+            },
+          },
+        },
         {
           test: /\.(html|md|txt|tmpl)$/,
           use: {

diff --git a/...scover/public/application/components/data_grid/data_grid_table_docview_inspect_button.tsx b/...scover/public/application/components/data_grid/data_grid_table_docview_inspect_button.tsx
@@ -22,6 +22,7 @@ export const DocViewInspectButton = ({ rowIndex }: EuiDataGridCellValueElementPr
         onClick={() => setInspectedHit(isCurrentInspected ? undefined : currentInspected)}
         iconType={isCurrentInspected ? 'minimize' : 'inspect'}
         aria-label={inspectHintMsg}
+        data-test-subj={`docTableExpandToggleColumn-${rowIndex}`}
       />
     </EuiToolTip>
   );

diff --git a/src/plugins/discover/public/application/components/data_grid/data_grid_table_flyout.tsx b/src/plugins/discover/public/application/components/data_grid/data_grid_table_flyout.tsx
@@ -40,7 +40,7 @@ export function DataGridFlyout({
   // TODO: replace EuiLink with doc_view_links registry
   // TODO: Also move the flyout higher in the react tree to prevent redrawing the table component and slowing down page performance
   return (
-    <EuiFlyout onClose={onClose} size="m">
+    <EuiFlyout onClose={onClose} size="m" data-test-subj="documentDetailFlyOut">
       <EuiFlyoutHeader>
         <EuiTitle>
           <h2>Document Details</h2>

diff --git a/src/plugins/discover/public/application/components/doc_viewer_links/doc_viewer_links.tsx b/src/plugins/discover/public/application/components/doc_viewer_links/doc_viewer_links.tsx
@@ -27,7 +27,12 @@ export function DocViewerLinks(renderProps: DocViewLinkRenderProps) {
     <EuiFlexGroup gutterSize="m" justifyContent="flexEnd">
       {listItems.map((item, index) => (
         <EuiFlexItem key={index} grow={false}>
-          <EuiLink href={item.href} target="_blank" style={{ fontWeight: 'normal' }}>
+          <EuiLink
+            href={item.href}
+            target="_blank"
+            style={{ fontWeight: 'normal' }}
+            data-test-subj={item['data-test-subj']}
+          >
             {item.label}
           </EuiLink>
         </EuiFlexItem>