refactor experiment summary file(to fix componentWillReceiveProps waring) and click other areas to close panel (#2734)

Lijiaoa · web-flow · commit 2488aa653ee3 · 2020-08-07T10:40:15.000+08:00
diff --git a/src/webui/src/components/Modals/ExperimentPanel.tsx b/src/webui/src/components/Modals/ExperimentPanel.tsx
@@ -1,17 +1,16 @@
 import * as React from 'react';
-import axios from 'axios';
 import { downFile } from '../../static/function';
 import {
     Stack, PrimaryButton, DefaultButton, Panel, StackItem, Pivot, PivotItem
 } from 'office-ui-fabric-react';
-import { MANAGER_IP, DRAWEROPTION } from '../../static/const';
+import { DRAWEROPTION } from '../../static/const';
+import { EXPERIMENT, TRIALS } from '../../static/datamodel';
 import MonacoEditor from 'react-monaco-editor';
 import '../../static/style/logDrawer.scss';
-import { TrialManager } from '../../static/model/trialmanager';
 
 interface ExpDrawerProps {
-    isVisble: boolean;
     closeExpDrawer: () => void;
+    experimentProfile: object;
 }
 
 interface ExpDrawerState {
@@ -21,7 +20,9 @@ interface ExpDrawerState {
 
 class ExperimentDrawer extends React.Component<ExpDrawerProps, ExpDrawerState> {
 
-    public _isCompareMount!: boolean;
+    public _isExperimentMount!: boolean;
+    private refreshId!: number | undefined;
+
     constructor(props: ExpDrawerProps) {
         super(props);
 
@@ -32,42 +33,40 @@ class ExperimentDrawer extends React.Component<ExpDrawerProps, ExpDrawerState> {
     }
 
     getExperimentContent = (): void => {
-        axios
-            .all([
-                axios.get(`${MANAGER_IP}/experiment`),
-                axios.get(`${MANAGER_IP}/trial-jobs`),
-                axios.get(`${MANAGER_IP}/metric-data`)
-            ])
-            .then(axios.spread((resExperiment, resTrialJobs, resMetricData) => {
-                if (resExperiment.status === 200 && resTrialJobs.status === 200 && resMetricData.status === 200) {
-                    if (resExperiment.data.params.searchSpace) {
-                        resExperiment.data.params.searchSpace = JSON.parse(resExperiment.data.params.searchSpace);
-                    }
-                    const trialMessagesArr = TrialManager.expandJobsToTrials(resTrialJobs.data);
-                    const interResultList = resMetricData.data;
-                    Object.keys(trialMessagesArr).map(item => {
-                        // not deal with trial's hyperParameters
-                        const trialId = trialMessagesArr[item].id;
-                        // add intermediate result message
-                        trialMessagesArr[item].intermediate = [];
-                        Object.keys(interResultList).map(key => {
-                            const interId = `${interResultList[key].trialJobId}-${interResultList[key].parameterId}`;
-                            if (trialId === interId) {
-                                trialMessagesArr[item].intermediate.push(interResultList[key]);
-                            }
-                        });
-                    });
-                    const result = {
-                        experimentParameters: resExperiment.data,
-                        trialMessage: trialMessagesArr
-                    };
-                    if (this._isCompareMount === true) {
-                        this.setState({ experiment: JSON.stringify(result, null, 4) });
-                    }
+        const experimentData = JSON.parse(JSON.stringify(this.props.experimentProfile));
+        if (experimentData.params.searchSpace) {
+            experimentData.params.searchSpace = JSON.parse(experimentData.params.searchSpace);
+        }
+        const trialMessagesArr = TRIALS.getTrialJobList();
+        const interResultList = TRIALS.getMetricsList();
+        Object.keys(trialMessagesArr).map(item => {
+            // not deal with trial's hyperParameters
+            const trialId = trialMessagesArr[item].jobId;
+            // add intermediate result message
+            trialMessagesArr[item].intermediate = [];
+            Object.keys(interResultList).map(key => {
+                const interId = interResultList[key].trialJobId;
+                if (trialId === interId) {
+                    trialMessagesArr[item].intermediate.push(interResultList[key]);
                 }
-            }));
-    }
+            });
+        });
+        const result = {
+            experimentParameters: experimentData,
+            trialMessage: trialMessagesArr
+        };
+        if (this._isExperimentMount === true) {
+            this.setState({ experiment: JSON.stringify(result, null, 4) });
+        }
 
+        if (['DONE', 'ERROR', 'STOPPED'].includes(EXPERIMENT.status)) {
+            if(this.refreshId !== null || this.refreshId !== undefined){
+                window.clearInterval(this.refreshId);
+            }
+        } 
+        
+    }
+    
     downExperimentParameters = (): void => {
         const { experiment } = this.state;
         downFile(experiment, 'experiment.json');
@@ -78,31 +77,28 @@ class ExperimentDrawer extends React.Component<ExpDrawerProps, ExpDrawerState> {
     }
 
     componentDidMount(): void {
-        this._isCompareMount = true;
+        this._isExperimentMount = true;
         this.getExperimentContent();
+        this.refreshId = window.setInterval(this.getExperimentContent, 10000);
         window.addEventListener('resize', this.onWindowResize);
     }
 
-    componentWillReceiveProps(nextProps: ExpDrawerProps): void {
-        const { isVisble } = nextProps;
-        if (isVisble === true) {
-            this.getExperimentContent();
-        }
-    }
-
     componentWillUnmount(): void {
-        this._isCompareMount = false;
+        this._isExperimentMount = false;
+        window.clearTimeout(this.refreshId);
         window.removeEventListener('resize', this.onWindowResize);
     }
 
     render(): React.ReactNode {
-        const { isVisble, closeExpDrawer } = this.props;
+        const { closeExpDrawer } = this.props;
         const { experiment, expDrawerHeight } = this.state;
         return (
             <Stack className="logDrawer">
                 <Panel
-                    isOpen={isVisble}
+                    isOpen={true}
                     hasCloseButton={false}
+                    isLightDismiss={true}
+                    onLightDismissClick={closeExpDrawer}
                     styles={{ root: { height: expDrawerHeight, paddingTop: 15 } }}
                 >
                     <Pivot style={{ minHeight: 190 }} className="log-tab-body">
diff --git a/src/webui/src/components/Modals/LogPanel.tsx b/src/webui/src/components/Modals/LogPanel.tsx
@@ -92,6 +92,8 @@ class LogDrawer extends React.Component<LogDrawerProps, LogDrawerState> {
                     isOpen={true}
                     hasCloseButton={false}
                     isFooterAtBottom={true}
+                    isLightDismiss={true}
+                    onLightDismissClick={closeDrawer}
                 >
                     <div className="log-tab-body">
                         <Pivot
diff --git a/src/webui/src/components/NavCon.tsx b/src/webui/src/components/NavCon.tsx
@@ -5,13 +5,14 @@ import {
     Stack, initializeIcons, StackItem, CommandBarButton,
     IContextualMenuProps, IStackTokens, IStackStyles
 } from 'office-ui-fabric-react';
-import LogDrawer from './Modals/LogDrawer';
-import ExperimentDrawer from './Modals/ExperimentDrawer';
+import LogPanel from './Modals/LogPanel';
+import ExperimentPanel from './Modals/ExperimentPanel';
 import {
     downLoadIcon, infoIconAbout,
     timeIcon, disableUpdates, requency, closeTimer
 } from './Buttons/Icon';
 import { OVERVIEWTABS, DETAILTABS, NNILOGO } from './stateless-component/NNItabs';
+import { EXPERIMENT } from '../static/datamodel';
 import '../static/style/nav/nav.scss';
 import '../static/style/icon.scss';
 
@@ -97,9 +98,9 @@ class NavCon extends React.Component<NavProps, NavState> {
     openDocs = (): void => {
         window.open(WEBUIDOC);
     }
-    
+
     openGithubNNI = (): void => {
-        const {version} = this.state;
+        const { version } = this.state;
         const nniLink = `https://github.com/Microsoft/nni/tree/${version}`;
         window.open(nniLink);
     }
@@ -178,8 +179,8 @@ class NavCon extends React.Component<NavProps, NavState> {
                     </Stack>
                 </StackItem>
                 {/* the drawer for dispatcher & nnimanager log message */}
-                {isvisibleLogDrawer && <LogDrawer closeDrawer={this.closeLogDrawer} />}
-                <ExperimentDrawer isVisble={isvisibleExperimentDrawer} closeExpDrawer={this.closeExpDrawer} />
+                {isvisibleLogDrawer && <LogPanel closeDrawer={this.closeLogDrawer} />}
+                {isvisibleExperimentDrawer && <ExperimentPanel closeExpDrawer={this.closeExpDrawer} experimentProfile={EXPERIMENT.profile} />}
             </Stack>
         );
     }
diff --git a/src/webui/src/components/overview/Progress.tsx b/src/webui/src/components/overview/Progress.tsx
@@ -9,7 +9,7 @@ import { EXPERIMENT, TRIALS } from '../../static/datamodel';
 import { convertTime } from '../../static/function';
 import ConcurrencyInput from './NumInput';
 import ProgressBar from './ProgressItem';
-import LogDrawer from '../Modals/LogDrawer';
+import LogDrawer from '../Modals/LogPanel';
 import MessageInfo from '../Modals/MessageInfo';
 import { infoIcon } from "../Buttons/Icon";
 import '../../static/style/progress.scss';
diff --git a/src/webui/src/static/model/trialmanager.ts b/src/webui/src/static/model/trialmanager.ts
@@ -48,6 +48,16 @@ class TrialManager {
     private latestMetricdataErrorMessage: string = ''; // metric-data-latest error message
     private isMetricdataRangeError: boolean = false; // metric-data-range api error filed
     private metricdataRangeErrorMessage: string = ''; // metric-data-latest error message
+    private metricsList: Array<MetricDataRecord> = [];
+    private trialJobList: Array<TrialJobInfo> = [];
+
+    public getMetricsList(): Array<MetricDataRecord> {
+        return this.metricsList;
+    }
+
+    public getTrialJobList(): Array<TrialJobInfo> {
+        return this.trialJobList;
+    }
 
     public async init(): Promise<void> {
         while (!this.infoInitialized || !this.metricInitialized) {
@@ -230,6 +240,7 @@ class TrialManager {
         requestAxios(`${MANAGER_IP}/trial-jobs`)
             .then(data => {
                 const newTrials = TrialManager.expandJobsToTrials(data as any);
+                this.trialJobList = newTrials;
                 for (const trialInfo of newTrials as TrialJobInfo[]) {
                     if (this.trials.has(trialInfo.id)) {
                         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -265,7 +276,10 @@ class TrialManager {
 
     private async updateAllMetrics(): Promise<boolean> {
         return requestAxios(`${MANAGER_IP}/metric-data`)
-            .then(data => this.doUpdateMetrics(data as any, false))
+            .then(data => {
+                this.metricsList = data;
+                return this.doUpdateMetrics(data as any, false);
+            })
             .catch(error => {
                 this.isMetricdataError = true;
                 this.MetricdataErrorMessage = `${error.message}`;

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,8 @@ class LogDrawer extends React.Component<LogDrawerProps, LogDrawerState> {`
`92`	`92`	`isOpen={true}`
`93`	`93`	`hasCloseButton={false}`
`94`	`94`	`isFooterAtBottom={true}`
	`95`	`+ isLightDismiss={true}`
	`96`	`+ onLightDismissClick={closeDrawer}`
`95`	`97`	`>`
`96`	`98`	`<div className="log-tab-body">`
`97`	`99`	`<Pivot`