Merge branch 'filter-activities-pagination' of https://github.com/js-…

…jankisalvi/kibana into filter-activities-pagination

docs/api/saved-objects/import.asciidoc

@@ -40,13 +40,19 @@ Saved objects can only be imported into the same version, a newer minor on the s
   (Optional, boolean) Creates copies of saved objects, regenerates each object ID, and resets the origin. When used, potential conflict
   errors are avoided.
 +
-NOTE: This cannot be used with the `overwrite` option.
+NOTE: This option cannot be used with the `overwrite` and `compatibilityMode` options.
 
 `overwrite`::
   (Optional, boolean) Overwrites saved objects when they already exist. When used, potential conflict errors are automatically resolved by
   overwriting the destination object.
 +
-NOTE: This cannot be used with the `createNewCopies` option.
+NOTE: This option cannot be used with the `createNewCopies` option.
+
+`compatibilityMode`::
+  (Optional, boolean) Applies various adjustments to the saved objects that are being imported to maintain compatibility between different {kib}
+  versions. Use this option only if you encounter issues with imported saved objects.
++
+NOTE: This option cannot be used with the `createNewCopies` option.
 
 [[saved-objects-api-import-request-body]]
 ==== Request body

docs/api/spaces-management/copy_saved_objects.asciidoc

@@ -55,13 +55,19 @@ You can request to overwrite any objects that already exist in the target space
   (Optional, boolean) Creates new copies of saved objects, regenerates each object ID, and resets the origin. When used, potential conflict
   errors are avoided. The default value is `true`.
 +
-NOTE: This cannot be used with the `overwrite` option.
+NOTE: This option cannot be used with the `overwrite` and `compatibilityMode` options.
 
 `overwrite`::
   (Optional, boolean) When set to `true`, all conflicts are automatically overridden. When a saved object with a matching `type` and `id`
   exists in the target space, that version is replaced with the version from the source space. The default value is `false`.
 +
-NOTE: This cannot be used with the `createNewCopies` option.
+NOTE: This option cannot be used with the `createNewCopies` option.
+
+`compatibilityMode`::
+  (Optional, boolean) Applies various adjustments to the saved objects that are being copied to maintain compatibility between different {kib}
+  versions. Use this option only if you encounter issues with copied saved objects.
++
+NOTE: This option cannot be used with the `createNewCopies` option.
 
 [role="child_attributes"]
 [[spaces-api-copy-saved-objects-response-body]]

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.spaces_extension.test.ts

@@ -878,6 +878,14 @@ describe('SavedObjectsRepository Spaces Extension', () => {
           );
         });
       });
+
+      test('#getCurrentNamespace', () => {
+        mockSpacesExt.getCurrentNamespace.mockReturnValue('ns-from-ext');
+
+        expect(repository.getCurrentNamespace('ns-from-arg')).toBe('ns-from-ext');
+        expect(mockSpacesExt.getCurrentNamespace).toBeCalledTimes(1);
+        expect(mockSpacesExt.getCurrentNamespace).toHaveBeenCalledWith('ns-from-arg');
+      });
     });
   });
 

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.test.ts

@@ -5228,4 +5228,24 @@ describe('SavedObjectsRepository', () => {
       await expect(repository.updateObjectsSpaces([], [], [])).rejects.toEqual(expectedResult);
     });
   });
+
+  describe('#getCurrentNamespace', () => {
+    it('returns `undefined` for `undefined` namespace argument', async () => {
+      expect(repository.getCurrentNamespace()).toBeUndefined();
+    });
+
+    it('throws if `*` namespace argument is provided', async () => {
+      expect(() => repository.getCurrentNamespace('*')).toThrowErrorMatchingInlineSnapshot(
+        `"\\"options.namespace\\" cannot be \\"*\\": Bad Request"`
+      );
+    });
+
+    it('properly handles `default` namespace', async () => {
+      expect(repository.getCurrentNamespace('default')).toBeUndefined();
+    });
+
+    it('properly handles non-`default` namespace', async () => {
+      expect(repository.getCurrentNamespace('space-a')).toBe('space-a');
+    });
+  });
 });

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.ts

