Merge branch 'main' into discover-tabs-copy-naming

Author: akowalska622

src/core/packages/overlays/browser/src/modal.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import type { EuiConfirmModalProps } from '@elastic/eui';
+import type { EuiConfirmModalProps, EuiModalProps } from '@elastic/eui';
 import type { MountPoint, OverlayRef } from '@kbn/core-mount-utils-browser';
 
 /**
@@ -22,6 +22,7 @@ export interface OverlayModalConfirmOptions {
   'data-test-subj'?: string;
   defaultFocusedButton?: EuiConfirmModalProps['defaultFocusedButton'];
   buttonColor?: EuiConfirmModalProps['buttonColor'];
+  'aria-labelledby'?: EuiConfirmModalProps['aria-labelledby'];
   /**
    * Sets the max-width of the modal.
    * Set to `true` to use the default (`euiBreakpoints 'm'`),
@@ -66,4 +67,5 @@ export interface OverlayModalOpenOptions {
   closeButtonAriaLabel?: string;
   'data-test-subj'?: string;
   maxWidth?: boolean | number | string;
+  'aria-labelledby'?: EuiModalProps['aria-labelledby'];
 }

x-pack/platform/plugins/private/graph/public/components/source_modal.tsx

@@ -16,7 +16,7 @@ export function SourceModal(props: SourcePickerProps) {
   return (
     <div css={sourceModalStyles}>
       <EuiModalHeader>
-        <EuiModalHeaderTitle>
+        <EuiModalHeaderTitle id="source-modal-title">
           <FormattedMessage
             id="xpack.graph.sourceModal.title"
             defaultMessage="Select a data source"

x-pack/platform/plugins/private/graph/public/services/source_modal.tsx

@@ -32,6 +32,9 @@ export function openSourceModal(
         onSelected(indexPattern);
         modalRef.close();
       }}
-    />
+    />,
+    {
+      'aria-labelledby': 'source-modal-title',
+    }
   );
 }

x-pack/solutions/security/plugins/security_solution/common/experimental_features.ts

@@ -276,9 +276,12 @@ type Mutable<T> = { -readonly [P in keyof T]: T[P] };
 
 const allowedKeys = Object.keys(allowedExperimentalValues) as Readonly<ExperimentalConfigKeys>;
 
+const disableExperimentalPrefix = 'disable:' as const;
+
 /**
  * Parses the string value used in `xpack.securitySolution.enableExperimental` kibana configuration,
- * which should be a string of values delimited by a comma (`,`)
+ * which should be an array of strings corresponding to allowedExperimentalValues keys.
+ * Use the `disable:` prefix to disable a feature.
  *
  * @param configValue
  * @throws SecuritySolutionInvalidExperimentalValue
@@ -289,11 +292,15 @@ export const parseExperimentalConfigValue = (
   const enabledFeatures: Mutable<Partial<ExperimentalFeatures>> = {};
   const invalidKeys: string[] = [];
 
-  for (const value of configValue) {
+  for (let value of configValue) {
+    const isDisabled = value.startsWith(disableExperimentalPrefix);
+    if (isDisabled) {
+      value = value.replace(disableExperimentalPrefix, '');
+    }
     if (!allowedKeys.includes(value as keyof ExperimentalFeatures)) {
       invalidKeys.push(value);
     } else {
-      enabledFeatures[value as keyof ExperimentalFeatures] = true;
+      enabledFeatures[value as keyof ExperimentalFeatures] = !isDisabled;
     }
   }