Merge branch 'main' into entity-analytics-execution

elastic · Dec 11, 2023 · d886820 · d886820
2 parents 3e5c1a8 + 946b38e
commit d886820
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 47 deletions.
diff --git a/src/plugins/data/server/ui_settings.ts b/src/plugins/data/server/ui_settings.ts
@@ -168,12 +168,12 @@ export function getUiSettings(
       name: i18n.translate('data.advancedSettings.defaultIndexTitle', {
         defaultMessage: 'Default data view',
       }),
-      value: null,
+      value: '',
       type: 'string',
       description: i18n.translate('data.advancedSettings.defaultIndexText', {
         defaultMessage: 'Used by discover and visualizations when a data view is not set.',
       }),
-      schema: schema.nullable(schema.string()),
+      schema: schema.string(),
     },
     [UI_SETTINGS.COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX]: {
       name: i18n.translate('data.advancedSettings.courier.ignoreFilterTitle', {

diff --git a/test/api_integration/apis/data_views/default_index_pattern/default_index_pattern.ts b/test/api_integration/apis/data_views/default_index_pattern/default_index_pattern.ts
@@ -48,7 +48,7 @@ export default function ({ getService }: FtrProviderContext) {
           expect(response5.status).to.be(200);
 
           const response6 = await supertest.get(defaultPath);
-          expect(response6.body[serviceKeyId]).to.be(null);
+          expect(response6.body[serviceKeyId]).to.be('');
         });
       });
     });

diff --git a/x-pack/plugins/dataset_quality/common/translations.ts b/x-pack/plugins/dataset_quality/common/translations.ts
@@ -11,10 +11,6 @@ export const datasetQualityAppTitle = i18n.translate('xpack.datasetQuality.appTi
   defaultMessage: 'Datasets',
 });
 
-export const onboardingLinkTitle = i18n.translate('xpack.datasetQuality.onboardingLinkTitle', {
-  defaultMessage: 'Add data',
-});
-
 export const noDatasetsDescription = i18n.translate('xpack.datasetQuality.noDatasetsDescription', {
   defaultMessage: 'Try adjusting your time or filter.',
 });

diff --git a/x-pack/plugins/dataset_quality/public/components/dataset_quality/header.tsx b/x-pack/plugins/dataset_quality/public/components/dataset_quality/header.tsx
@@ -5,45 +5,10 @@
  * 2.0.
  */
 
+import { EuiPageHeader } from '@elastic/eui';
 import React from 'react';
-import { EuiPageHeader, EuiButton } from '@elastic/eui';
-import {
-  ObservabilityOnboardingLocatorParams,
-  OBSERVABILITY_ONBOARDING_LOCATOR,
-} from '@kbn/deeplinks-observability';
-import { datasetQualityAppTitle, onboardingLinkTitle } from '../../../common/translations';
-import { useKibanaContextForPlugin } from '../../utils';
+import { datasetQualityAppTitle } from '../../../common/translations';
 
 export function Header() {
-  const {
-    services: { share },
-  } = useKibanaContextForPlugin();
-
-  const OnboardingLink = React.memo(() => {
-    const locator = share.url.locators.get<ObservabilityOnboardingLocatorParams>(
-      OBSERVABILITY_ONBOARDING_LOCATOR
-    );
-
-    const onboardingUrl = locator?.getRedirectUrl({});
-
-    return (
-      <EuiButton
-        href={onboardingUrl}
-        fill
-        size="s"
-        iconType="indexOpen"
-        data-test-subj="datasetQualityOnboardingLink"
-      >
-        {onboardingLinkTitle}
-      </EuiButton>
-    );
-  });
-
-  return (
-    <EuiPageHeader
-      bottomBorder
-      pageTitle={datasetQualityAppTitle}
-      rightSideItems={[<OnboardingLink />]}
-    />
-  );
+  return <EuiPageHeader bottomBorder pageTitle={datasetQualityAppTitle} />;
 }
diff --git a/x-pack/plugins/dataset_quality/tsconfig.json b/x-pack/plugins/dataset_quality/tsconfig.json
@@ -13,7 +13,6 @@
     "@kbn/core",
     "@kbn/core-plugins-server",
     "@kbn/core-elasticsearch-server-mocks",
-    "@kbn/deeplinks-observability",
     "@kbn/fleet-plugin",
     "@kbn/observability-shared-plugin",
     "@kbn/server-route-repository",

diff --git a/..._integration/test_suites/common/data_views/default_index_pattern/default_index_pattern.ts b/..._integration/test_suites/common/data_views/default_index_pattern/default_index_pattern.ts
@@ -72,7 +72,7 @@ export default function ({ getService }: FtrProviderContext) {
           // TODO: The response comes back undefined in Serverless
           const body = response6.body[serviceKeyId];
           const expected = body === undefined ? null : body;
-          expect(expected).to.be(null);
+          expect(expected).to.be('');
         });
       });
     });