diff --git a/x-pack/plugins/code/public/components/admin_page/project_tab.tsx b/x-pack/plugins/code/public/components/admin_page/project_tab.tsx index b8d4e89e6975b..1501f70ab1340 100644 --- a/x-pack/plugins/code/public/components/admin_page/project_tab.tsx +++ b/x-pack/plugins/code/public/components/admin_page/project_tab.tsx @@ -7,6 +7,7 @@ // @ts-ignore import { EuiButton, + EuiCallOut, EuiFieldText, EuiFlexGroup, EuiFlexItem, @@ -18,8 +19,8 @@ import { EuiModalHeader, EuiModalHeaderTitle, EuiOverlayMask, - EuiSpacer, // @ts-ignore + EuiSpacer, EuiSuperSelect, EuiText, EuiTitle, @@ -30,6 +31,7 @@ import styled from 'styled-components'; import { Repository } from '../../../model'; import { importRepo } from '../../actions'; import { RootState } from '../../reducers'; +import { CallOutType } from '../../reducers/repository'; import { ProjectItem } from './project_item'; import { ProjectSettings } from './project_settings'; @@ -69,6 +71,9 @@ interface Props { isAdmin: boolean; importRepo: (repoUrl: string) => void; importLoading: boolean; + callOutMessage?: string; + showCallOut: boolean; + callOutType: CallOutType; } interface State { showImportProjectModal: boolean; @@ -95,7 +100,7 @@ class CodeProjectTab extends React.PureComponent { } public closeModal = () => { - this.setState({ showImportProjectModal: false }); + this.setState({ showImportProjectModal: false, repoURL: '' }); }; public openModal = () => { @@ -161,7 +166,7 @@ class CodeProjectTab extends React.PureComponent { }; public render() { - const { projects, isAdmin, status } = this.props; + const { projects, isAdmin, status, callOutMessage, showCallOut, callOutType } = this.props; const projectsCount = projects.length; const modal = this.state.showImportProjectModal && this.renderImportModal(); @@ -190,6 +195,11 @@ class CodeProjectTab extends React.PureComponent { return (
+ {showCallOut && ( + + {callOutMessage} + + )} @@ -231,6 +241,9 @@ const mapStateToProps = (state: RootState) => ({ status: state.status.status, isAdmin: state.userProfile.isCodeAdmin, importLoading: state.repository.importLoading, + callOutMessage: state.repository.callOutMessage, + callOutType: state.repository.callOutType, + showCallOut: state.repository.showCallOut, }); const mapDispatchToProps = { diff --git a/x-pack/plugins/code/public/components/route.ts b/x-pack/plugins/code/public/components/route.ts index 275f8cee4ac80..d7e022234b4f0 100644 --- a/x-pack/plugins/code/public/components/route.ts +++ b/x-pack/plugins/code/public/components/route.ts @@ -5,7 +5,7 @@ */ import { connect } from 'react-redux'; -import { Route as ReactRoute, RouteProps } from 'react-router'; +import { Route as ReactRoute, RouteProps } from 'react-router-dom'; import { Match, routeChange } from '../actions'; interface Props extends RouteProps {