Merge branch 'main' into limit-perpage-find-comments

elastic · Jun 21, 2023 · bb3ce13 · bb3ce13
2 parents 133416b + b4624a9
commit bb3ce13
Show file tree

Hide file tree

Showing 10 changed files with 262 additions and 228 deletions.
diff --git a/x-pack/plugins/enterprise_search/common/connectors/connectors.ts b/x-pack/plugins/enterprise_search/common/connectors/connectors.ts
@@ -137,7 +137,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.sharepoint.name', {
       defaultMessage: 'Sharepoint Server',
     }),
-    serviceType: 'sharepoint',
+    serviceType: 'sharepoint_server',
   },
   {
     iconPath: 'sharepoint_online.svg',

diff --git a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_editor.tsx b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_editor.tsx
@@ -429,8 +429,16 @@ export function DimensionEditor(props: DimensionEditorProps) {
       } else if (!compatibleWithCurrentField) {
         label = (
           <EuiFlexGroup gutterSize="none" alignItems="center" responsive={false}>
-            <EuiFlexItem grow={false} style={{ marginRight: euiTheme.size.xs }}>
-              {label}
+            <EuiFlexItem grow={false} style={{ marginRight: euiTheme.size.xs, minWidth: 0 }}>
+              <span
+                css={css`
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                  white-space: nowrap;
+                `}
+              >
+                {label}
+              </span>
             </EuiFlexItem>
             {shouldDisplayDots && (
               <EuiFlexItem grow={false}>
@@ -502,6 +510,7 @@ export function DimensionEditor(props: DimensionEditorProps) {
                           helpPopoverContainer.current = null;
                         }
                       }}
+                      theme={props.core.theme}
                     >
                       <HelpComponent />
                     </WrappingHelpPopover>

diff --git a/x-pack/plugins/lens/public/datasources/form_based/help_popover.tsx b/x-pack/plugins/lens/public/datasources/form_based/help_popover.tsx
@@ -18,6 +18,9 @@ import {
   EuiText,
 } from '@elastic/eui';
 import './help_popover.scss';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { I18nProvider } from '@kbn/i18n-react';
+import type { ThemeServiceStart } from '@kbn/core/public';
 
 export const HelpPopoverButton = ({
   children,
@@ -79,30 +82,36 @@ export const WrappingHelpPopover = ({
   closePopover,
   isOpen,
   title,
+  theme,
 }: {
   anchorPosition?: EuiWrappingPopoverProps['anchorPosition'];
   button: EuiWrappingPopoverProps['button'];
   children: ReactNode;
   closePopover: EuiWrappingPopoverProps['closePopover'];
   isOpen: EuiWrappingPopoverProps['isOpen'];
   title?: string;
+  theme: ThemeServiceStart;
 }) => {
   return (
-    <EuiWrappingPopover
-      anchorPosition={anchorPosition}
-      button={button}
-      className="lnsHelpPopover"
-      closePopover={closePopover}
-      isOpen={isOpen}
-      ownFocus
-      panelClassName="lnsHelpPopover__panel"
-      panelPaddingSize="none"
-    >
-      {title && <EuiPopoverTitle paddingSize="m">{title}</EuiPopoverTitle>}
+    <KibanaThemeProvider theme$={theme.theme$}>
+      <I18nProvider>
+        <EuiWrappingPopover
+          anchorPosition={anchorPosition}
+          button={button}
+          className="lnsHelpPopover"
+          closePopover={closePopover}
+          isOpen={isOpen}
+          ownFocus
+          panelClassName="lnsHelpPopover__panel"
+          panelPaddingSize="none"
+        >
+          {title && <EuiPopoverTitle paddingSize="m">{title}</EuiPopoverTitle>}
 
-      <EuiText className="lnsHelpPopover__content" size="s">
-        {children}
-      </EuiText>
-    </EuiWrappingPopover>
+          <EuiText className="lnsHelpPopover__content" size="s">
+            {children}
+          </EuiText>
+        </EuiWrappingPopover>
+      </I18nProvider>
+    </KibanaThemeProvider>
   );
 };
diff --git a/x-pack/plugins/lens/public/datasources/text_based/text_based_languages.tsx b/x-pack/plugins/lens/public/datasources/text_based/text_based_languages.tsx
@@ -379,17 +379,21 @@ export function getTextBasedDatasource({
       }
 
       render(
-        <DimensionTrigger
-          id={props.columnId}
-          color={customLabel && selectedField ? 'primary' : 'danger'}
-          dataTestSubj="lns-dimensionTrigger-textBased"
-          label={
-            customLabel ??
-            i18n.translate('xpack.lens.textBasedLanguages.missingField', {
-              defaultMessage: 'Missing field',
-            })
-          }
-        />,
+        <KibanaThemeProvider theme$={core.theme.theme$}>
+          <I18nProvider>
+            <DimensionTrigger
+              id={props.columnId}
+              color={customLabel && selectedField ? 'primary' : 'danger'}
+              dataTestSubj="lns-dimensionTrigger-textBased"
+              label={
+                customLabel ??
+                i18n.translate('xpack.lens.textBasedLanguages.missingField', {
+                  defaultMessage: 'Missing field',
+                })
+              }
+            />{' '}
+          </I18nProvider>
+        </KibanaThemeProvider>,
         domElement
       );
     },
@@ -421,73 +425,75 @@ export function getTextBasedDatasource({
       });
       render(
         <KibanaThemeProvider theme$={core.theme.theme$}>
-          <EuiFormRow
-            data-test-subj="text-based-languages-field-selection-row"
-            label={i18n.translate('xpack.lens.textBasedLanguages.chooseField', {
-              defaultMessage: 'Field',
-            })}
-            fullWidth
-            className="lnsIndexPatternDimensionEditor--padded"
-          >
-            <FieldSelect
-              existingFields={updatedFields}
-              selectedField={selectedField}
-              onChoose={(choice) => {
-                const meta = fields.find((f) => f.name === choice.field)?.meta;
-                const newColumn = {
-                  columnId: props.columnId,
-                  fieldName: choice.field,
-                  meta,
-                };
-                return props.setState(
-                  !selectedField
-                    ? {
-                        ...props.state,
-                        layers: {
-                          ...props.state.layers,
-                          [props.layerId]: {
-                            ...props.state.layers[props.layerId],
-                            columns: [...props.state.layers[props.layerId].columns, newColumn],
-                            allColumns: [
-                              ...props.state.layers[props.layerId].allColumns,
-                              newColumn,
-                            ],
+          <I18nProvider>
+            <EuiFormRow
+              data-test-subj="text-based-languages-field-selection-row"
+              label={i18n.translate('xpack.lens.textBasedLanguages.chooseField', {
+                defaultMessage: 'Field',
+              })}
+              fullWidth
+              className="lnsIndexPatternDimensionEditor--padded"
+            >
+              <FieldSelect
+                existingFields={updatedFields}
+                selectedField={selectedField}
+                onChoose={(choice) => {
+                  const meta = fields.find((f) => f.name === choice.field)?.meta;
+                  const newColumn = {
+                    columnId: props.columnId,
+                    fieldName: choice.field,
+                    meta,
+                  };
+                  return props.setState(
+                    !selectedField
+                      ? {
+                          ...props.state,
+                          layers: {
+                            ...props.state.layers,
+                            [props.layerId]: {
+                              ...props.state.layers[props.layerId],
+                              columns: [...props.state.layers[props.layerId].columns, newColumn],
+                              allColumns: [
+                                ...props.state.layers[props.layerId].allColumns,
+                                newColumn,
+                              ],
+                            },
                           },
-                        },
-                      }
-                    : {
-                        ...props.state,
-                        layers: {
-                          ...props.state.layers,
-                          [props.layerId]: {
-                            ...props.state.layers[props.layerId],
-                            columns: props.state.layers[props.layerId].columns.map((col) =>
-                              col.columnId !== props.columnId
-                                ? col
-                                : { ...col, fieldName: choice.field, meta }
-                            ),
-                            allColumns: props.state.layers[props.layerId].allColumns.map((col) =>
-                              col.columnId !== props.columnId
-                                ? col
-                                : { ...col, fieldName: choice.field, meta }
-                            ),
+                        }
+                      : {
+                          ...props.state,
+                          layers: {
+                            ...props.state.layers,
+                            [props.layerId]: {
+                              ...props.state.layers[props.layerId],
+                              columns: props.state.layers[props.layerId].columns.map((col) =>
+                                col.columnId !== props.columnId
+                                  ? col
+                                  : { ...col, fieldName: choice.field, meta }
+                              ),
+                              allColumns: props.state.layers[props.layerId].allColumns.map((col) =>
+                                col.columnId !== props.columnId
+                                  ? col
+                                  : { ...col, fieldName: choice.field, meta }
+                              ),
+                            },
                           },
-                        },
-                      }
-                );
-              }}
-            />
-          </EuiFormRow>
-          {props.dataSectionExtra && (
-            <div
-              style={{
-                paddingLeft: euiThemeVars.euiSize,
-                paddingRight: euiThemeVars.euiSize,
-              }}
-            >
-              {props.dataSectionExtra}
-            </div>
-          )}
+                        }
+                  );
+                }}
+              />
+            </EuiFormRow>
+            {props.dataSectionExtra && (
+              <div
+                style={{
+                  paddingLeft: euiThemeVars.euiSize,
+                  paddingRight: euiThemeVars.euiSize,
+                }}
+              >
+                {props.dataSectionExtra}
+              </div>
+            )}
+          </I18nProvider>
         </KibanaThemeProvider>,
         domElement
       );