Skip to content

Commit 797ead6

Browse files
krulis-martinkrulis-martin
committed
Renaming supplementary files to exercise files (including references to API endpoints and fields in structures).
1 parent 43e0264 commit 797ead6

31 files changed

Lines changed: 242 additions & 267 deletions

src/components/Exercises/FilesTable/SupplementaryFilesTableHeaderRow.js renamed to src/components/Exercises/FilesTable/ExerciseFilesTableHeaderRow.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import PropTypes from 'prop-types';
33
import { FormattedMessage } from 'react-intl';
44

5-
const SupplementaryFilesTableHeaderRow = ({ viewOnly }) => (
5+
const ExerciseFilesTableHeaderRow = ({ viewOnly }) => (
66
<tr>
77
<th>
88
<FormattedMessage id="app.uploadFiles.fileName" defaultMessage="File Name" />
@@ -17,8 +17,8 @@ const SupplementaryFilesTableHeaderRow = ({ viewOnly }) => (
1717
</tr>
1818
);
1919

20-
SupplementaryFilesTableHeaderRow.propTypes = {
20+
ExerciseFilesTableHeaderRow.propTypes = {
2121
viewOnly: PropTypes.bool,
2222
};
2323

24-
export default SupplementaryFilesTableHeaderRow;
24+
export default ExerciseFilesTableHeaderRow;

src/components/Exercises/FilesTable/SupplementaryFilesTableRow.js renamed to src/components/Exercises/FilesTable/ExerciseFilesTableRow.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { prettyPrintBytes } from '../../helpers/stringFormatters.js';
99
import Confirm from '../../../components/forms/Confirm';
1010
import Icon, { DeleteIcon } from '../../../components/icons';
1111

12-
const SupplementaryFilesTableRow = ({
12+
const ExerciseFilesTableRow = ({
1313
id,
1414
name,
1515
size,
@@ -42,7 +42,7 @@ const SupplementaryFilesTableRow = ({
4242
onConfirmed={() => removeFile(id)}
4343
question={
4444
<FormattedMessage
45-
id="app.supplementaryFiles.deleteConfirm"
45+
id="app.exerciseFiles.deleteConfirm"
4646
defaultMessage="Are you sure you want to delete the file? This cannot be undone."
4747
/>
4848
}
@@ -58,7 +58,7 @@ const SupplementaryFilesTableRow = ({
5858
overlay={
5959
<Tooltip id={`cannot-delete-${id}`}>
6060
<FormattedMessage
61-
id="app.supplementaryFiles.cannotDeleteExplain"
61+
id="app.exerciseFiles.cannotDeleteExplain"
6262
defaultMessage="The file cannot be deleted since it is being used in the configuration."
6363
/>
6464
</Tooltip>
@@ -74,7 +74,7 @@ const SupplementaryFilesTableRow = ({
7474
</tr>
7575
);
7676

77-
SupplementaryFilesTableRow.propTypes = {
77+
ExerciseFilesTableRow.propTypes = {
7878
id: PropTypes.string.isRequired,
7979
name: PropTypes.string.isRequired,
8080
size: PropTypes.number.isRequired,
@@ -85,4 +85,4 @@ SupplementaryFilesTableRow.propTypes = {
8585
isBeingUsed: PropTypes.bool,
8686
};
8787

88-
export default SupplementaryFilesTableRow;
88+
export default ExerciseFilesTableRow;

‎src/components/Exercises/FilesTable/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import FilesTable from './FilesTable.js';
22
export default FilesTable;
33

4-
export { default as SupplementaryFilesTableRow } from './SupplementaryFilesTableRow.js';
5-
export { default as SupplementaryFilesTableHeaderRow } from './SupplementaryFilesTableHeaderRow.js';
4+
export { default as ExerciseFilesTableRow } from './ExerciseFilesTableRow.js';
5+
export { default as ExerciseFilesTableHeaderRow } from './ExerciseFilesTableHeaderRow.js';
66
export { default as AttachmentFilesTableRow } from './AttachmentFilesTableRow.js';
77
export { default as AttachmentFilesTableHeaderRow } from './AttachmentFilesTableHeaderRow.js';

‎src/components/forms/EditExerciseAdvancedConfigForm/EditExerciseAdvancedConfigForm.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class EditExerciseAdvancedConfigForm extends Component {
3333
invalid,
3434
dirty,
3535
formErrors,
36-
supplementaryFiles,
36+
exerciseFiles,
3737
exerciseTests,
3838
rawFill,
3939
readOnly = false,
@@ -92,7 +92,7 @@ class EditExerciseAdvancedConfigForm extends Component {
9292
key={idx}
9393
pipelines={pipelines}
9494
pipelinesVariables={pipelinesVariables}
95-
supplementaryFiles={supplementaryFiles}
95+
exerciseFiles={exerciseFiles}
9696
testName={test.name}
9797
test={'config.' + encodeNumId(test.id)}
9898
testErrors={formErrors && formErrors[encodeNumId(test.id)]}
@@ -122,7 +122,7 @@ EditExerciseAdvancedConfigForm.propTypes = {
122122
submitSucceeded: PropTypes.bool,
123123
invalid: PropTypes.bool,
124124
formErrors: PropTypes.object,
125-
supplementaryFiles: PropTypes.array,
125+
exerciseFiles: PropTypes.array,
126126
rawFill: PropTypes.func.isRequired,
127127
readOnly: PropTypes.bool,
128128
intl: PropTypes.object.isRequired,
@@ -149,6 +149,6 @@ export default connect(
149149
form: FORM_NAME,
150150
enableReinitialize: true,
151151
keepDirtyOnReinitialize: false,
152-
immutableProps: ['formValues', 'supplementaryFiles', 'exerciseTests', 'handleSubmit'],
152+
immutableProps: ['formValues', 'exerciseFiles', 'exerciseTests', 'handleSubmit'],
153153
})(injectIntl(EditExerciseAdvancedConfigForm))
154154
);

‎src/components/forms/EditExerciseAdvancedConfigForm/EditExerciseAdvancedConfigTest.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ const validateFileName = value =>
2020
/>
2121
) : undefined;
2222

23-
const prepareFilesOptions = lruMemoize((supplementaryFiles, locale) => {
24-
const supplementaryFilesOptions = unique(supplementaryFiles.map(({ name }) => name))
23+
const prepareFilesOptions = lruMemoize((exerciseFiles, locale) => {
24+
const filesOptions = unique(exerciseFiles.map(({ name }) => name))
2525
.sort((a, b) => a.localeCompare(b, locale))
2626
.map(name => ({
2727
key: name,
2828
name,
2929
}));
30-
return supplementaryFilesOptions;
30+
return filesOptions;
3131
});
3232

3333
class EditExerciseAdvancedConfigTest extends Component {
3434
createField = (name, type) => {
3535
const {
36-
supplementaryFiles,
36+
exerciseFiles,
3737
readOnly = false,
3838
intl: { locale },
3939
} = this.props;
@@ -43,7 +43,7 @@ class EditExerciseAdvancedConfigTest extends Component {
4343
const commonProps = { name };
4444
if (baseType === 'remote-file') {
4545
commonProps.addEmptyOption = true;
46-
commonProps.options = prepareFilesOptions(supplementaryFiles, locale);
46+
commonProps.options = prepareFilesOptions(exerciseFiles, locale);
4747
} else {
4848
commonProps.maxLength = 64;
4949
if (type === 'file') {
@@ -166,7 +166,7 @@ class EditExerciseAdvancedConfigTest extends Component {
166166
EditExerciseAdvancedConfigTest.propTypes = {
167167
testName: PropTypes.string.isRequired,
168168
test: PropTypes.string.isRequired,
169-
supplementaryFiles: PropTypes.array.isRequired,
169+
exerciseFiles: PropTypes.array.isRequired,
170170
exerciseTests: PropTypes.array,
171171
pipelines: PropTypes.array.isRequired,
172172
pipelinesVariables: PropTypes.array,

‎src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigForm.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {
3232
import { exerciseConfigFormErrors } from '../../../redux/selectors/exerciseConfigs.js';
3333
import { encodeNumId, createIndex, safeSet, safeGet, deepReduce } from '../../../helpers/common.js';
3434

35-
const supplementaryFilesOptions = lruMemoize((files, locale) =>
35+
const filesOptions = lruMemoize((files, locale) =>
3636
files
3737
.sort((a, b) => a.name.localeCompare(b.name, locale))
3838
.filter((item, pos, arr) => arr.indexOf(item) === pos) // WTF?
@@ -82,7 +82,7 @@ const nonDefaultSuccessExitCodes = obj => {
8282
*/
8383
const validateFileExists = (data, errors, path, existingFiles) => {
8484
if (!existingFiles) {
85-
return; // safeguard if the supplementary files are not loaded yet
85+
return; // safeguard if the exercise files are not loaded yet
8686
}
8787

8888
let target = safeGet(data, path);
@@ -161,8 +161,8 @@ const validateFileList = (data, errors, path, pairs, existingFiles, emptyError,
161161

162162
class EditExerciseSimpleConfigForm extends Component {
163163
componentDidUpdate(prevProps) {
164-
if (prevProps.supplementaryFiles !== this.props.supplementaryFiles) {
165-
// enforce re-validation if supplementary files have changed
164+
if (prevProps.exerciseFiles !== this.props.exerciseFiles) {
165+
// enforce re-validation if exercise files have changed
166166
this.props.change('_validationHack', Date.now());
167167
}
168168
}
@@ -180,7 +180,7 @@ class EditExerciseSimpleConfigForm extends Component {
180180
dirty,
181181
formValues,
182182
formErrors,
183-
supplementaryFiles,
183+
exerciseFiles,
184184
environmentsWithEntryPoints,
185185
exercise,
186186
exerciseTests,
@@ -282,10 +282,10 @@ class EditExerciseSimpleConfigForm extends Component {
282282
key={idx}
283283
smartFill={
284284
idx === 0 && exerciseTests.length > 1
285-
? smartFill(test.id, exerciseTests, supplementaryFiles)
285+
? smartFill(test.id, exerciseTests, exerciseFiles)
286286
: undefined
287287
}
288-
supplementaryFiles={supplementaryFilesOptions(supplementaryFiles, locale)}
288+
exerciseFiles={filesOptions(exerciseFiles, locale)}
289289
test={'config.' + encodeNumId(test.id)}
290290
testErrors={formErrors && formErrors[encodeNumId(test.id)]}
291291
testName={test.name}
@@ -316,7 +316,7 @@ EditExerciseSimpleConfigForm.propTypes = {
316316
invalid: PropTypes.bool,
317317
formValues: PropTypes.object,
318318
formErrors: PropTypes.object,
319-
supplementaryFiles: PropTypes.array,
319+
exerciseFiles: PropTypes.array,
320320
exercise: PropTypes.object,
321321
exerciseTests: PropTypes.array,
322322
environmentsWithEntryPoints: PropTypes.array.isRequired,
@@ -325,9 +325,9 @@ EditExerciseSimpleConfigForm.propTypes = {
325325
intl: PropTypes.object.isRequired,
326326
};
327327

328-
const validate = (formData, { exercise, supplementaryFiles }) => {
328+
const validate = (formData, { exercise, exerciseFiles }) => {
329329
const errors = {};
330-
const existingFiles = createFilesNamesIndex(supplementaryFiles);
330+
const existingFiles = createFilesNamesIndex(exerciseFiles);
331331

332332
for (const testKey in formData.config) {
333333
const test = formData.config[testKey];
@@ -502,7 +502,7 @@ export default connect(
502502
form: FORM_NAME,
503503
enableReinitialize: true,
504504
keepDirtyOnReinitialize: false,
505-
immutableProps: ['formValues', 'supplementaryFiles', 'exerciseTests', 'handleSubmit'],
505+
immutableProps: ['formValues', 'exerciseFiles', 'exerciseTests', 'handleSubmit'],
506506
validate,
507507
warn,
508508
})(injectIntl(EditExerciseSimpleConfigForm))

‎src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigTest.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class EditExerciseSimpleConfigTest extends Component {
5151
extraFiles,
5252
compilationInitiallyOpened,
5353
smartFill,
54-
supplementaryFiles,
54+
exerciseFiles,
5555
test,
5656
testErrors,
5757
testName,
@@ -101,7 +101,7 @@ class EditExerciseSimpleConfigTest extends Component {
101101
extraFiles={extraFiles}
102102
compilationInitiallyOpened={compilationInitiallyOpened}
103103
smartFillCompilation={smartFill ? smartFill.compilation : null}
104-
supplementaryFiles={supplementaryFiles}
104+
exerciseFiles={exerciseFiles}
105105
test={test}
106106
testErrors={testErrors}
107107
readOnly={readOnly}
@@ -127,7 +127,7 @@ class EditExerciseSimpleConfigTest extends Component {
127127
<EditExerciseSimpleConfigTestInputs
128128
change={change}
129129
smartFillInputs={smartFill ? smartFill.input : null}
130-
supplementaryFiles={supplementaryFiles}
130+
exerciseFiles={exerciseFiles}
131131
test={test}
132132
testErrors={testErrors}
133133
showInputFiles={showInputsFiles}
@@ -142,7 +142,7 @@ class EditExerciseSimpleConfigTest extends Component {
142142
<EditExerciseSimpleConfigTestExtraFiles
143143
change={change}
144144
smartFillExtraFiles={smartFill ? smartFill.extraFiles : null}
145-
supplementaryFiles={supplementaryFiles}
145+
exerciseFiles={exerciseFiles}
146146
test={test}
147147
testErrors={testErrors}
148148
environmentId={environmentWithOverride}
@@ -166,7 +166,7 @@ class EditExerciseSimpleConfigTest extends Component {
166166
<Col md={6} lg={lgColSpan}>
167167
<EditExerciseSimpleConfigTestOutput
168168
smartFillOutput={smartFill ? smartFill.output : null}
169-
supplementaryFiles={supplementaryFiles}
169+
exerciseFiles={exerciseFiles}
170170
test={test}
171171
testErrors={testErrors}
172172
useOutFile={useOutFile}
@@ -180,7 +180,7 @@ class EditExerciseSimpleConfigTest extends Component {
180180
<Col md={6} lg={lgColSpan}>
181181
<EditExerciseSimpleConfigTestJudge
182182
smartFillJudge={smartFill ? smartFill.judge : null}
183-
supplementaryFiles={supplementaryFiles}
183+
exerciseFiles={exerciseFiles}
184184
test={test}
185185
testErrors={testErrors}
186186
useCustomJudge={useCustomJudge}
@@ -223,7 +223,7 @@ EditExerciseSimpleConfigTest.propTypes = {
223223
extraFiles: PropTypes.object,
224224
compilationInitiallyOpened: PropTypes.bool,
225225
smartFill: PropTypes.object,
226-
supplementaryFiles: PropTypes.array.isRequired,
226+
exerciseFiles: PropTypes.array.isRequired,
227227
test: PropTypes.string.isRequired,
228228
testErrors: PropTypes.object,
229229
testName: PropTypes.string.isRequired,

‎src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigTestCompilation.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class EditExerciseSimpleConfigTestCompilation extends Component {
6969
change,
7070
exercise,
7171
smartFillCompilation,
72-
supplementaryFiles,
72+
exerciseFiles,
7373
test,
7474
testErrors,
7575
intl,
@@ -120,7 +120,7 @@ class EditExerciseSimpleConfigTestCompilation extends Component {
120120
<FieldArray
121121
name={`${test}.jar-files.${env.id}`}
122122
component={ExpandingSelectField}
123-
options={supplementaryFiles}
123+
options={exerciseFiles}
124124
label={
125125
<FormattedMessage
126126
id="app.editExerciseSimpleConfigTests.jarFiles"
@@ -198,7 +198,7 @@ class EditExerciseSimpleConfigTestCompilation extends Component {
198198
<FieldArray
199199
name={`${test}.extra-files.${env.id}`}
200200
component={ExpandingInputFilesField}
201-
options={supplementaryFiles}
201+
options={exerciseFiles}
202202
change={change}
203203
leftLabel={
204204
<FormattedMessage
@@ -348,7 +348,7 @@ class EditExerciseSimpleConfigTestCompilation extends Component {
348348
EditExerciseSimpleConfigTestCompilation.propTypes = {
349349
exercise: PropTypes.object,
350350
test: PropTypes.string.isRequired,
351-
supplementaryFiles: PropTypes.array.isRequired,
351+
exerciseFiles: PropTypes.array.isRequired,
352352
exerciseTests: PropTypes.array,
353353
extraFiles: PropTypes.object,
354354
compilationInitiallyOpened: PropTypes.bool,

‎src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigTestExtraFiles.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Confirm from '../../forms/Confirm';
1111
const EditExerciseSimpleConfigTestExtraFiles = ({
1212
change,
1313
smartFillExtraFiles,
14-
supplementaryFiles,
14+
exerciseFiles,
1515
test,
1616
testErrors,
1717
environmentId,
@@ -25,7 +25,7 @@ const EditExerciseSimpleConfigTestExtraFiles = ({
2525
<FieldArray
2626
name={`${test}.extra-files.${environmentId}`}
2727
component={ExpandingInputFilesField}
28-
options={supplementaryFiles}
28+
options={exerciseFiles}
2929
change={change}
3030
readOnly={readOnly}
3131
leftLabel={
@@ -72,7 +72,7 @@ const EditExerciseSimpleConfigTestExtraFiles = ({
7272
EditExerciseSimpleConfigTestExtraFiles.propTypes = {
7373
change: PropTypes.func.isRequired,
7474
smartFillExtraFiles: PropTypes.func,
75-
supplementaryFiles: PropTypes.array.isRequired,
75+
exerciseFiles: PropTypes.array.isRequired,
7676
test: PropTypes.string.isRequired,
7777
testErrors: PropTypes.object,
7878
environmentId: PropTypes.string.isRequired,

‎src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigTestInputs.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Confirm from '../../forms/Confirm';
1111
const EditExerciseSimpleConfigTestInputs = ({
1212
change,
1313
smartFillInputs,
14-
supplementaryFiles,
14+
exerciseFiles,
1515
test,
1616
testErrors,
1717
showInputFiles = false,
@@ -27,7 +27,7 @@ const EditExerciseSimpleConfigTestInputs = ({
2727
<Field
2828
name={`${test}.stdin-file`}
2929
component={SelectField}
30-
options={supplementaryFiles}
30+
options={exerciseFiles}
3131
addEmptyOption={true}
3232
disabled={readOnly}
3333
label={<FormattedMessage id="app.editExerciseSimpleConfigTests.inputStdin" defaultMessage="Std. input:" />}
@@ -38,7 +38,7 @@ const EditExerciseSimpleConfigTestInputs = ({
3838
<FieldArray
3939
name={`${test}.input-files`}
4040
component={ExpandingInputFilesField}
41-
options={supplementaryFiles}
41+
options={exerciseFiles}
4242
change={change}
4343
readOnly={readOnly}
4444
leftLabel={
@@ -80,7 +80,7 @@ const EditExerciseSimpleConfigTestInputs = ({
8080
EditExerciseSimpleConfigTestInputs.propTypes = {
8181
change: PropTypes.func.isRequired,
8282
smartFillInputs: PropTypes.func,
83-
supplementaryFiles: PropTypes.array.isRequired,
83+
exerciseFiles: PropTypes.array.isRequired,
8484
test: PropTypes.string.isRequired,
8585
testErrors: PropTypes.object,
8686
showInputFiles: PropTypes.bool,

0 commit comments

Comments
 (0)