Merge branch 'master' into remove-angular-from-control-panel

elastic · Aug 30, 2021 · 0da7071 · 0da7071
2 parents d65e132 + 079fc9a
commit 0da7071
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js
@@ -29,13 +29,13 @@ class ImageUpload extends React.Component {
     onValueChange: PropTypes.func.isRequired,
     typeInstance: PropTypes.object.isRequired,
     resolvedArgValue: PropTypes.string,
+    argValue: PropTypes.string,
     assets: PropTypes.object.isRequired,
   };
 
   constructor(props) {
     super(props);
-
-    const url = props.resolvedArgValue || null;
+    const url = props.resolvedArgValue || props.argValue || null;
 
     let urlType = Object.keys(props.assets).length ? 'asset' : 'file';
     // if not a valid base64 string, will show as missing asset icon
@@ -143,7 +143,7 @@ class ImageUpload extends React.Component {
       file: <FileForm loading={loading} onChange={this.handleUpload} />,
       link: (
         <LinkForm
-          url={url}
+          url={selectedAsset.id ? '' : url}
           inputRef={(ref) => (this.inputRefs.srcUrlText = ref)}
           onSubmit={this.setSrcUrl}
         />

diff --git a/x-pack/plugins/canvas/server/templates/pitch_presentation.ts b/x-pack/plugins/canvas/server/templates/pitch_presentation.ts
diff --git a/x-pack/plugins/ml/public/application/components/data_grid/data_grid.scss b/x-pack/plugins/ml/public/application/components/data_grid/data_grid.scss
@@ -2,4 +2,10 @@
   .euiDataGridRowCell--boolean {
     text-transform: none;
   }
+
+  // Override to align the sorting arrow at the bottom when histogram charts are enabled
+  .euiDataGridHeaderCell .euiDataGridHeaderCell__sortingArrow {
+    margin-top: auto;
+    margin-bottom: 0;
+  }
 }
diff --git a/x-pack/plugins/security_solution/public/management/components/administration_list_page.tsx b/x-pack/plugins/security_solution/public/management/components/administration_list_page.tsx
@@ -16,6 +16,7 @@ import {
 } from '@elastic/eui';
 import { SecurityPageName } from '../../../common/constants';
 import { SpyRoute } from '../../common/utils/route/spy_routes';
+import { useTestIdGenerator } from './hooks/use_test_id_generator';
 
 interface AdministrationListPageProps {
   title: React.ReactNode;
@@ -45,21 +46,23 @@ export const AdministrationListPage: FC<AdministrationListPageProps & CommonProp
       return <span data-test-subj="header-panel-subtitle">{subtitle}</span>;
     }, [subtitle]);
 
+    const getTestId = useTestIdGenerator(otherProps['data-test-subj']);
+
     return (
-      <>
+      <div {...otherProps}>
         <EuiPageHeader
           pageTitle={header}
           description={description}
           bottomBorder={true}
           rightSideItems={[actions]}
           restrictWidth={false}
-          {...otherProps}
+          data-test-subj={getTestId('header')}
         />
         <EuiSpacer size="l" />
         {children}
 
         <SpyRoute pageName={SecurityPageName.administration} />
-      </>
+      </div>
     );
   }
 );