Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add experiment selector to NewRun #486

Merged
merged 8 commits into from
Dec 7, 2018
Merged

Add experiment selector to NewRun #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
76330fb
Adds an experiment selector to the new run page. Needs tests
rileyjbauer Dec 5, 2018
2da124d
Adds an experiment selector to the new run page. Needs tests
rileyjbauer Dec 5, 2018
55b6504
Adds tests for the new experiment selector in NewRun
rileyjbauer Dec 6, 2018
e1e1a0e
Rename PipelineSelector -> ResourceSelector since it handles experime…
rileyjbauer Dec 6, 2018
0d0a6bf
Makes ResourceSelector more abstract. No longer coupled to experiment…
rileyjbauer Dec 6, 2018
86a8d90
PR comments, NewRun clean-up
rileyjbauer Dec 6, 2018
ff17bf3
Moves resourceToRow function into ResourceSelector
rileyjbauer Dec 7, 2018
5cea0cd
Fix e2e test
rileyjbauer Dec 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/TestUtils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default class TestUtils {
* Adds a one-time mock implementation to the provided spy that mimics an error
* network response
*/
public static makeErrorResponseOnce(spy: jest.SpyInstance, message: string): void {
public static makeErrorResponseOnce(spy: jest.MockInstance<{}>, message: string): void {
spy.mockImplementationOnce(() => {
throw {
text: () => Promise.resolve(message),
Expand Down
15 changes: 13 additions & 2 deletions frontend/src/components/Trigger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
pickersToDate, buildTrigger
} from '../lib/TriggerUtils';
import { ApiTrigger } from '../apis/job';
import { stylesheet } from 'typestyle';

interface TriggerProps {
onChange?: (trigger?: ApiTrigger, maxConcurrentRuns?: string) => void;
Expand All @@ -49,6 +50,12 @@ interface TriggerState {
type: TriggerType;
}

const css = stylesheet({
noMargin: {
margin: 0
},
});

export default class Trigger extends React.Component<TriggerProps, TriggerState> {
constructor(props: any) {
super(props);
Expand Down Expand Up @@ -108,10 +115,12 @@ export default class Trigger extends React.Component<TriggerProps, TriggerState>
label='Has start date' />
<Input label='Start date' type='date' onChange={this.handleChange('startDate')}
value={startDate} width={160}
InputLabelProps={{ classes: { outlined: css.noMargin }, shrink: true}}
style={{ visibility: hasStartDate ? 'visible' : 'hidden' }} />
<Separator />
<Input label='Start time' type='time' onChange={this.handleChange('startTime')}
value={startTime} width={120}
InputLabelProps={{ classes: { outlined: css.noMargin }, shrink: true}}
style={{ visibility: hasStartDate ? 'visible' : 'hidden' }} />
</div>

Expand All @@ -121,10 +130,12 @@ export default class Trigger extends React.Component<TriggerProps, TriggerState>
onClick={this.handleChange('hasEndDate')} />}
label='Has end date' />
<Input label='End date' type='date' onChange={this.handleChange('endDate')}
value={endDate} width={160} style={{ visibility: hasEndDate ? 'visible' : 'hidden' }} />
value={endDate} width={160} style={{ visibility: hasEndDate ? 'visible' : 'hidden' }}
InputLabelProps={{ classes: { outlined: css.noMargin }, shrink: true}} />
<Separator />
<Input label='End time' type='time' onChange={this.handleChange('endTime')}
value={endTime} width={120} style={{ visibility: hasEndDate ? 'visible' : 'hidden' }} />
value={endTime} width={120} style={{ visibility: hasEndDate ? 'visible' : 'hidden' }}
InputLabelProps={{ classes: { outlined: css.noMargin }, shrink: true}} />
</div>

<span className={commonCss.flex}>
Expand Down
160 changes: 160 additions & 0 deletions frontend/src/components/__snapshots__/Trigger.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@ exports[`Trigger enables a single day on click 1`] = `
label="Has start date"
/>
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="Start date"
onChange={[Function]}
style={
Expand All @@ -56,6 +64,14 @@ exports[`Trigger enables a single day on click 1`] = `
/>
<Component />
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="Start time"
onChange={[Function]}
style={
Expand All @@ -82,6 +98,14 @@ exports[`Trigger enables a single day on click 1`] = `
label="Has end date"
/>
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="End date"
onChange={[Function]}
style={
Expand All @@ -95,6 +119,14 @@ exports[`Trigger enables a single day on click 1`] = `
/>
<Component />
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="End time"
onChange={[Function]}
style={
Expand Down Expand Up @@ -314,6 +346,14 @@ exports[`Trigger renders all week days enabled 1`] = `
label="Has start date"
/>
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="Start date"
onChange={[Function]}
style={
Expand All @@ -327,6 +367,14 @@ exports[`Trigger renders all week days enabled 1`] = `
/>
<Component />
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="Start time"
onChange={[Function]}
style={
Expand All @@ -353,6 +401,14 @@ exports[`Trigger renders all week days enabled 1`] = `
label="Has end date"
/>
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="End date"
onChange={[Function]}
style={
Expand All @@ -366,6 +422,14 @@ exports[`Trigger renders all week days enabled 1`] = `
/>
<Component />
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="End time"
onChange={[Function]}
style={
Expand Down Expand Up @@ -585,6 +649,14 @@ exports[`Trigger renders periodic schedule controls for initial render 1`] = `
label="Has start date"
/>
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="Start date"
onChange={[Function]}
style={
Expand All @@ -598,6 +670,14 @@ exports[`Trigger renders periodic schedule controls for initial render 1`] = `
/>
<Component />
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="Start time"
onChange={[Function]}
style={
Expand All @@ -624,6 +704,14 @@ exports[`Trigger renders periodic schedule controls for initial render 1`] = `
label="Has end date"
/>
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="End date"
onChange={[Function]}
style={
Expand All @@ -637,6 +725,14 @@ exports[`Trigger renders periodic schedule controls for initial render 1`] = `
/>
<Component />
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="End time"
onChange={[Function]}
style={
Expand Down Expand Up @@ -755,6 +851,14 @@ exports[`Trigger renders periodic schedule controls if the trigger type is CRON
label="Has start date"
/>
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="Start date"
onChange={[Function]}
style={
Expand All @@ -768,6 +872,14 @@ exports[`Trigger renders periodic schedule controls if the trigger type is CRON
/>
<Component />
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="Start time"
onChange={[Function]}
style={
Expand All @@ -794,6 +906,14 @@ exports[`Trigger renders periodic schedule controls if the trigger type is CRON
label="Has end date"
/>
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="End date"
onChange={[Function]}
style={
Expand All @@ -807,6 +927,14 @@ exports[`Trigger renders periodic schedule controls if the trigger type is CRON
/>
<Component />
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="End time"
onChange={[Function]}
style={
Expand Down Expand Up @@ -947,6 +1075,14 @@ exports[`Trigger renders week days if the trigger type is CRON and interval is w
label="Has start date"
/>
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="Start date"
onChange={[Function]}
style={
Expand All @@ -960,6 +1096,14 @@ exports[`Trigger renders week days if the trigger type is CRON and interval is w
/>
<Component />
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="Start time"
onChange={[Function]}
style={
Expand All @@ -986,6 +1130,14 @@ exports[`Trigger renders week days if the trigger type is CRON and interval is w
label="Has end date"
/>
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="End date"
onChange={[Function]}
style={
Expand All @@ -999,6 +1151,14 @@ exports[`Trigger renders week days if the trigger type is CRON and interval is w
/>
<Component />
<Component
InputLabelProps={
Object {
"classes": Object {
"outlined": "noMargin",
},
"shrink": true,
}
}
label="End time"
onChange={[Function]}
style={
Expand Down
Loading