From 36c1653ef5b2e0b367db0c0c0314bd3ddca24c7f Mon Sep 17 00:00:00 2001
From: Petr Stefan <ptr.stef@gmail.com>
Date: Sat, 25 Nov 2017 23:35:09 +0100
Subject: [PATCH] Exercise config loaded into simple form ... uff

---
 .../EditExerciseSimpleConfigForm.js           |   7 +-
 .../EditExerciseSimpleConfigTest.js           | 296 ++++++++++--------
 .../forms/Fields/ExpandingInputFilesField.js  |   7 +-
 .../EditExerciseSimpleConfig.js               | 108 ++++++-
 4 files changed, 285 insertions(+), 133 deletions(-)

diff --git a/src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigForm.js b/src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigForm.js
index 809f35649..e986c3fed 100644
--- a/src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigForm.js
+++ b/src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigForm.js
@@ -21,7 +21,8 @@ class EditExerciseSimpleConfigForm extends Component {
       hasSucceeded = false,
       invalid,
       formValues,
-      supplementaryFiles
+      supplementaryFiles,
+      exerciseTests
     } = this.props;
     return (
       <div>
@@ -40,6 +41,7 @@ class EditExerciseSimpleConfigForm extends Component {
               formValues={formValues}
               supplementaryFiles={files}
               prefix="config"
+              exerciseTests={exerciseTests}
             />}
         </ResourceRenderer>
 
@@ -92,7 +94,8 @@ EditExerciseSimpleConfigForm.propTypes = {
     id: PropTypes.string.isRequired
   }),
   formValues: PropTypes.object,
