[WebUI] Fix bug (#591)

* fix bug

* fix bug of background

* update

* update

* add frameworkcontroller platform

src/webui/src/App.css

@@ -2,6 +2,7 @@
   font-family: 'Segoe';
   color: #212121;
   font-size: 14px;
+  background: #f2f2f2;
 }
 
 .header{
@@ -19,7 +20,6 @@
 }
 .contentBox{
   width: 100%;
-  background: #f2f2f2;
 }
 .content{
   width: 86%;

src/webui/src/components/logPath/PaiTrialChild.tsx

 import * as React from 'react';
-import { Row, Button } from 'antd';
+import { Row } from 'antd';
 import { DOWNLOAD_IP } from '../../static/const';
 
 interface PaiTrialChildProps {
@@ -17,7 +17,7 @@ class PaiTrialChild extends React.Component<PaiTrialChildProps, {}> {
     }
 
     render() {
-        const { logString, id, showLogModal, isdisLogbtn } = this.props;
+        const { logString, id } = this.props;
         return (
             <div>
                 {
@@ -35,16 +35,6 @@ class PaiTrialChild extends React.Component<PaiTrialChildProps, {}> {
                                     trial stdout
                                 </a>
                             </Row>
-                            <Row>
-                                <Button
-                                    disabled={isdisLogbtn}
-                                    type="primary"
-                                    className="tableButton"
-                                    onClick={showLogModal.bind(this, id)}
-                                >
-                                    View
-                                </Button>
-                            </Row>
                         </Row>
                 }
             </div>

src/webui/src/components/logPath/PaiTrialLog.tsx

 import * as React from 'react';
-import { Row, Button } from 'antd';
+import { Row } from 'antd';
 import { DOWNLOAD_IP } from '../../static/const';
 import PaiTrialChild from './PaiTrialChild';
 
@@ -44,16 +44,6 @@ class PaitrialLog extends React.Component<PaitrialLogProps, {}> {
                                     </a>
                                     <a target="_blank" href={logStr.split(',')[1]}>hdfsLog</a>
                                 </Row>
-                                <Row>
-                                    <Button
-                                        disabled={isdisLogbutton}
-                                        type="primary"
-                                        className="tableButton"
-                                        onClick={showLogModal.bind(this, id)}
-                                    >
-                                        View
-                                    </Button>
-                                </Row>
                             </Row>
                             :
                             <PaiTrialChild

src/webui/src/components/overview/SuccessTable.tsx

@@ -201,7 +201,8 @@ class SuccessTable extends React.Component<SuccessTableProps, SuccessTableState>
                             </TabPane>
                             <TabPane tab="Log" key="2">
                                 {
-                                    trainingPlatform === 'pai' || trainingPlatform === 'kubeflow'
+                                    trainingPlatform === 'frameworkcontroller' || trainingPlatform === 'kubeflow' || 
+                                    trainingPlatform === 'pai'
                                         ?
                                         <PaiTrialLog
                                             logStr={logPathRow}

src/webui/src/components/trial-detail/TableList.tsx

@@ -241,10 +241,10 @@ class TableList extends React.Component<TableListProps, TableListState> {
         const wantResult: Array<string> = [];
         Object.keys(checkedValues).map(m => {
             switch (checkedValues[m]) {
-                case 'Trial No':
-                case 'id':
-                case 'duration':
-                case 'status':
+                case 'Trial No.':
+                case 'Id':
+                case 'Duration':
+                case 'Status':
                 case 'Operation':
                 case 'Default':
                 case 'Intermediate Result':
@@ -327,7 +327,7 @@ class TableList extends React.Component<TableListProps, TableListState> {
         Object.keys(columnSelected).map(key => {
             const item = columnSelected[key];
             switch (item) {
-                case 'Trial No':
+                case 'Trial No.':
                     showColumn.push({
                         title: 'Trial No.',
                         dataIndex: 'sequenceId',
@@ -339,7 +339,7 @@ class TableList extends React.Component<TableListProps, TableListState> {
                                 (a.sequenceId as number) - (b.sequenceId as number)
                     });
                     break;
-                case 'id':
+                case 'Id':
                     showColumn.push({
                         title: 'Id',
                         dataIndex: 'id',
@@ -355,7 +355,7 @@ class TableList extends React.Component<TableListProps, TableListState> {
                         }
                     });
                     break;
-                case 'duration':
+                case 'Duration':
                     showColumn.push({
                         title: 'Duration',
                         dataIndex: 'duration',
@@ -376,7 +376,7 @@ class TableList extends React.Component<TableListProps, TableListState> {
                         },
                     });
                     break;
-                case 'status':
+                case 'Status':
                     showColumn.push({
                         title: 'Status',
                         dataIndex: 'status',
@@ -559,7 +559,7 @@ class TableList extends React.Component<TableListProps, TableListState> {
                             </TabPane>
                             <TabPane tab="Log" key="2">
                                 {
-                                    platform === 'pai' || platform === 'kubeflow'
+                                    platform === 'pai' || platform === 'kubeflow' || platform === 'frameworkcontroller'
                                         ?
                                         <PaiTrialLog
                                             logStr={logPathRow}

src/webui/src/static/const.ts

@@ -21,19 +21,19 @@ const MONACO = {
 };
 const COLUMN_INDEX = [
     {
-        name: 'Trial No',
+        name: 'Trial No.',
         index: 1
     },
     {
-        name: 'id',
+        name: 'Id',
         index: 2
     },
     {
-        name: 'duration',
+        name: 'Duration',
         index: 3
     },
     {
-        name: 'status',
+        name: 'Status',
         index: 4
     },
     {
@@ -49,7 +49,7 @@ const COLUMN_INDEX = [
         index: 10001
     }
 ];
-const COLUMN = ['Trial No', 'id', 'duration', 'status', 'Default', 'Operation', 'Intermediate Result'];
+const COLUMN = ['Trial No.', 'Id', 'Duration', 'Status', 'Default', 'Operation', 'Intermediate Result'];
 export {
     MANAGER_IP, DOWNLOAD_IP, trialJobStatus,
     CONTROLTYPE, MONACO, COLUMN, COLUMN_INDEX