Merge branch 'main' into redesign-grid-toolbar

packages/kbn-unified-data-table/src/components/data_table_columns.test.tsx

@@ -159,4 +159,64 @@ describe('Data table columns', function () {
       expect(actual).toMatchSnapshot();
     });
   });
+
+  describe('Textbased languages grid columns', () => {
+    it('returns eui grid with in memory sorting for text based languages and columns on the dataview', async () => {
+      const columnsNotInDataview = getVisibleColumns(
+        ['extension'],
+        dataViewWithTimefieldMock,
+        true
+      ) as string[];
+      const gridColumns = getEuiGridColumns({
+        columns: columnsNotInDataview,
+        settings: {},
+        dataView: dataViewWithTimefieldMock,
+        defaultColumns: false,
+        isSortEnabled: true,
+        isPlainRecord: true,
+        valueToStringConverter: dataTableContextMock.valueToStringConverter,
+        rowsCount: 100,
+        services: {
+          uiSettings: servicesMock.uiSettings,
+          toastNotifications: servicesMock.toastNotifications,
+        },
+        hasEditDataViewPermission: () =>
+          servicesMock.dataViewFieldEditor.userPermissions.editIndexPattern(),
+        onFilter: () => {},
+        columnTypes: {
+          var_test: 'number',
+        },
+      });
+      expect(gridColumns[1].schema).toBe('string');
+    });
+
+    it('returns eui grid with in memory sorting for text based languages and columns not on the columnTypes', async () => {
+      const columnsNotInDataview = getVisibleColumns(
+        ['var_test'],
+        dataViewWithTimefieldMock,
+        true
+      ) as string[];
+      const gridColumns = getEuiGridColumns({
+        columns: columnsNotInDataview,
+        settings: {},
+        dataView: dataViewWithTimefieldMock,
+        defaultColumns: false,
+        isSortEnabled: true,
+        isPlainRecord: true,
+        valueToStringConverter: dataTableContextMock.valueToStringConverter,
+        rowsCount: 100,
+        services: {
+          uiSettings: servicesMock.uiSettings,
+          toastNotifications: servicesMock.toastNotifications,
+        },
+        hasEditDataViewPermission: () =>
+          servicesMock.dataViewFieldEditor.userPermissions.editIndexPattern(),
+        onFilter: () => {},
+        columnTypes: {
+          var_test: 'number',
+        },
+      });
+      expect(gridColumns[1].schema).toBe('numeric');
+    });
+  });
 });

packages/kbn-unified-data-table/src/components/data_table_columns.tsx

@@ -125,9 +125,11 @@ function buildEuiGridColumn({
       : [];
   }
 
+  const columnType = columnTypes?.[columnName] ?? dataViewField?.type;
+
   const column: EuiDataGridColumn = {
     id: columnName,
-    schema: getSchemaByKbnType(dataViewField?.type),
+    schema: getSchemaByKbnType(columnType),
     isSortable: isSortEnabled && (isPlainRecord || dataViewField?.sortable === true),
     display: showColumnTokens ? (
       <DataTableColumnHeaderMemoized

x-pack/plugins/infra/kibana.jsonc

@@ -45,7 +45,8 @@
       "kibanaReact",
       "ml",
       "embeddable",
-      "controls"
+      "controls",
+      "advancedSettings"
     ]
   }
 }

x-pack/plugins/infra/public/pages/metrics/index.tsx

@@ -11,9 +11,10 @@ import React, { useContext } from 'react';
 import { Routes, Route } from '@kbn/shared-ux-router';
 
 import { EuiErrorBoundary, EuiHeaderLinks, EuiHeaderLink } from '@elastic/eui';
-import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useKibana, useUiSetting } from '@kbn/kibana-react-plugin/public';
 import { HeaderMenuPortal, useLinkProps } from '@kbn/observability-shared-plugin/public';
 import { ObservabilityAIAssistantActionMenuItem } from '@kbn/observability-ai-assistant-plugin/public';
