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

Jump to bottom

Cpu/wall time selection and simple form optimizations #170

Merged
merged 7 commits into from
Jan 24, 2018
Merged

Cpu/wall time selection and simple form optimizations #170

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0a74f94
WiP: Modifying simple limits form to set both cpu time and wall time.
Jan 18, 2018
aabcaba
Merge branch 'master' of https://github.com/ReCodEx/web-app into cpu-…
Jan 20, 2018
1c3d14f
Exercise simple edit page performance optimizations.
Jan 22, 2018
25ca07f
Merge branch 'master' of https://github.com/ReCodEx/web-app into cpu-…
Jan 22, 2018
3306f64
Implementing cpu/wall time selection in simple form.
Jan 22, 2018
afce002
Improving resource renderer for better caching.
Jan 23, 2018
bb1cc9a
Make results table show cpu or wall time based on which one was set.
Jan 23, 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
Binary file removed public/public/term_cyr.ttf
View file
Open in desktop
Binary file not shown.
7 changes: 2 additions & 5 deletions src/components/forms/EditExerciseConfigForm/EditExerciseConfigForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Box from '../../../components/widgets/Box';
import SubmitButton from '../SubmitButton';
import EditExerciseConfigEnvironment from './EditExerciseConfigEnvironment';
import { fetchSupplementaryFilesForExercise } from '../../../redux/modules/supplementaryFiles';
import { createGetSupplementaryFiles } from '../../../redux/selectors/supplementaryFiles';
import { getSupplementaryFilesForExercise } from '../../../redux/selectors/supplementaryFiles';
import { getVariablesForPipelines } from '../../../redux/modules/exercises';

