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 33119b947bcee..204ae4df10fcd 100644 --- a/src/core/server/saved_objects/import/import_saved_objects.ts +++ b/src/core/server/saved_objects/import/import_saved_objects.ts @@ -176,11 +176,12 @@ export async function importSavedObjectsFromStream({ }); const errorResults = errorAccumulator.map((error) => { const icon = typeRegistry.getType(error.type)?.management?.icon; + const namespaceType = typeRegistry.getType(error.type)?.namespaceType; const attemptedOverwrite = pendingOverwrites.has(getObjKey(error)); return { ...error, namespaces: importNamespaces ? error.namespaces : undefined, - meta: { ...error.meta, icon }, + meta: { ...error.meta, icon, namespaceType }, ...(attemptedOverwrite && { overwrite: true }), }; }); diff --git a/test/api_integration/apis/saved_objects/import.ts b/test/api_integration/apis/saved_objects/import.ts index c899f082ec4d3..32e3b0ec86b7b 100644 --- a/test/api_integration/apis/saved_objects/import.ts +++ b/test/api_integration/apis/saved_objects/import.ts @@ -29,17 +29,17 @@ export default function ({ getService }: FtrProviderContext) { const indexPattern = { type: 'index-pattern', id: '91200a00-9efd-11e7-acb3-3dab96693fab', - meta: { title: 'logstash-*', icon: 'indexPatternApp' }, + meta: { title: 'logstash-*', icon: 'indexPatternApp', namespaceType: 'single' as const }, }; const visualization = { type: 'visualization', id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab', - meta: { title: 'Count of requests', icon: 'visualizeApp' }, + meta: { title: 'Count of requests', icon: 'visualizeApp', namespaceType: 'single' as const }, }; const dashboard = { type: 'dashboard', id: 'be3733a0-9efe-11e7-acb3-3dab96693fab', - meta: { title: 'Requests', icon: 'dashboardApp' }, + meta: { title: 'Requests', icon: 'dashboardApp', namespaceType: 'single' as const }, }; describe('with basic data existing', () => { @@ -155,6 +155,7 @@ export default function ({ getService }: FtrProviderContext) { meta: { icon: 'dashboardApp', title: 'dashboard-b', + namespaceType: 'single', }, type: 'dashboard', }, @@ -163,6 +164,7 @@ export default function ({ getService }: FtrProviderContext) { meta: { icon: 'dashboardApp', title: 'dashboard-a', + namespaceType: 'single', }, type: 'dashboard', }, @@ -222,7 +224,11 @@ export default function ({ getService }: FtrProviderContext) { type: 'visualization', id: '1', title: 'My visualization', - meta: { title: 'My visualization', icon: 'visualizeApp' }, + meta: { + title: 'My visualization', + icon: 'visualizeApp', + namespaceType: 'single', + }, error: { type: 'missing_references', references: [ diff --git a/test/api_integration/apis/saved_objects/resolve_import_errors.ts b/test/api_integration/apis/saved_objects/resolve_import_errors.ts index 7ca61a26a11c1..f9a634719ea72 100644 --- a/test/api_integration/apis/saved_objects/resolve_import_errors.ts +++ b/test/api_integration/apis/saved_objects/resolve_import_errors.ts @@ -14,22 +14,22 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const kibanaServer = getService('kibanaServer'); - describe('resolve_import_errors', () => { + describe('TOTO resolve_import_errors', () => { // mock success results including metadata const indexPattern = { type: 'index-pattern', id: '91200a00-9efd-11e7-acb3-3dab96693fab', - meta: { title: 'logstash-*', icon: 'indexPatternApp' }, + meta: { title: 'logstash-*', icon: 'indexPatternApp', namespaceType: 'single' }, }; const visualization = { type: 'visualization', id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab', - meta: { title: 'Count of requests', icon: 'visualizeApp' }, + meta: { title: 'Count of requests', icon: 'visualizeApp', namespaceType: 'single' }, }; const dashboard = { type: 'dashboard', id: 'be3733a0-9efe-11e7-acb3-3dab96693fab', - meta: { title: 'Requests', icon: 'dashboardApp' }, + meta: { title: 'Requests', icon: 'dashboardApp', namespaceType: 'single' }, }; const SPACE_ID = 'ftr-so-resolve_import_errors'; @@ -162,7 +162,7 @@ export default function ({ getService }: FtrProviderContext) { { type: 'visualization', id: '1', - meta: { title: 'My favorite vis', icon: 'visualizeApp' }, + meta: { title: 'My favorite vis', icon: 'visualizeApp', namespaceType: 'single' }, }, ], warnings: [],