From 0956535b0886290189b7e05cbf8fdceda040c35b Mon Sep 17 00:00:00 2001
From: wangqianliang <wangqianliang@live.com>
Date: Sun, 24 Feb 2019 21:24:43 +0800
Subject: [PATCH 1/2] fix(code/frontend): show import project error message

---
 .../public/components/admin_page/project_tab.tsx  | 15 ++++++++++++---
 x-pack/plugins/code/public/components/route.ts    |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

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..8784ae65438e7 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<Props, State> {
   }
 
   public closeModal = () => {
-    this.setState({ showImportProjectModal: false });
+    this.setState({ showImportProjectModal: false, repoURL: '' });
   };
 
   public openModal = () => {
@@ -161,7 +166,7 @@ class CodeProjectTab extends React.PureComponent<Props, State> {
   };
 
   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,7 @@ class CodeProjectTab extends React.PureComponent<Props, State> {
 
     return (
       <div className="code-sidebar" data-test-subj="codeRepositoryList">
+        {showCallOut && <EuiCallOut color={callOutType} title="">{callOutMessage}</EuiCallOut>}
         <EuiSpacer />
         <EuiFlexGroup>
           <EuiFlexItem>
@@ -231,6 +237,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 {

From cbd5711b05beecf772e1bd8789cb7d0c43c3f450 Mon Sep 17 00:00:00 2001
From: wangqianliang <wangqianliang@live.com>
Date: Sun, 24 Feb 2019 21:25:41 +0800
Subject: [PATCH 2/2] fix(code/frontend): show import project error message

---
 .../code/public/components/admin_page/project_tab.tsx  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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 8784ae65438e7..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
@@ -195,7 +195,11 @@ class CodeProjectTab extends React.PureComponent<Props, State> {
 
     return (
       <div className="code-sidebar" data-test-subj="codeRepositoryList">
-        {showCallOut && <EuiCallOut color={callOutType} title="">{callOutMessage}</EuiCallOut>}
+        {showCallOut && (
+          <EuiCallOut color={callOutType} title="">
+            {callOutMessage}
+          </EuiCallOut>
+        )}
         <EuiSpacer />
         <EuiFlexGroup>
           <EuiFlexItem>
@@ -238,8 +242,8 @@ const mapStateToProps = (state: RootState) => ({
   isAdmin: state.userProfile.isCodeAdmin,
   importLoading: state.repository.importLoading,
   callOutMessage: state.repository.callOutMessage,
-  callOutType: state.repository.callOutType;
-  showCallOut: state.repository.showCallOut;
+  callOutType: state.repository.callOutType,
+  showCallOut: state.repository.showCallOut,
 });
 
 const mapDispatchToProps = {