class EditExerciseConfigForm extends Component {
Expand Down Expand Up @@ -327,11 +327,8 @@ const validate = ({ config }) => {

const ConnectedEditExerciseConfigForm = connect(
(state, { exercise }) => {
const getSupplementaryFilesForExercise = createGetSupplementaryFiles(
exercise.supplementaryFilesIds
);
return {
supplementaryFiles: getSupplementaryFilesForExercise(state),
supplementaryFiles: getSupplementaryFilesForExercise(exercise.id)(state),
formValues: getFormValues('editExerciseConfig')(state)
};
},
Expand Down
286 changes: 144 additions & 142 deletions src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { reduxForm, getFormValues } from 'redux-form';
Expand All @@ -13,122 +13,129 @@ import SubmitButton from '../SubmitButton';
import ResourceRenderer from '../../helpers/ResourceRenderer';

import EditExerciseSimpleConfigTest from './EditExerciseSimpleConfigTest';
import { createGetSupplementaryFiles } from '../../../redux/selectors/supplementaryFiles';
import { getSupplementaryFilesForExercise } from '../../../redux/selectors/supplementaryFiles';
import { encodeTestId } from '../../../redux/modules/simpleLimits';
import { smartFillExerciseConfigForm } from '../../../redux/modules/exerciseConfigs';
import { exerciseConfigFormErrors } from '../../../redux/selectors/exerciseConfigs';

const EditExerciseSimpleConfigForm = ({
reset,
handleSubmit,
submitting,
submitFailed,
submitSucceeded,
invalid,
dirty,
formValues,
formErrors,
supplementaryFiles,
exerciseTests,
smartFill,
intl: { locale }
}) =>
<FormBox
title={
<FormattedMessage
id="app.editExercise.editConfig"
defaultMessage="Edit exercise configuration"
/>
}
unlimitedHeight
noPadding
success={submitSucceeded}
dirty={dirty}
footer={
<div className="text-center">
{dirty &&
<span>
<Button
type="reset"
onClick={reset}
bsStyle={'danger'}
className="btn-flat"
>
<RefreshIcon /> &nbsp;
<FormattedMessage
id="app.editExerciseSimpleConfigForm.reset"
defaultMessage="Reset"
/>
</Button>{' '}
</span>}
class EditExerciseSimpleConfigForm extends Component {
render() {
const {
reset,
handleSubmit,
submitting,
submitFailed,
submitSucceeded,
invalid,
dirty,
formValues,
formErrors,
supplementaryFiles,
exerciseTests,
smartFill,
intl: { locale }
} = this.props;

<SubmitButton
id="editExerciseSimpleConfig"
invalid={invalid}
submitting={submitting}
dirty={dirty}
hasSucceeded={submitSucceeded}
hasFailed={submitFailed}
handleSubmit={handleSubmit}
messages={{
submit: (
<FormattedMessage
id="app.editExerciseSimpleConfigForm.submit"
defaultMessage="Save Configuration"
/>
),
submitting: (
<FormattedMessage
id="app.editExerciseSimpleConfigForm.submitting"
defaultMessage="Saving Configuration ..."
/>
),
success: (
<FormattedMessage
id="app.editExerciseSimpleConfigForm.success"
defaultMessage="Configuration Saved."
/>
),
validating: (
<FormattedMessage
id="app.editExerciseSimpleConfigForm.validating"
defaultMessage="Validating ..."
/>
)
}}
/>
</div>
}
>
{submitFailed &&
<Alert bsStyle="danger">
<FormattedMessage
id="app.editExerciseConfigForm.failed"
defaultMessage="Saving failed. Please try again later."
/>
</Alert>}
<ResourceRenderer resource={supplementaryFiles.toArray()}>
{(...files) =>
<div>
{exerciseTests
.sort((a, b) => a.name.localeCompare(b.name, locale))
.map((test, idx) =>
<EditExerciseSimpleConfigTest
key={idx}
formValues={formValues}
supplementaryFiles={files}
testName={test.name}
test={'config.' + encodeTestId(test.id)}
testId={test.id}
testKey={encodeTestId(test.id)}
testIndex={idx}
testErrors={formErrors && formErrors[encodeTestId(test.id)]}
smartFill={smartFill(test.id, exerciseTests, files)}
/>
)}
</div>}
</ResourceRenderer>
</FormBox>;
return (
<FormBox
title={
<FormattedMessage
id="app.editExercise.editConfig"
defaultMessage="Edit exercise configuration"
/>
}
unlimitedHeight
noPadding
success={submitSucceeded}
dirty={dirty}
footer={
<div className="text-center">
{dirty &&
<span>
<Button
type="reset"
onClick={reset}
bsStyle={'danger'}
className="btn-flat"
>
<RefreshIcon /> &nbsp;
<FormattedMessage
id="app.editExerciseSimpleConfigForm.reset"
defaultMessage="Reset"
/>
</Button>{' '}
</span>}

<SubmitButton
id="editExerciseSimpleConfig"
invalid={invalid}
submitting={submitting}
dirty={dirty}
hasSucceeded={submitSucceeded}
hasFailed={submitFailed}
handleSubmit={handleSubmit}
messages={{
submit: (
<FormattedMessage
id="app.editExerciseSimpleConfigForm.submit"
defaultMessage="Save Configuration"
/>
),
submitting: (
<FormattedMessage
id="app.editExerciseSimpleConfigForm.submitting"
defaultMessage="Saving Configuration ..."
/>
),
success: (
<FormattedMessage
id="app.editExerciseSimpleConfigForm.success"
defaultMessage="Configuration Saved."
/>
),
validating: (
<FormattedMessage
id="app.editExerciseSimpleConfigForm.validating"
defaultMessage="Validating ..."
/>
)
}}
/>
</div>
}
>
{submitFailed &&
<Alert bsStyle="danger">
<FormattedMessage
id="app.editExerciseConfigForm.failed"
defaultMessage="Saving failed. Please try again later."
/>
</Alert>}
<ResourceRenderer resource={supplementaryFiles.toArray()}>
{(...files) =>
<div>
{exerciseTests
.sort((a, b) => a.name.localeCompare(b.name, locale))
.map((test, idx) =>
<EditExerciseSimpleConfigTest
key={idx}
formValues={formValues}
supplementaryFiles={files}
testName={test.name}
test={'config.' + encodeTestId(test.id)}
testId={test.id}
testKey={encodeTestId(test.id)}
testIndex={idx}
testErrors={formErrors && formErrors[encodeTestId(test.id)]}
smartFill={smartFill(test.id, exerciseTests, files)}
/>
)}
</div>}
</ResourceRenderer>
</FormBox>
);
}
}

EditExerciseSimpleConfigForm.propTypes = {
initialValues: PropTypes.object,
Expand Down Expand Up @@ -197,34 +204,29 @@ const validate = formData => {
: undefined;
};

export default injectIntl(
connect(
(state, { exercise }) => {
const getSupplementaryFilesForExercise = createGetSupplementaryFiles(
exercise.supplementaryFilesIds
);
return {
supplementaryFiles: getSupplementaryFilesForExercise(state),
formValues: getFormValues(FORM_NAME)(state),
formErrors: exerciseConfigFormErrors(state, FORM_NAME)
};
},
dispatch => ({
smartFill: (testId, tests, files) => () =>
dispatch(smartFillExerciseConfigForm(FORM_NAME, testId, tests, files))
})
)(
reduxForm({
form: FORM_NAME,
enableReinitialize: true,
keepDirtyOnReinitialize: false,
immutableProps: [
'formValues',
'supplementaryFiles',
'exerciseTests',
'handleSubmit'
],
validate
})(EditExerciseSimpleConfigForm)
)
export default connect(
(state, { exercise }) => {
return {
supplementaryFiles: getSupplementaryFilesForExercise(exercise.id)(state),
formValues: getFormValues(FORM_NAME)(state),
formErrors: exerciseConfigFormErrors(state, FORM_NAME)
};
},
dispatch => ({
smartFill: (testId, tests, files) => () =>
dispatch(smartFillExerciseConfigForm(FORM_NAME, testId, tests, files))
})
)(
reduxForm({
form: FORM_NAME,
enableReinitialize: true,
keepDirtyOnReinitialize: false,
immutableProps: [
'formValues',
'supplementaryFiles',
'exerciseTests',
'handleSubmit'
],
validate
})(injectIntl(EditExerciseSimpleConfigForm))
);
Loading