From 7cda2c6256c363ae3f0bba4cf1adc8e9f797253a Mon Sep 17 00:00:00 2001 From: SuZhou-Joe Date: Mon, 4 Mar 2024 11:01:53 +0800 Subject: [PATCH] feat: remove duplicate workspaces params Signed-off-by: SuZhou-Joe --- src/core/server/saved_objects/import/create_saved_objects.ts | 2 -- src/core/server/saved_objects/import/import_saved_objects.ts | 1 - src/core/server/saved_objects/import/resolve_import_errors.ts | 2 -- .../saved_objects/migrations/core/build_active_mappings.ts | 3 --- 4 files changed, 8 deletions(-) diff --git a/src/core/server/saved_objects/import/create_saved_objects.ts b/src/core/server/saved_objects/import/create_saved_objects.ts index 692826c4ac8a..4bb07150aef8 100644 --- a/src/core/server/saved_objects/import/create_saved_objects.ts +++ b/src/core/server/saved_objects/import/create_saved_objects.ts @@ -39,7 +39,6 @@ interface CreateSavedObjectsParams { importIdMap: Map; namespace?: string; overwrite?: boolean; - workspaces?: string[]; dataSourceId?: string; dataSourceTitle?: string; workspaces?: string[]; @@ -60,7 +59,6 @@ export const createSavedObjects = async ({ importIdMap, namespace, overwrite, - workspaces, dataSourceId, dataSourceTitle, workspaces, diff --git a/src/core/server/saved_objects/import/import_saved_objects.ts b/src/core/server/saved_objects/import/import_saved_objects.ts index 0613d4d2bec6..7cdb6970ca9d 100644 --- a/src/core/server/saved_objects/import/import_saved_objects.ts +++ b/src/core/server/saved_objects/import/import_saved_objects.ts @@ -58,7 +58,6 @@ export async function importSavedObjectsFromStream({ workspaces, dataSourceId, dataSourceTitle, - workspaces, }: SavedObjectsImportOptions): Promise { let errorAccumulator: SavedObjectsImportError[] = []; const supportedTypes = typeRegistry.getImportableAndExportableTypes().map((type) => type.name); diff --git a/src/core/server/saved_objects/import/resolve_import_errors.ts b/src/core/server/saved_objects/import/resolve_import_errors.ts index 5d6557ff4429..24bbc1934de3 100644 --- a/src/core/server/saved_objects/import/resolve_import_errors.ts +++ b/src/core/server/saved_objects/import/resolve_import_errors.ts @@ -59,7 +59,6 @@ export async function resolveSavedObjectsImportErrors({ typeRegistry, namespace, createNewCopies, - workspaces, dataSourceId, dataSourceTitle, workspaces, @@ -164,7 +163,6 @@ export async function resolveSavedObjectsImportErrors({ importIdMap, namespace, overwrite, - workspaces, dataSourceId, dataSourceTitle, workspaces, diff --git a/src/core/server/saved_objects/migrations/core/build_active_mappings.ts b/src/core/server/saved_objects/migrations/core/build_active_mappings.ts index 32164bbaa2df..8f301debf6f7 100644 --- a/src/core/server/saved_objects/migrations/core/build_active_mappings.ts +++ b/src/core/server/saved_objects/migrations/core/build_active_mappings.ts @@ -196,9 +196,6 @@ function defaultMapping(): IndexMapping { }, }, }, - workspaces: { - type: 'keyword', - }, permissions: { properties: { read: principals,