Changes

x-pack/legacy/plugins/security/index.d.ts

@@ -5,7 +5,7 @@
  */
 
 import { Legacy } from 'kibana';
-import { AuthenticatedUser } from './common/model';
+import { AuthenticatedUser } from '../../../plugins/security/public';
 
 /**
  * Public interface of the security plugin.

x-pack/legacy/plugins/security/index.js

@@ -75,7 +75,6 @@ export const security = kibana =>
  'plugins/security/hacks/on_unauthorized_response',
  'plugins/security/hacks/register_account_management_app',
  ],
- home: ['plugins/security/register_feature'],
  injectDefaultVars: server => {
  const securityPlugin = server.newPlatform.setup.plugins.security;
  if (!securityPlugin) {

x-pack/legacy/plugins/security/public/index.scss

@@ -15,3 +15,6 @@ $secFormWidth: 460px;
 // Public views
 @import './views/index';
 
+// Styles of Kibana Platform plugin
+@import '../../../../plugins/security/public/index';
+

x-pack/legacy/plugins/security/public/views/_index.scss

@@ -1,5 +1,2 @@
 // Login styles
 @import './login/index';
-
-// Management styles
-@import './management/index';

x-pack/legacy/plugins/security/public/views/account/account.js

@@ -4,17 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import routes from 'ui/routes';
-import template from './account.html';
-import { i18n } from '@kbn/i18n';
-import { I18nContext } from 'ui/i18n';
-import { npSetup } from 'ui/new_platform';
-import { AccountManagementPage } from './components';
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
+import { i18n } from '@kbn/i18n';
+import { npStart } from 'ui/new_platform';
+import routes from 'ui/routes';
 
 routes.when('/account', {
- template,
+ template: '<div id="userProfileReactRoot" />',
  k7Breadcrumbs: () => [
  {
  text: i18n.translate('xpack.security.account.breadcrumb', {
@@ -24,19 +21,15 @@ routes.when('/account', {
  ],
  controllerAs: 'accountController',
  controller($scope) {
- $scope.$on('$destroy', () => {
- const elem = document.getElementById('userProfileReactRoot');
- if (elem) {
- unmountComponentAtNode(elem);
- }
- });
  $scope.$$postDigest(() => {
+ const domNode = document.getElementById('userProfileReactRoot');
+
  render(
- <I18nContext>
- <AccountManagementPage securitySetup={npSetup.plugins.security} />
- </I18nContext>,
- document.getElementById('userProfileReactRoot')
+ <npStart.plugins.security.__legacyCompat.account_management.AccountManagementPage />,
+ domNode
  );
+
+ $scope.$on('$destroy', () => unmountComponentAtNode(domNode));
  });
  },
 });

x-pack/legacy/plugins/security/public/views/login/components/basic_login_form/basic_login_form.test.tsx

@@ -7,7 +7,7 @@
 import { EuiButton, EuiCallOut } from '@elastic/eui';
 import React from 'react';
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { LoginState } from '../../../../../common/login_state';
+import { LoginState } from '../../login_state';
 import { BasicLoginForm } from './basic_login_form';
 
 const createMockHttp = ({ simulateError = false } = {}) => {

x-pack/legacy/plugins/security/public/views/login/components/basic_login_form/basic_login_form.tsx

@@ -9,7 +9,7 @@ import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React, { ChangeEvent, Component, FormEvent, Fragment, MouseEvent } from 'react';
 import ReactMarkdown from 'react-markdown';
 import { EuiText } from '@elastic/eui';
-import { LoginState } from '../../../../../common/login_state';
+import { LoginState } from '../../login_state';
 
 interface Props {
  http: any;

x-pack/legacy/plugins/security/public/views/login/components/login_page/login_page.test.tsx

@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
-import { LoginLayout, LoginState } from '../../../../../common/login_state';
+import { LoginLayout, LoginState } from '../../login_state';
 import { LoginPage } from './login_page';
 
 const createMockHttp = ({ simulateError = false } = {}) => {

x-pack/legacy/plugins/security/public/views/login/components/login_page/login_page.tsx

@@ -19,7 +19,7 @@ import {
  EuiTitle,
 } from '@elastic/eui';
 import classNames from 'classnames';
-import { LoginState } from '../../../../../common/login_state';
+import { LoginState } from '../../login_state';
 import { BasicLoginForm } from '../basic_login_form';
 import { DisabledLoginForm } from '../disabled_login_form';
 

x-pack/legacy/plugins/security/public/views/login/login.tsx

@@ -6,16 +6,14 @@
 
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
-import { parseNext } from 'plugins/security/lib/parse_next';
 import { LoginPage } from 'plugins/security/views/login/components';
-// @ts-ignore
-import template from 'plugins/security/views/login/login.html';
 import React from 'react';
 import { render } from 'react-dom';
 import chrome from 'ui/chrome';
 import { I18nContext } from 'ui/i18n';
 import { parse } from 'url';
-import { LoginState } from '../../../common/login_state';
+import { parseNext } from './parse_next';
+import { LoginState } from './login_state';
 const messageMap = {
  SESSION_EXPIRED: i18n.translate('xpack.security.login.sessionExpiredDescription', {
  defaultMessage: 'Your session has timed out. Please log in again.',
@@ -31,7 +29,7 @@ interface AnyObject {
 
 (chrome as AnyObject)
  .setVisible(false)
- .setRootTemplate(template)
+ .setRootTemplate('<div id="reactLoginRoot" />')
  .setRootController(
  'login',
  (