@@ -2553,6 +2553,16 @@ export class SavedObjectsRepository implements ISavedObjectsRepository {
     });
   }
 
+  /**
+   * {@inheritDoc ISavedObjectsRepository.getCurrentNamespace}
+   */
+  getCurrentNamespace(namespace?: string) {
+    if (this._spacesExtension) {
+      return this._spacesExtension.getCurrentNamespace(namespace);
+    }
+    return normalizeNamespace(namespace);
+  }
+
   /**
    * Returns index specified by the given type or the default index
    *
@@ -2664,20 +2674,6 @@ export class SavedObjectsRepository implements ISavedObjectsRepository {
     // any other error from this check does not matter
   }
 
-  /**
-   * If the spaces extension is enabled, we should use that to get the current namespace (and optionally throw an error if a consumer
-   * attempted to specify the namespace option).
-   *
-   * If the spaces extension is *not* enabled, we should simply normalize the namespace option so that `'default'` can be used
-   * interchangeably with `undefined`.
-   */
-  private getCurrentNamespace(namespace?: string) {
-    if (this._spacesExtension) {
-      return this._spacesExtension.getCurrentNamespace(namespace);
-    }
-    return normalizeNamespace(namespace);
-  }
-
   /** The `initialNamespaces` field (create, bulkCreate) is used to create an object in an initial set of spaces. */
   private validateInitialNamespaces(type: string, initialNamespaces: string[] | undefined) {
     if (!initialNamespaces) {

packages/core/saved-objects/core-saved-objects-api-server-internal/src/mocks/repository.mock.ts

@@ -32,6 +32,7 @@ const createRepositoryMock = () => {
     removeReferencesTo: jest.fn(),
     collectMultiNamespaceReferences: jest.fn(),
     updateObjectsSpaces: jest.fn(),
+    getCurrentNamespace: jest.fn(),
   };
 
   return mock;

packages/core/saved-objects/core-saved-objects-api-server-internal/src/saved_objects_client.test.ts

@@ -326,4 +326,12 @@ describe('SavedObjectsClient', () => {
     );
     expect(result).toBe(returnValue);
   });
+
+  test(`#getCurrentNamespace`, () => {
+    mockRepository.getCurrentNamespace.mockReturnValue('ns');
+    const client = new SavedObjectsClient(mockRepository);
+
+    expect(client.getCurrentNamespace()).toEqual('ns');
+    expect(mockRepository.getCurrentNamespace).toHaveBeenCalledWith();
+  });
 });

packages/core/saved-objects/core-saved-objects-api-server-internal/src/saved_objects_client.ts

@@ -208,4 +208,9 @@ export class SavedObjectsClient implements SavedObjectsClientContract {
       options
     );
   }
+
+  /** {@inheritDoc SavedObjectsClientContract.getCurrentNamespace} */
+  getCurrentNamespace() {
+    return this._repository.getCurrentNamespace();
+  }
 }

packages/core/saved-objects/core-saved-objects-api-server-mocks/src/repository.mock.ts

