elastic · legrego · Jan 6, 2020 · Dec 19, 2019 · Dec 20, 2019 · Jan 6, 2020
diff --git a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
@@ -148,6 +148,8 @@ export const npStart = {
       legacy: {
         getSection: () => ({
           register: sinon.fake(),
+          deregister: sinon.fake(),
+          hasItem: sinon.fake(),
         }),
       },
     },

diff --git a/...edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx b/...edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx
@@ -23,7 +23,7 @@ import {
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import React, { Component, Fragment } from 'react';
 import { Space } from '../../../../../../../../../spaces/common/model/space';
-import { SpaceAvatar } from '../../../../../../../../../spaces/public/components';
+import { SpaceAvatar } from '../../../../../../../../../spaces/public/space_avatar';
 import { Feature } from '../../../../../../../../../../../plugins/features/public';
 import { FeaturesPrivileges, Role } from '../../../../../../../../common/model';
 import { CalculatedPrivilege } from '../../../../../../../lib/kibana_privilege_calculator';

diff --git a/...role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx b/...role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
@@ -14,7 +14,7 @@ import {
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import _ from 'lodash';
 import React, { Component } from 'react';
-import { getSpaceColor } from '../../../../../../../../../spaces/public/lib/space_attributes';
+import { getSpaceColor } from '../../../../../../../../../spaces/public/space_avatar';
 import { Space } from '../../../../../../../../../spaces/common/model/space';
 import {
   FeaturesPrivileges,

diff --git a/...t/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx b/...t/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx
@@ -8,7 +8,7 @@ import { EuiComboBox, EuiComboBoxOptionProps, EuiHealth, EuiHighlight } from '@e
 import { InjectedIntl } from '@kbn/i18n/react';
 import React, { Component } from 'react';
 import { Space } from '../../../../../../../../../spaces/common/model/space';
-import { getSpaceColor } from '../../../../../../../../../spaces/public/lib/space_attributes';
+import { getSpaceColor } from '../../../../../../../../../spaces/public/space_avatar';
 
 const spaceToOption = (space?: Space, currentSelection?: 'global' | 'spaces') => {
   if (!space) {

diff --git a/.../public/views/management/edit_role/components/spaces_popover_list/spaces_popover_list.tsx b/.../public/views/management/edit_role/components/spaces_popover_list/spaces_popover_list.tsx
@@ -14,9 +14,9 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import React, { Component } from 'react';
-import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../../../../../spaces/common/constants';
-import { Space } from '../../../../../../../spaces/common/model/space';
-import { SpaceAvatar } from '../../../../../../../spaces/public/components';
+import { SpaceAvatar } from '../../../../../../../spaces/public/space_avatar';
+import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../../../../../../../plugins/spaces/common/constants';
+import { Space } from '../../../../../../../../../plugins/spaces/common/model/space';
 
 interface Props {
   spaces: Space[];

diff --git a/x-pack/legacy/plugins/spaces/index.ts b/x-pack/legacy/plugins/spaces/index.ts
@@ -49,12 +49,12 @@ export const spaces = (kibana: Record<string, any>) =>
 
     uiExports: {
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
-      managementSections: ['plugins/spaces/views/management'],
+      managementSections: [],
       apps: [
         {
           id: 'space_selector',
           title: 'Spaces',
-          main: 'plugins/spaces/views/space_selector',
+          main: 'plugins/spaces/space_selector',
           url: 'space_selector',
           hidden: true,
         },

diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { AdvancedSettingsService } from './advanced_settings_service';
+jest.mock('ui/management', () => {
+  return {
+    PAGE_TITLE_COMPONENT: 'page_title_component',
+    PAGE_SUBTITLE_COMPONENT: 'page_subtitle_component',
+  };
+});
+
+describe('Advanced Settings Service', () => {
+  describe('#setup', () => {
+    it('registers space-aware components to augment the advanced settings screen', () => {
+      const deps = {
+        getActiveSpace: jest.fn().mockResolvedValue({ id: 'foo', name: 'foo-space' }),
+        registerSettingsComponent: jest.fn(),
+      };
+
+      const advancedSettingsService = new AdvancedSettingsService();
+      advancedSettingsService.setup(deps);
+
+      expect(deps.registerSettingsComponent).toHaveBeenCalledTimes(2);
+      expect(deps.registerSettingsComponent).toHaveBeenCalledWith(
+        'page_title_component',
+        expect.any(Function),
+        true
+      );
+
+      expect(deps.registerSettingsComponent).toHaveBeenCalledWith(
+        'page_subtitle_component',
+        expect.any(Function),
+        true
+      );
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { PAGE_TITLE_COMPONENT, PAGE_SUBTITLE_COMPONENT } from 'ui/management';
+import { Space } from '../../common/model/space';
+import { AdvancedSettingsTitle, AdvancedSettingsSubtitle } from './components';
+
+interface SetupDeps {
+  getActiveSpace: () => Promise<Space>;
+  registerSettingsComponent: (
+    id: string,
+    component: string | React.FC<any>,
+    allowOverride: boolean
+  ) => void;
+}
+
+export class AdvancedSettingsService {
+  public setup({ getActiveSpace, registerSettingsComponent }: SetupDeps) {
+    const PageTitle = () => <AdvancedSettingsTitle getActiveSpace={getActiveSpace} />;
+    const SubTitle = () => <AdvancedSettingsSubtitle getActiveSpace={getActiveSpace} />;
+
+    registerSettingsComponent(PAGE_TITLE_COMPONENT, PageTitle, true);
+    registerSettingsComponent(PAGE_SUBTITLE_COMPONENT, SubTitle, true);
+  }
+}
diff --git a/...title/advanced_settings_subtitle.test.tsx → ...title/advanced_settings_subtitle.test.tsx b/...title/advanced_settings_subtitle.test.tsx → ...title/advanced_settings_subtitle.test.tsx
diff --git a/...s_subtitle/advanced_settings_subtitle.tsx → ...s_subtitle/advanced_settings_subtitle.tsx b/...s_subtitle/advanced_settings_subtitle.tsx → ...s_subtitle/advanced_settings_subtitle.tsx
@@ -7,7 +7,7 @@
 import { EuiCallOut, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Fragment, useState, useEffect } from 'react';
-import { Space } from '../../../../../common/model/space';
+import { Space } from '../../../../common/model/space';
 
 interface Props {
   getActiveSpace: () => Promise<Space>;

diff --git a/...nents/advanced_settings_subtitle/index.ts → ...nents/advanced_settings_subtitle/index.ts b/...nents/advanced_settings_subtitle/index.ts → ...nents/advanced_settings_subtitle/index.ts
diff --git a/...gs_title/advanced_settings_title.test.tsx → ...gs_title/advanced_settings_title.test.tsx b/...gs_title/advanced_settings_title.test.tsx → ...gs_title/advanced_settings_title.test.tsx
@@ -6,7 +6,7 @@
 import React from 'react';
 import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
 import { AdvancedSettingsTitle } from './advanced_settings_title';
-import { SpaceAvatar } from '../../../../components';
+import { SpaceAvatar } from '../../../space_avatar';
 import { act } from '@testing-library/react';
 
 describe('AdvancedSettingsTitle', () => {

diff --git a/...ettings_title/advanced_settings_title.tsx → ...ettings_title/advanced_settings_title.tsx b/...ettings_title/advanced_settings_title.tsx → ...ettings_title/advanced_settings_title.tsx
@@ -7,8 +7,8 @@
 import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { useState, useEffect } from 'react';
-import { Space } from '../../../../../common/model/space';
-import { SpaceAvatar } from '../../../../components';
+import { Space } from '../../../../../../../plugins/spaces/common/model/space';
+import { SpaceAvatar } from '../../../space_avatar';
 
 interface Props {
   getActiveSpace: () => Promise<Space>;

diff --git a/...mponents/advanced_settings_title/index.ts → ...mponents/advanced_settings_title/index.ts b/...mponents/advanced_settings_title/index.ts → ...mponents/advanced_settings_title/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/components/index.ts b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { AdvancedSettingsSubtitle } from './advanced_settings_subtitle';
+export { AdvancedSettingsTitle } from './advanced_settings_title';
diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/index.ts b/x-pack/legacy/plugins/spaces/public/advanced_settings/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { AdvancedSettingsService } from './advanced_settings_service';
diff --git a/...cy/plugins/spaces/public/lib/constants.ts → ...legacy/plugins/spaces/public/constants.ts b/...cy/plugins/spaces/public/lib/constants.ts → ...legacy/plugins/spaces/public/constants.ts
diff --git a/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/_index.scss b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/_index.scss
@@ -0,0 +1 @@
+@import './components/index';
diff --git a/...s/copy_saved_objects_to_space/_index.scss → ...s_to_space/components/_copy_to_space.scss b/...s/copy_saved_objects_to_space/_index.scss → ...s_to_space/components/_copy_to_space.scss
diff --git a/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/_index.scss b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/_index.scss
@@ -0,0 +1 @@
+@import './copy_to_space';
diff --git a/...bjects_to_space/copy_status_indicator.tsx → ...pace/components/copy_status_indicator.tsx b/...bjects_to_space/copy_status_indicator.tsx → ...pace/components/copy_status_indicator.tsx
@@ -7,10 +7,7 @@
 import React from 'react';
 import { EuiLoadingSpinner, EuiText, EuiIconTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import {
-  SummarizedCopyToSpaceResult,
-  SummarizedSavedObjectResult,
-} from '../../../../lib/copy_saved_objects_to_space';
+import { SummarizedCopyToSpaceResult, SummarizedSavedObjectResult } from '..';
 
 interface Props {
   summarizedCopyResult: SummarizedCopyToSpaceResult;

diff --git a/...o_space/copy_status_summary_indicator.tsx → ...ponents/copy_status_summary_indicator.tsx b/...o_space/copy_status_summary_indicator.tsx → ...ponents/copy_status_summary_indicator.tsx
@@ -7,8 +7,8 @@
 import React from 'react';
 import { EuiLoadingSpinner, EuiIconTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { Space } from '../../../../../common/model/space';
-import { SummarizedCopyToSpaceResult } from '../../../../lib/copy_saved_objects_to_space';
+import { Space } from '../../../common/model/space';
+import { SummarizedCopyToSpaceResult } from '..';
 
 interface Props {
   space: Space;

diff --git a/...ts_to_space/copy_to_space_flyout.test.tsx → .../components/copy_to_space_flyout.test.tsx b/...ts_to_space/copy_to_space_flyout.test.tsx → .../components/copy_to_space_flyout.test.tsx
@@ -6,20 +6,20 @@
 import React from 'react';
 import Boom from 'boom';
 import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
-import { mockManagementPlugin } from '../../../../../../../../../src/legacy/core_plugins/management/public/np_ready/mocks';
+import { mockManagementPlugin } from '../../../../../../../src/legacy/core_plugins/management/public/np_ready/mocks';
 import { CopySavedObjectsToSpaceFlyout } from './copy_to_space_flyout';
 import { CopyToSpaceForm } from './copy_to_space_form';
 import { EuiLoadingSpinner, EuiEmptyPrompt } from '@elastic/eui';
-import { Space } from '../../../../../common/model/space';
+import { Space } from '../../../common/model/space';
 import { findTestSubject } from 'test_utils/find_test_subject';
 import { SelectableSpacesControl } from './selectable_spaces_control';
 import { act } from '@testing-library/react';
 import { ProcessingCopyToSpace } from './processing_copy_to_space';
-import { spacesManagerMock } from '../../../../lib/mocks';
-import { SpacesManager } from '../../../../lib';
+import { spacesManagerMock } from '../../spaces_manager/mocks';
+import { SpacesManager } from '../../spaces_manager';
 import { ToastNotifications } from 'ui/notify/toasts/toast_notifications';
 
-jest.mock('../../../../../../../../../src/legacy/core_plugins/management/public/legacy', () => ({
+jest.mock('../../../../../../../src/legacy/core_plugins/management/public/legacy', () => ({
   setup: mockManagementPlugin.createSetupContract(),
   start: mockManagementPlugin.createStartContract(),
 }));
@@ -404,6 +404,7 @@ describe('CopyToSpaceFlyout', () => {
             id: 'my-viz',
             error: {
               type: 'missing_references',
+              blocking: [],
               references: [{ type: 'index-pattern', id: 'missing-index-pattern' }],
             },
           },

diff --git a/...objects_to_space/copy_to_space_flyout.tsx → ...space/components/copy_to_space_flyout.tsx b/...objects_to_space/copy_to_space_flyout.tsx → ...space/components/copy_to_space_flyout.tsx
@@ -22,17 +22,17 @@ import { mapValues } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { ToastNotifications } from 'ui/notify/toasts/toast_notifications';
-import { SavedObjectsManagementRecord } from '../../../../../../../../../src/legacy/core_plugins/management/public';
+import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
 import {
   ProcessedImportResponse,
   processImportResponse,
-} from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { Space } from '../../../../../common/model/space';
-import { SpacesManager } from '../../../../lib';
+} from '../../../../../../../src/legacy/core_plugins/management/public';
+import { Space } from '../../../common/model/space';
+import { SpacesManager } from '../../spaces_manager';
 import { ProcessingCopyToSpace } from './processing_copy_to_space';
 import { CopyToSpaceFlyoutFooter } from './copy_to_space_flyout_footer';
 import { CopyToSpaceForm } from './copy_to_space_form';
-import { CopyOptions, ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { CopyOptions, ImportRetry } from '../types';
 
 interface Props {
   onClose: () => void;

diff --git a/..._to_space/copy_to_space_flyout_footer.tsx → ...omponents/copy_to_space_flyout_footer.tsx b/..._to_space/copy_to_space_flyout_footer.tsx → ...omponents/copy_to_space_flyout_footer.tsx
@@ -8,8 +8,8 @@ import React, { Fragment } from 'react';
 import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiStat, EuiHorizontalRule } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { ProcessedImportResponse } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { ProcessedImportResponse } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { ImportRetry } from '../types';
 
 interface Props {
   copyInProgress: boolean;

diff --git a/...d_objects_to_space/copy_to_space_form.tsx → ...o_space/components/copy_to_space_form.tsx b/...d_objects_to_space/copy_to_space_form.tsx → ...o_space/components/copy_to_space_form.tsx
@@ -14,8 +14,8 @@ import {
   EuiListGroupItem,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { CopyOptions } from '../../../../lib/copy_saved_objects_to_space/types';
-import { Space } from '../../../../../common/model/space';
+import { CopyOptions } from '../types';
+import { Space } from '../../../common/model/space';
 import { SelectableSpacesControl } from './selectable_spaces_control';
 
 interface Props {

diff --git a/...ents/copy_saved_objects_to_space/index.ts → ...aved_objects_to_space/components/index.ts b/...ents/copy_saved_objects_to_space/index.ts → ...aved_objects_to_space/components/index.ts
diff --git a/...cts_to_space/processing_copy_to_space.tsx → ...e/components/processing_copy_to_space.tsx b/...cts_to_space/processing_copy_to_space.tsx → ...e/components/processing_copy_to_space.tsx
@@ -13,12 +13,12 @@ import {
   EuiHorizontalRule,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { SavedObjectsManagementRecord } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { ProcessedImportResponse } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { summarizeCopyResult } from '../../../../lib/copy_saved_objects_to_space';
-import { Space } from '../../../../../common/model/space';
-import { CopyOptions, ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { ProcessedImportResponse } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { Space } from '../../../common/model/space';
+import { CopyOptions, ImportRetry } from '../types';
 import { SpaceResult } from './space_result';
+import { summarizeCopyResult } from '..';
 
 interface Props {
   savedObject: SavedObjectsManagementRecord;

diff --git a/...ts_to_space/selectable_spaces_control.tsx → .../components/selectable_spaces_control.tsx b/...ts_to_space/selectable_spaces_control.tsx → .../components/selectable_spaces_control.tsx
@@ -6,8 +6,8 @@
 
 import React, { Fragment, useState } from 'react';
 import { EuiSelectable, EuiLoadingSpinner } from '@elastic/eui';
-import { SpaceAvatar } from '../../../../components';
-import { Space } from '../../../../../common/model/space';
+import { SpaceAvatar } from '../../space_avatar';
+import { Space } from '../../../common/model/space';
 
 interface Props {
   spaces: Space[];

diff --git a/...y_saved_objects_to_space/space_result.tsx → ...ects_to_space/components/space_result.tsx b/...y_saved_objects_to_space/space_result.tsx → ...ects_to_space/components/space_result.tsx
@@ -6,13 +6,13 @@
 
 import React from 'react';
 import { EuiAccordion, EuiFlexGroup, EuiFlexItem, EuiText, EuiSpacer } from '@elastic/eui';
-import { SavedObjectsManagementRecord } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { SummarizedCopyToSpaceResult } from '../../../../lib/copy_saved_objects_to_space';
-import { SpaceAvatar } from '../../../../components';
-import { Space } from '../../../../../common/model/space';
+import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { SummarizedCopyToSpaceResult } from '../index';
+import { SpaceAvatar } from '../../space_avatar';
+import { Space } from '../../../common/model/space';
 import { CopyStatusSummaryIndicator } from './copy_status_summary_indicator';
 import { SpaceCopyResultDetails } from './space_result_details';
-import { ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { ImportRetry } from '../types';
 
 interface Props {
   savedObject: SavedObjectsManagementRecord;

diff --git a/...objects_to_space/space_result_details.tsx → ...space/components/space_result_details.tsx b/...objects_to_space/space_result_details.tsx → ...space/components/space_result_details.tsx
@@ -5,13 +5,13 @@
  */
 
 import React from 'react';
-import { SummarizedCopyToSpaceResult } from 'plugins/spaces/lib/copy_saved_objects_to_space';
 import { EuiText, EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { SavedObjectsManagementRecord } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { Space } from '../../../../../common/model/space';
+import { SummarizedCopyToSpaceResult } from '../index';
+import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { Space } from '../../../common/model/space';
 import { CopyStatusIndicator } from './copy_status_indicator';
-import { ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { ImportRetry } from '../types';
 
 interface Props {
   savedObject: SavedObjectsManagementRecord;

diff --git a/...ce/copy_saved_objects_to_space_action.tsx → ...ce/copy_saved_objects_to_space_action.tsx b/...ce/copy_saved_objects_to_space_action.tsx → ...ce/copy_saved_objects_to_space_action.tsx
@@ -9,8 +9,8 @@ import { toastNotifications } from 'ui/notify';
 import {
   SavedObjectsManagementAction,
   SavedObjectsManagementRecord,
-} from '../../../../../../../src/legacy/core_plugins/management/public';
-import { CopySavedObjectsToSpaceFlyout } from '../../views/management/components/copy_saved_objects_to_space';
+} from '../../../../../../src/legacy/core_plugins/management/public';
+import { CopySavedObjectsToSpaceFlyout } from './components';
 import { SpacesManager } from '../spaces_manager';
 
 export class CopyToSpaceSavedObjectsManagementAction extends SavedObjectsManagementAction {