Merge branch 'main' into 176124_fix_inactive_popover

elastic · Feb 15, 2024 · c5a6d77 · c5a6d77
2 parents 5a3a5e5 + cec949e
commit c5a6d77
Show file tree

Hide file tree

Showing 140 changed files with 15,952 additions and 2,446 deletions.
diff --git a/docs/developer/architecture/core/saved-objects-service-use-case-examples.asciidoc b/docs/developer/architecture/core/saved-objects-service-use-case-examples.asciidoc
diff --git a/docs/developer/architecture/core/saved-objects-service.asciidoc b/docs/developer/architecture/core/saved-objects-service.asciidoc
diff --git a/packages/core/saved-objects/core-saved-objects-server/src/saved_objects_type.ts b/packages/core/saved-objects/core-saved-objects-server/src/saved_objects_type.ts
@@ -70,6 +70,7 @@ export interface SavedObjectsType<Attributes = any> {
   mappings: SavedObjectsTypeMappingDefinition;
   /**
    * An optional map of {@link SavedObjectMigrationFn | migrations} or a function returning a map of {@link SavedObjectMigrationFn | migrations} to be used to migrate the type.
+   * @deprecated Use {@link SavedObjectsType.modelVersions | modelVersions} instead.
    */
   migrations?: SavedObjectMigrationMap | (() => SavedObjectMigrationMap);
   /**
@@ -78,6 +79,7 @@ export interface SavedObjectsType<Attributes = any> {
    * When provided, calls to {@link SavedObjectsClient.create | create} will be validated against this schema.
    *
    * See {@link SavedObjectsValidationMap} for more details.
+   * @deprecated Use {@link SavedObjectsType.modelVersions | modelVersions} instead.
    */
   schemas?: SavedObjectsValidationMap | (() => SavedObjectsValidationMap);
   /**
@@ -177,7 +179,7 @@ export interface SavedObjectsType<Attributes = any> {
   modelVersions?: SavedObjectsModelVersionMap | SavedObjectsModelVersionMapProvider;
 
   /**
-   * Allows to opt-in to the new model version API.
+   * Allows to opt-in to the model version API.
    *
    * Must be a valid semver version (with the patch version being necessarily 0)
    *

diff --git a/src/plugins/ai_assistant_management/observability/public/routes/components/settings_tab.tsx b/src/plugins/ai_assistant_management/observability/public/routes/components/settings_tab.tsx
@@ -162,6 +162,7 @@ export function SettingsTab() {
             )}
           >
             <EuiFormRow
+              style={{ alignSelf: 'end', width: '80%' }}
               fullWidth
               label={i18n.translate(
                 'aiAssistantManagementObservability.settingsPage.selectConnectorLabel',

diff --git a/...plication/main/components/no_results/no_results_suggestions/use_fetch_occurances_range.ts b/...plication/main/components/no_results/no_results_suggestions/use_fetch_occurances_range.ts
@@ -66,7 +66,10 @@ export const useFetchOccurrencesRange = (params: Params): Result => {
             abortSignal: abortControllerRef.current?.signal,
           });
         } catch (error) {
-          //
+          if (error.name !== 'AbortError') {
+            // eslint-disable-next-line no-console
+            console.error(error);
+          }
         }
       }
 

diff --git a/test/examples/unified_field_list_examples/existing_fields.ts b/test/examples/unified_field_list_examples/existing_fields.ts
@@ -73,7 +73,7 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
       await PageObjects.timePicker.setAbsoluteRange(TEST_START_TIME, TEST_END_TIME);
       await PageObjects.header.waitUntilLoadingHasFinished();
       await PageObjects.unifiedFieldList.waitUntilSidebarHasLoaded();
-      await PageObjects.unifiedFieldList.toggleSidebarSection('meta');
+      await PageObjects.unifiedFieldList.openSidebarSection('meta');
     });
 
     after(async () => {

diff --git a/test/functional/apps/discover/group1/_discover.ts b/test/functional/apps/discover/group1/_discover.ts
@@ -170,8 +170,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       it('should show matches when time range is expanded', async () => {
-        await PageObjects.discover.expandTimeRangeAsSuggestedInNoResultsMessage();
-        await PageObjects.discover.waitUntilSearchingHasFinished();
+        await retry.waitFor('view all matches to load', async () => {
+          await PageObjects.discover.expandTimeRangeAsSuggestedInNoResultsMessage();
+          await PageObjects.discover.waitUntilSearchingHasFinished();
+          return !(await testSubjects.exists('discoverNoResultsViewAllMatches'));
+        });
         await retry.try(async function () {
           expect(await PageObjects.discover.hasNoResults()).to.be(false);
           expect(await PageObjects.discover.getHitCountInt()).to.be.above(0);

diff --git a/test/functional/page_objects/unified_field_list.ts b/test/functional/page_objects/unified_field_list.ts
@@ -88,6 +88,22 @@ export class UnifiedFieldListPageObject extends FtrService {
     );
   }
 
+  public async openSidebarSection(sectionName: SidebarSectionName) {
+    const openedSectionSelector = `${this.getSidebarSectionSelector(
+      sectionName,
+      true
+    )}.euiAccordion-isOpen`;
+
+    if (await this.find.existsByCssSelector(openedSectionSelector)) {
+      return;
+    }
+
+    await this.retry.waitFor(`${sectionName} fields section to open`, async () => {
+      await this.toggleSidebarSection(sectionName);
+      return await this.find.existsByCssSelector(openedSectionSelector);
+    });
+  }
+
   public async waitUntilFieldPopoverIsOpen() {
     await this.retry.waitFor('popover is open', async () => {
       return Boolean(await this.find.byCssSelector('[data-popover-open="true"]'));

diff --git a/x-pack/plugins/actions/jest.integration.config.js b/x-pack/plugins/actions/jest.integration.config.js
@@ -6,7 +6,7 @@
  */
 
 module.exports = {
-  preset: '@kbn/test/jest_integration_node',
+  preset: '@kbn/test/jest_integration',
   rootDir: '../../..',
   roots: ['<rootDir>/x-pack/plugins/actions'],
 };