@@ -31,6 +31,7 @@ const create = () => {
     removeReferencesTo: jest.fn(),
     collectMultiNamespaceReferences: jest.fn(),
     updateObjectsSpaces: jest.fn(),
+    getCurrentNamespace: jest.fn(),
   };
 
   mock.createPointInTimeFinder = savedObjectsPointInTimeFinderMock.create({

packages/core/saved-objects/core-saved-objects-api-server-mocks/src/saved_objects_client.mock.ts

@@ -31,6 +31,7 @@ const create = () => {
     removeReferencesTo: jest.fn(),
     collectMultiNamespaceReferences: jest.fn(),
     updateObjectsSpaces: jest.fn(),
+    getCurrentNamespace: jest.fn(),
   } as unknown as jest.Mocked<SavedObjectsClientContract>;
 
   mock.createPointInTimeFinder = savedObjectsPointInTimeFinderMock.create({

packages/core/saved-objects/core-saved-objects-api-server/src/saved_objects_client.ts

@@ -47,7 +47,7 @@ import type {
 } from './apis';
 
 /**
- * Saved Objects is Kibana's data persisentence mechanism allowing plugins to
+ * Saved Objects is Kibana's data persistence mechanism allowing plugins to
  * use Elasticsearch for storing plugin state.
  *
  * ## SavedObjectsClient errors
@@ -288,7 +288,7 @@ export interface SavedObjectsClientContract {
    *
    * @param type - the type of the object to remove references to
    * @param id - the ID of the object to remove references to
-   * @param options {@link SavedObjectsRemoveReferencesToOptions} - options for the remove references opertion
+   * @param options {@link SavedObjectsRemoveReferencesToOptions} - options for the remove references operation
    * @returns the {@link SavedObjectsRemoveReferencesToResponse}
    */
   removeReferencesTo(
@@ -377,7 +377,7 @@ export interface SavedObjectsClientContract {
    * ```
    *
    * @param findOptions {@link SavedObjectsCreatePointInTimeFinderOptions} - options for the create PIT finder operation
-   * @param dependencies {@link SavedObjectsCreatePointInTimeFinderDependencies} - dependencies for the create PIT fimder operation
+   * @param dependencies {@link SavedObjectsCreatePointInTimeFinderDependencies} - dependencies for the create PIT finder operation
    * @returns the created PIT finder
    */
   createPointInTimeFinder<T = unknown, A = unknown>(
@@ -412,4 +412,9 @@ export interface SavedObjectsClientContract {
     spacesToRemove: string[],
     options?: SavedObjectsUpdateObjectsSpacesOptions
   ): Promise<SavedObjectsUpdateObjectsSpacesResponse>;
+
+  /**
+   * Returns the namespace associated with the client. If the namespace is the default one, this method returns `undefined`.
+   */
+  getCurrentNamespace(): string | undefined;
 }

packages/core/saved-objects/core-saved-objects-api-server/src/saved_objects_repository.ts

@@ -533,4 +533,14 @@ export interface ISavedObjectsRepository {
     findOptions: SavedObjectsCreatePointInTimeFinderOptions,
     dependencies?: SavedObjectsCreatePointInTimeFinderDependencies
   ): ISavedObjectsPointInTimeFinder<T, A>;
+
+  /**
+   * If the spaces extension is enabled, it's used to get the current namespace (and optionally throws an error if a
+   * consumer attempted to specify the namespace explicitly).
+   *
+   * If the spaces extension is *not* enabled, this function simply normalizes the specified namespace so that
+   * `'default'` can be used interchangeably with `undefined` i.e. the method always returns `undefined` for the default
+   * namespace.
+   */
+  getCurrentNamespace(namespace?: string): string | undefined;
 }

packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/import_saved_objects.ts

@@ -49,6 +49,11 @@ export interface ImportSavedObjectsOptions {
   namespace?: string;
   /** If true, will create new copies of import objects, each with a random `id` and undefined `originId`. */
   createNewCopies: boolean;
+  /**
+   * If true, Kibana will apply various adjustments to the data that's being imported to maintain compatibility between
+   * different Kibana versions (e.g. generate legacy URL aliases for all imported objects that have to change IDs).
+   */
+  compatibilityMode?: boolean;
 }
 
 /**
@@ -67,6 +72,7 @@ export async function importSavedObjectsFromStream({
   importHooks,
   namespace,
   refresh,
+  compatibilityMode,
 }: ImportSavedObjectsOptions): Promise<SavedObjectsImportResponse> {
   let errorAccumulator: SavedObjectsImportFailure[] = [];
   const supportedTypes = typeRegistry.getImportableAndExportableTypes().map((type) => type.name);
@@ -147,6 +153,7 @@ export async function importSavedObjectsFromStream({
     overwrite,
     namespace,
     refresh,
+    compatibilityMode,
   };
   const createSavedObjectsResult = await createSavedObjects(createSavedObjectsParams);
   errorAccumulator = [...errorAccumulator, ...createSavedObjectsResult.errors];