-  supplementaryFiles: ImmutablePropTypes.map
+  supplementaryFiles: ImmutablePropTypes.map,
+  exerciseTests: PropTypes.array
 };
 
 const validate = () => {
diff --git a/src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigTest.js b/src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigTest.js
index 11a50b620..4e5376a63 100644
--- a/src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigTest.js
+++ b/src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigTest.js
@@ -13,9 +13,11 @@ import {
 } from '../Fields';
 
 const EditExerciseSimpleConfigTest = ({
+  fields,
   prefix,
   supplementaryFiles,
   formValues,
+  exerciseTests,
   intl
 }) => {
   const supplementaryFilesOptions = [{ key: '', name: '...' }].concat(
@@ -29,145 +31,193 @@ const EditExerciseSimpleConfigTest = ({
   );
   return (
     <div>
-      <Row>
-        <Col lg={12}>
-          <h3>Test 1</h3>
-        </Col>
-      </Row>
-      <Row>
-        <Col lg={3}>
-          <h4>
-            <FormattedMessage
-              id="app.editExerciseSimpleConfigTests.inputTitle"
-              defaultMessage="input"
-            />
-          </h4>
-          <Field
-            name={`${prefix}.inputFiles`}
-            component={ExpandingInputFilesField}
-            options={supplementaryFilesOptions}
-            leftLabel={
-              <FormattedMessage
-                id="app.editExerciseSimpleConfigTests.inputFilesActual"
-                defaultMessage="Input file:"
+      {fields.map((test, i) =>
+        <div key={i}>
+          <Row>
+            <Col lg={12}>
+              <h3>
+                {exerciseTests[i].name}
+              </h3>
+            </Col>
+          </Row>
+          <Row>
+            <Col lg={3}>
+              <h4>
+                <FormattedMessage
+                  id="app.editExerciseSimpleConfigTests.inputTitle"
+                  defaultMessage="Input"
+                />
+              </h4>
+              <Field
+                name={`${test}.inputFiles`}
+                component={ExpandingInputFilesField}
+                options={supplementaryFilesOptions}
+                leftLabel={
+                  <FormattedMessage
+                    id="app.editExerciseSimpleConfigTests.inputFilesActual"
+                    defaultMessage="Input file:"
+                  />
+                }
+                rightLabel={
+                  <FormattedMessage
+                    id="app.editExerciseSimpleConfigTests.inputFilesRename"
+                    defaultMessage="Renamed file name:"
+                  />
+                }
               />
-            }
-            rightLabel={
-              <FormattedMessage
-                id="app.editExerciseSimpleConfigTests.inputFilesRename"
-                defaultMessage="Renamed file name:"
+              <Field
+                name={`${test}.inputStdin`}
+                component={SelectField}
+                options={supplementaryFilesOptions}
+                label={
+                  <FormattedMessage
+                    id="app.editExerciseSimpleConfigTests.inputStdin"
+                    defaultMessage="Stdin:"
+                  />
+                }
               />
-            }
-          />
-          <Field
-            name={`${prefix}.inputStdin`}
-            component={SelectField}
-            options={supplementaryFilesOptions}
-            label={
-              <FormattedMessage
-                id="app.editExerciseSimpleConfigTests.inputStdin"
-                defaultMessage="Stdin:"
+            </Col>
+            <Col lg={3}>
+              <h4>
+                <FormattedMessage
+                  id="app.editExerciseSimpleConfigTests.executionTitle"
+                  defaultMessage="Execution"
+                />
+              </h4>
+              <Field
+                name={`${test}.runArgs`}
+                component={ExpandingTextField}
+                label={
+                  <FormattedMessage
+                    id="app.editExerciseSimpleConfigTests.executionArguments"
+                    defaultMessage="Execution arguments:"
+                  />
+                }
               />
-            }
-          />
-        </Col>
-        <Col lg={3}>
-          <h4>
-            <FormattedMessage
-              id="app.editExerciseSimpleConfigTests.executionTitle"
-              defaultMessage="Execution"
-            />
-          </h4>
-          <Field
-            name={`${prefix}.execArgs`}
-            component={ExpandingTextField}
-            label={
-              <FormattedMessage
-                id="app.editExerciseSimpleConfigTests.executionArguments"
-                defaultMessage="Execution arguments:"
+            </Col>
+            <Col lg={3}>
+              <h4>
+                <FormattedMessage
+                  id="app.editExerciseSimpleConfigTests.outputTitle"
+                  defaultMessage="Output"
+                />
+              </h4>
+              <Field
+                name={`${test}.useOutFile`}
+                component={CheckboxField}
+                onOff
+                label={
+                  <FormattedMessage
+                    id="app.editExerciseSimpleConfigTests.useOutfile"
+                    defaultMessage="Use output file instead of stdout"
+                  />
+                }
               />
-            }
-          />
-        </Col>
-        <Col lg={3}>
-          <h4>
-            <FormattedMessage
-              id="app.editExerciseSimpleConfigTests.outputTitle"
-              defaultMessage="Output"
-            />
-          </h4>
-          <Field
-            name={`${prefix}.useStdout`}
-            component={CheckboxField}
-            onOff
-            label={
-              <FormattedMessage
-                id="app.editExerciseSimpleConfigTests.useOutfile"
-                defaultMessage="Use output file instead of stdout"
+              {formValues &&
+                formValues.config &&
+                formValues.config[i] &&
+                (formValues.config[i].useOutFile === true ||
+                  formValues.config[i].useOutFile === 'true') &&
+                <Field
+                  name={`${test}.outputFile`}
+                  component={TextField}
+                  label={
+                    <FormattedMessage
+                      id="app.editExerciseSimpleConfigTests.outputFile"
+                      defaultMessage="Output file:"
+                    />
+                  }
+                />}
+              <Field
+                name={`${test}.expectedOutput`}
+                component={SelectField}
+                options={supplementaryFilesOptions}
+                label={
+                  <FormattedMessage
+                    id="app.editExerciseSimpleConfigTests.expectedOutput"
+                    defaultMessage="Expected output:"
+                  />
+                }
               />
-            }
-          />
-          {formValues &&
-            formValues.useStdout !== 'true' &&
-            <Field
-              name={`${prefix}.output`}
-              component={TextField}
-              label={
+            </Col>
+            <Col lg={3}>
+              <h4>
                 <FormattedMessage
-                  id="app.editExerciseSimpleConfigTests.outputFile"
-                  defaultMessage="Output file:"
+                  id="app.editExerciseSimpleConfigTests.judgeTitle"
+                  defaultMessage="Judge"
                 />
-              }
-            />}
-          <Field
-            name={`${prefix}.outputSpecimen`}
-            component={SelectField}
-            options={supplementaryFilesOptions}
-            label={
-              <FormattedMessage
-                id="app.editExerciseSimpleConfigTests.outputSpecimen"
-                defaultMessage="Output specimen:"
-              />
-            }
-          />
-        </Col>
-        <Col lg={3}>
-          <h4>
-            <FormattedMessage
-              id="app.editExerciseSimpleConfigTests.judgeTitle"
-              defaultMessage="Judge"
-            />
-          </h4>
-          <Field
-            name={`${prefix}.judgeType`}
-            component={SelectField}
-            options={[{ key: '', name: '...' }]}
-            label={
-              <FormattedMessage
-                id="app.editExerciseSimpleConfigTests.judgeType"
-                defaultMessage="Judge type:"
+              </h4>
+              <Field
+                name={`${test}.useCustomJudge`}
+                component={CheckboxField}
+                onOff
+                label={
+                  <FormattedMessage
+                    id="app.editExerciseSimpleConfigTests.useCustomJudge"
+                    defaultMessage="Use custom judge binary"
+                  />
+                }
               />
-            }
-          />
-          <Field
-            name={`${prefix}.judgeArgs`}
-            component={TextField}
-            label={
-              <FormattedMessage
-                id="app.editExerciseSimpleConfigTests.judgeArgs"
-                defaultMessage="Judge arguments:"
+              {formValues &&
+              formValues.config &&
+              formValues.config[i] &&
+              (formValues.config[i].useCustomJudge === true ||
+                formValues.config[i].useCustomJudge === 'true')
+                ? <Field
+                    name={`${test}.customJudgeBinary`}
+                    component={SelectField}
+                    options={supplementaryFilesOptions}
+                    label={
+                      <FormattedMessage
+                        id="app.editExerciseSimpleConfigTests.customJudgeBinary"
+                        defaultMessage="Custom judge binary:"
+                      />
+                    }
+                  />
+                : <Field
+                    name={`${test}.judgeBinary`}
+                    component={SelectField}
+                    options={[
+                      { key: '', name: '...' },
+                      {
+                        key: 'recodex-judge-normal',
+                        name: 'recodex-judge-normal'
+                      },
+                      {
+                        key: 'recodex-judge-shuffle',
+                        name: 'recodex-judge-shuffle'
+                      }
+                    ]}
+                    label={
+                      <FormattedMessage
+                        id="app.editExerciseSimpleConfigTests.judgeBinary"
+                        defaultMessage="Judge binary:"
+                      />
+                    }
+                  />}
+              <Field
+                name={`${test}.judgeArgs`}
+                component={TextField}
+                label={
+                  <FormattedMessage
+                    id="app.editExerciseSimpleConfigTests.judgeArgs"
+                    defaultMessage="Judge arguments:"
+                  />
+                }
               />
-            }
-          />
-        </Col>
-      </Row>
+            </Col>
+          </Row>
+        </div>
+      )}
     </div>
   );
 };
 
 EditExerciseSimpleConfigTest.propTypes = {
+  fields: PropTypes.object.isRequired,
   prefix: PropTypes.string.isRequired,
   supplementaryFiles: PropTypes.array.isRequired,
+  exerciseTests: PropTypes.array,
   formValues: PropTypes.object,
   intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
diff --git a/src/components/forms/Fields/ExpandingInputFilesField.js b/src/components/forms/Fields/ExpandingInputFilesField.js
index cfa5e553b..f06e2ceff 100644
--- a/src/components/forms/Fields/ExpandingInputFilesField.js
+++ b/src/components/forms/Fields/ExpandingInputFilesField.js
@@ -17,10 +17,9 @@ class ExpandingInputFilesField extends Component {
 
   componentDidMount() {
     const { input: { value } } = this.props;
-    const initialValue =
-      Array.isArray(value) && value.first && value.second
-        ? value.concat([EMPTY_VALUE])
-        : [EMPTY_VALUE];
+    const initialValue = Array.isArray(value)
+      ? value.concat([EMPTY_VALUE])
+      : [EMPTY_VALUE];
     this.setState({ texts: initialValue });
   }
 
diff --git a/src/pages/EditExerciseSimpleConfig/EditExerciseSimpleConfig.js b/src/pages/EditExerciseSimpleConfig/EditExerciseSimpleConfig.js
index 0ff35e87c..4f248bec4 100644
--- a/src/pages/EditExerciseSimpleConfig/EditExerciseSimpleConfig.js
+++ b/src/pages/EditExerciseSimpleConfig/EditExerciseSimpleConfig.js
@@ -121,6 +121,91 @@ const transformAndSendTestsValues = (
   ]);
 };
 
+const getSimpleConfigInitValues = (config, tests, locale) => {
+  const confTests = config[0].tests.sort((a, b) =>
+    a.name.localeCompare(b.name, locale)
+  );
+
+  let res = [];
+  for (let test of confTests) {
+    let testObj = { name: test.name };
+    const variables = test.pipelines.reduce(
+      (acc, pipeline) => acc.concat(pipeline.variables),
+      []
+    );
+
+    const inputFiles = variables.find(
+      variable => variable.name === 'input-files'
+    );
+    const actualInputs = variables.find(
+      variable => variable.name === 'actual-inputs'
+    );
+    if (inputFiles) {
+      testObj.inputFiles = inputFiles.value.map((value, i) => ({
+        first: value,
+        second:
+          actualInputs && actualInputs.value && actualInputs.value[i]
+            ? actualInputs.value[i]
+            : ''
+      }));
+    }
+
+    const expectedOutput = variables.find(
+      variable => variable.name === 'expected-output'
+    );
+    if (expectedOutput) {
+      testObj.expectedOutput = expectedOutput.value;
+    }
+
+    const runArgs = variables.find(variable => variable.name === 'run-args');
+    if (runArgs) {
+      testObj.runArgs = runArgs.value;
+    }
+
+    const actualOutput = variables.find(
+      variable => variable.name === 'actual-output'
+    );
+    if (actualOutput) {
+      testObj.useOutFile = true;
+      testObj.outputFile = actualOutput.value;
+    }
+
+    const stdinFile = variables.find(
+      variable => variable.name === 'stdin-file'
+    );
+    if (stdinFile) {
+      testObj.inputStdin = stdinFile.value;
+    }
+
+    const standardJudge = variables.find(
+      variable => variable.name === 'judge-type'
+    );
+    if (standardJudge) {
+      testObj.useCustomJudge = false;
+      testObj.judgeBinary = standardJudge.value;
+    }
+
+    const customJudge = variables.find(
+      variable => variable.name === 'custom-judge'
+    );
+    if (customJudge) {
+      testObj.customJudgeBinary = customJudge.value;
+      testObj.useCustomJudge = customJudge.value.trim() !== '';
+    }
+
+    const judgeArgs = variables.find(
+      variable => variable.name === 'judge-args'
+    );
+    if (judgeArgs) {
+      testObj.judgeArgs = judgeArgs.value;
+    }
+
+    res.push(testObj);
+  }
+
+  return { config: res };
+};
+
 class EditExerciseSimpleConfig extends Component {
   componentWillMount = () => this.props.loadAsync();
   componentWillReceiveProps = props => {
@@ -287,10 +372,25 @@ class EditExerciseSimpleConfig extends Component {
                   }
                   unlimitedHeight
                 >
-                  <EditExerciseSimpleConfigForm
-                    exercise={exercise}
-                    onSubmit={data => console.log(data)}
-                  />
+                  <ResourceRenderer resource={[exerciseConfig, exerciseTests]}>
+                    {(config, tests) => {
+                      const sortedTests = tests.sort((a, b) =>
+                        a.name.localeCompare(b.name, locale)
+                      );
+                      return (
+                        <EditExerciseSimpleConfigForm
+                          initialValues={getSimpleConfigInitValues(
+                            config,
+                            sortedTests,
+                            locale
+                          )}
+                          exercise={exercise}
+                          exerciseTests={sortedTests}
+                          onSubmit={data => console.log(data)}
+                        />
+                      );
+                    }}
+                  </ResourceRenderer>
                 </Box>
               </Col>
             </Row>