+import { enableInfrastructureHostsView } from '@kbn/observability-plugin/common';
 import { MetricsSourceConfigurationProperties } from '../../../common/metrics_sources';
 import { HelpCenterContent } from '../../components/help_center_content';
 import { useReadOnlyBadge } from '../../hooks/use_readonly_badge';
@@ -23,7 +24,6 @@ import { MetricsExplorerPage } from './metrics_explorer';
 import { SnapshotPage } from './inventory_view';
 import { NodeDetail } from './metric_detail';
 import { MetricsSettingsPage } from './settings';
-import { HostsLandingPage } from './hosts/hosts_landing_page';
 import { SourceLoadingPage } from '../../components/source_loading_page';
 import { WaffleOptionsProvider } from './inventory_view/hooks/use_waffle_options';
 import { WaffleTimeProvider } from './inventory_view/hooks/use_waffle_time';
@@ -37,6 +37,7 @@ import { CreateDerivedIndexPattern, useSourceContext } from '../../containers/me
 import { NotFoundPage } from '../404';
 import { ReactQueryProvider } from '../../containers/react_query_provider';
 import { usePluginConfig } from '../../containers/plugin_config_context';
+import { HostsPage } from './hosts';
 
 const ADD_DATA_LABEL = i18n.translate('xpack.infra.metricsHeaderAddDataButtonLabel', {
   defaultMessage: 'Add data',
@@ -46,6 +47,7 @@ export const InfrastructurePage = () => {
   const config = usePluginConfig();
   const uiCapabilities = useKibana().services.application?.capabilities;
   const { setHeaderActionMenu, theme$ } = useContext(HeaderActionMenuContext);
+  const isHostsViewEnabled = useUiSetting(enableInfrastructureHostsView);
 
   const settingsTabTitle = i18n.translate('xpack.infra.metrics.settingsTabTitle', {
     defaultMessage: 'Settings',
@@ -113,7 +115,7 @@ export const InfrastructurePage = () => {
                       </Route>
                     )}
                     <Route path="/detail/:type/:node" component={NodeDetail} />
-                    <Route path={'/hosts'} component={HostsLandingPage} />
+                    {isHostsViewEnabled && <Route path={'/hosts'} component={HostsPage} />}
                     <Route path={'/settings'} component={MetricsSettingsPage} />
                     <Route render={() => <NotFoundPage title="Infrastructure" />} />
                   </Routes>

x-pack/plugins/infra/public/pages/metrics/settings/features_configuration_panel.tsx

@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiTitle } from '@elastic/eui';
+import { EuiSpacer } from '@elastic/eui';
+import { EuiForm } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import React from 'react';
+import { enableInfrastructureHostsView } from '@kbn/observability-plugin/common';
+import { useEditableSettings } from '@kbn/observability-shared-plugin/public';
+import { LazyField } from '@kbn/advanced-settings-plugin/public';
+import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
+
+type Props = Pick<
+  ReturnType<typeof useEditableSettings>,
+  'handleFieldChange' | 'settingsEditableConfig' | 'unsavedChanges'
+> & {
+  readOnly: boolean;
+};
+
+export function FeaturesConfigurationPanel({
+  readOnly,
+  handleFieldChange,
+  settingsEditableConfig,
+  unsavedChanges,
+}: Props) {
+  const {
+    services: { docLinks, notifications },
+  } = useKibanaContextForPlugin();
+
+  return (
+    <EuiForm>
+      <EuiTitle size="s" data-test-subj="sourceConfigurationFeaturesSectionTitle">
+        <h3>
+          <FormattedMessage
+            id="xpack.infra.sourceConfiguration.featuresSectionTitle"
+            defaultMessage="Features"
+          />
+        </h3>
+      </EuiTitle>
+      <EuiSpacer size="m" />
+      <LazyField
+        key={enableInfrastructureHostsView}
+        setting={settingsEditableConfig[enableInfrastructureHostsView]}
+        handleChange={handleFieldChange}
+        enableSaving={!readOnly}
+        docLinks={docLinks.links}
+        toasts={notifications.toasts}
+        unsavedChanges={unsavedChanges[enableInfrastructureHostsView]}
+      />
+    </EuiForm>
+  );
+}