Unverified Commit 99fc68e6 authored by Lijiaoa's avatar Lijiaoa Committed by GitHub
Browse files

Bug bash (#4930)

parent 7afe8a71
...@@ -6,6 +6,7 @@ import { EXPERIMENT, TRIALS } from '@static/datamodel'; ...@@ -6,6 +6,7 @@ import { EXPERIMENT, TRIALS } from '@static/datamodel';
import { TooltipForAccuracy, EventMap } from '@static/interface'; import { TooltipForAccuracy, EventMap } from '@static/interface';
import { reformatRetiariiParameter } from '@static/function'; import { reformatRetiariiParameter } from '@static/function';
import { gap15 } from '@components/fluent/ChildrenGap'; import { gap15 } from '@components/fluent/ChildrenGap';
import { optimizeModeValue } from './optimizeMode';
import 'echarts/lib/chart/scatter'; import 'echarts/lib/chart/scatter';
import 'echarts/lib/component/tooltip'; import 'echarts/lib/component/tooltip';
import 'echarts/lib/component/title'; import 'echarts/lib/component/title';
...@@ -45,7 +46,7 @@ class DefaultPoint extends React.Component<DefaultPointProps, DefaultPointState> ...@@ -45,7 +46,7 @@ class DefaultPoint extends React.Component<DefaultPointProps, DefaultPointState>
bestCurveEnabled: false, bestCurveEnabled: false,
startY: 0, // dataZoomY startY: 0, // dataZoomY
endY: 100, endY: 100,
userSelectOptimizeMode: EXPERIMENT.optimizeMode || 'maximize' userSelectOptimizeMode: optimizeModeValue(EXPERIMENT.optimizeMode)
}; };
} }
......
...@@ -7,6 +7,7 @@ import { filterByStatus } from '@static/function'; ...@@ -7,6 +7,7 @@ import { filterByStatus } from '@static/function';
import { EXPERIMENT, TRIALS } from '@static/datamodel'; import { EXPERIMENT, TRIALS } from '@static/datamodel';
import { TableObj, SingleAxis, MultipleAxes } from '@static/interface'; import { TableObj, SingleAxis, MultipleAxes } from '@static/interface';
import ChangeColumnComponent from '../ChangeColumnComponent'; import ChangeColumnComponent from '../ChangeColumnComponent';
import { optimizeModeValue } from './optimizeMode';
import 'parcoord-es/dist/parcoords.css'; import 'parcoord-es/dist/parcoords.css';
import '@style/button.scss'; import '@style/button.scss';
...@@ -50,7 +51,7 @@ class Para extends React.Component<ParaProps, ParaState> { ...@@ -50,7 +51,7 @@ class Para extends React.Component<ParaProps, ParaState> {
dimName: [], dimName: [],
primaryMetricKey: 'default', primaryMetricKey: 'default',
selectedPercent: '1', selectedPercent: '1',
userSelectOptimizeMode: EXPERIMENT.optimizeMode || 'maximize', userSelectOptimizeMode: optimizeModeValue(EXPERIMENT.optimizeMode),
noChart: true, noChart: true,
customizeColumnsDialogVisible: false, customizeColumnsDialogVisible: false,
availableDimensions: [], availableDimensions: [],
......
function optimizeModeValue(optimizeMode: string) {
// 'unknown' value is from experiment.ts file optimizeMode function
return optimizeMode === 'unknown' ? 'maximize' : optimizeMode;
}
export { optimizeModeValue };
...@@ -6,7 +6,8 @@ import { ...@@ -6,7 +6,8 @@ import {
IContextualMenuProps, IContextualMenuProps,
IContextualMenuItem, IContextualMenuItem,
DirectionalHint, DirectionalHint,
SearchBox SearchBox,
PrimaryButton
} from '@fluentui/react'; } from '@fluentui/react';
import { EXPERIMENT } from '@static/datamodel'; import { EXPERIMENT } from '@static/datamodel';
import { SearchItems } from '@static/interface'; import { SearchItems } from '@static/interface';
...@@ -281,7 +282,6 @@ function Search(props): any { ...@@ -281,7 +282,6 @@ function Search(props): any {
} }
} }
console.info(newSearchFilter); // eslint-disable-line
changeTableListPage(newSearchFilter); changeTableListPage(newSearchFilter);
} }
...@@ -296,7 +296,7 @@ function Search(props): any { ...@@ -296,7 +296,7 @@ function Search(props): any {
<DefaultButton text='Filter' menuProps={searchMenuProps} /> <DefaultButton text='Filter' menuProps={searchMenuProps} />
{/* search input: store filter conditons, also, user could input filter conditions, could search */} {/* search input: store filter conditons, also, user could input filter conditions, could search */}
<SearchBox <SearchBox
styles={{ root: { width: 530 } }} styles={{ root: { width: 400 } }}
placeholder='Search' placeholder='Search'
onChange={updateSearchText} onChange={updateSearchText}
value={searchInputVal} value={searchInputVal}
...@@ -304,6 +304,7 @@ function Search(props): any { ...@@ -304,6 +304,7 @@ function Search(props): any {
onEscape={clearFliter} onEscape={clearFliter}
onClear={clearFliter} onClear={clearFliter}
/> />
<PrimaryButton text='Search' onClick={startFilter} />
</Stack> </Stack>
</div> </div>
); );
......
...@@ -3585,9 +3585,9 @@ caniuse-api@^3.0.0: ...@@ -3585,9 +3585,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0" lodash.uniq "^4.5.0"
   
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001286: caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001286:
version "1.0.30001292" version "1.0.30001352"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001292.tgz#4a55f61c06abc9595965cfd77897dc7bc1cdc456" resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001352.tgz"
integrity sha512-jnT4Tq0Q4ma+6nncYQVe7d73kmDmE9C3OGTx3MvW7lBM/eY1S1DZTMBON7dqV481RhNiS5OxD7k9JQvmDOTirw== integrity sha512-GUgH8w6YergqPQDGWhJGt8GDRnY0L/iJVQcU3eJ46GYf52R8tk0Wxp0PymuFVZboJYXGiCqwozAYZNRjVj6IcA==
   
capture-exit@^2.0.0: capture-exit@^2.0.0:
version "2.0.0" version "2.0.0"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment