Adding exec targets (goals) in exercise tests configuration.

krulis-martin · krulis-martin · commit 003546c6f854 · 2024-07-17T16:07:16.000+02:00
diff --git a/src/client.js b/src/client.js
@@ -46,11 +46,13 @@ import 'ace-builds/src-noconflict/keybinding-vim.js';
  */
 const consoleError = console.error; // eslint-disable-line no-console
 console.error /* eslint-disable-line no-console */ = (msg, ...rest) => {
-  if (msg.startsWith('Warning: findDOMNode is deprecated and will be removed in the next major release.')) {
-    return;
-  }
-  if (msg.includes('Support for defaultProps will be removed')) {
-    return;
+  if (typeof msg === 'string') {
+    if (msg.startsWith('Warning: findDOMNode is deprecated and will be removed in the next major release.')) {
+      return;
+    }
+    if (msg.includes('Support for defaultProps will be removed')) {
+      return;
+    }
   }
   consoleError(msg, ...rest);
 };
diff --git a/src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigForm.js b/src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigForm.js
@@ -13,7 +13,12 @@ import SubmitButton from '../SubmitButton';
 
 import EditExerciseSimpleConfigTest from './EditExerciseSimpleConfigTest.js';
 import { SUBMIT_BUTTON_MESSAGES } from '../../../helpers/exercise/config.js';
-import { ENV_JAVA_ID, ENV_DATA_ONLY_ID, ENV_PROLOG_ID, ENV_HASKELL_ID } from '../../../helpers/exercise/environments.js';
+import {
+  ENV_DATA_ONLY_ID,
+  ENV_HASKELL_ID,
+  ENV_JAVA_ID,
+  ENV_PROLOG_ID,
+} from '../../../helpers/exercise/environments.js';
 import {
   exerciseConfigFormSmartFillAll,
   exerciseConfigFormSmartFillInput,
diff --git a/src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigTest.js b/src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigTest.js
@@ -6,7 +6,7 @@ import { FormattedMessage } from 'react-intl';
 import Button from '../../widgets/TheButton';
 import Icon from '../../icons';
 import Confirm from '../../forms/Confirm';
-import { ENV_DATA_ONLY_ID, ENV_PROLOG_ID, ENV_HASKELL_ID } from '../../../helpers/exercise/environments.js';
+import { ENV_DATA_ONLY_ID, ENV_HASKELL_ID, ENV_PROLOG_ID } from '../../../helpers/exercise/environments.js';
 
 import EditExerciseSimpleConfigTestCompilation from './EditExerciseSimpleConfigTestCompilation.js';
 import EditExerciseSimpleConfigTestInputs from './EditExerciseSimpleConfigTestInputs.js';
@@ -26,17 +26,17 @@ const overrides = {
     showJudgeBuiltins: false,
     showJudgeArgs: false,
   },
-  [ENV_PROLOG_ID]: {
+  [ENV_HASKELL_ID]: {
     showCompilation: false,
-    showInputsFiles: false,
     showArgs: false,
+    showStringEntryPoint: true,
     showOutputFile: false,
     showExtraFiles: true,
   },
-  [ENV_HASKELL_ID]: {
+  [ENV_PROLOG_ID]: {
     showCompilation: false,
+    showInputsFiles: false,
     showArgs: false,
-    showStringEntryPoint: true,
     showOutputFile: false,
     showExtraFiles: true,
   },
diff --git a/src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigTestCompilation.js b/src/components/forms/EditExerciseSimpleConfigForm/EditExerciseSimpleConfigTestCompilation.js
@@ -14,14 +14,23 @@ import Confirm from '../../forms/Confirm';
 import Explanation from '../../widgets/Explanation';
 import {
   ENV_ARDUINO_ID,
-  ENV_JAVA_ID,
   ENV_C_GCC_ID,
   ENV_CPP_GCC_ID,
+  ENV_JAVA_ID,
+  ENV_MAVEN_ID,
   ENV_SYCL_ID,
 } from '../../../helpers/exercise/environments.js';
 
 const COMPILER_ARGS_ENVS = [ENV_C_GCC_ID, ENV_CPP_GCC_ID, ENV_ARDUINO_ID, ENV_SYCL_ID];
 
+const validateExecTarget = value =>
+  !value || value.trim() === '' ? (
+    <FormattedMessage
+      id="app.editExerciseConfigForm.validation.execTargetInvalidName"
+      defaultMessage="Invalid goal name."
+    />
+  ) : undefined;
+
 class EditExerciseSimpleConfigTestCompilation extends Component {
   constructor(props) {
     super(props);
@@ -218,7 +227,9 @@ class EditExerciseSimpleConfigTestCompilation extends Component {
                                     }
                                     readOnly={readOnly}
                                   />
+
                                   <br />
+
                                   {possibleEntryPoints.length > 0 && (
                                     <Field
                                       name={`${test}.entry-point.${env.id}`}
@@ -234,6 +245,38 @@ class EditExerciseSimpleConfigTestCompilation extends Component {
                                       }
                                     />
                                   )}
+
+                                  {env.id === ENV_MAVEN_ID && (
+                                    /*
+                                     * A special case for Maven only
+                                     */
+                                    <FieldArray
+                                      name={`${test}.exec-targets.${env.id}`}
+                                      component={ExpandingTextField}
+                                      min={1}
+                                      maxLength={256}
+                                      validateEach={validateExecTarget}
+                                      placeholder="exec:java"
+                                      readOnly={readOnly}
+                                      label={
+                                        <>
+                                          <FormattedMessage
+                                            id="app.editExerciseSimpleConfigTests.execTargets"
+                                            defaultMessage="Execution goals:"
+                                          />
+                                          <Explanation id={`${test}.exec-targets-explanation`}>
+                                            <FormattedMessage
+                                              id="app.editExerciseSimpleConfigTests.execTargetsExplanation"
+                                              defaultMessage="Maven project goals to be executed. The default is 'exec:java'. At least one goal must be specified."
+                                            />
+                                          </Explanation>
+                                        </>
+                                      }
+                                    />
+                                    /*
+                                     * End of special case for Maven
+                                     */
+                                  )}
                                 </Col>
                               </Row>
                             </Container>
diff --git a/src/components/forms/Fields/ExpandingTextField.js b/src/components/forms/Fields/ExpandingTextField.js
@@ -10,16 +10,17 @@ import Icon, { AddIcon, CloseIcon } from '../../icons';
 
 const ExpandingTextField = ({
   fields = [],
-  meta: { active, dirty, error, warning },
   label = null,
   noItems = null,
   validateEach,
   readOnly = false,
+  min = 0,
+  max = 256,
+  meta, // we just need to exclude this from props
   ...props
 }) => (
   <div>
     {Boolean(label) && <FormLabel>{label}</FormLabel>}
-
     {fields.map((field, index) => (
       <Field
         key={index}
@@ -48,33 +49,37 @@ const ExpandingTextField = ({
                   </Button>
                 </OverlayTrigger>
               ) : (
+                fields.length < max && (
+                  <OverlayTrigger
+                    placement="top"
+                    overlay={
+                      <Tooltip id={Date.now()}>
+                        <FormattedMessage id="app.expandingTextField.tooltip.add" defaultMessage="Append a new item." />
+                      </Tooltip>
+                    }>
+                    <Button onClick={() => fields.push('')} size="xs" noShadow>
+                      <AddIcon fixedWidth />
+                    </Button>
+                  </OverlayTrigger>
+                )
+              )}
+
+              {fields.length > min && (
                 <OverlayTrigger
                   placement="top"
                   overlay={
                     <Tooltip id={Date.now()}>
-                      <FormattedMessage id="app.expandingTextField.tooltip.add" defaultMessage="Append a new item." />
+                      <FormattedMessage
+                        id="app.expandingTextField.tooltip.remove"
+                        defaultMessage="Remove this item from the list."
+                      />
                     </Tooltip>
                   }>
-                  <Button onClick={() => fields.push('')} size="xs" noShadow>
-                    <AddIcon fixedWidth />
+                  <Button onClick={() => fields.remove(index)} size="xs" noShadow>
+                    <CloseIcon fixedWidth />
                   </Button>
                 </OverlayTrigger>
               )}
-
-              <OverlayTrigger
-                placement="top"
-                overlay={
-                  <Tooltip id={Date.now()}>
-                    <FormattedMessage
-                      id="app.expandingTextField.tooltip.remove"
-                      defaultMessage="Remove this item from the list."
-                    />
-                  </Tooltip>
-                }>
-                <Button onClick={() => fields.remove(index)} size="xs" noShadow>
-                  <CloseIcon fixedWidth />
-                </Button>
-              </OverlayTrigger>
             </>
           )
         }
@@ -120,6 +125,8 @@ ExpandingTextField.propTypes = {
   noItems: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
   validateEach: PropTypes.func,
   readOnly: PropTypes.bool,
+  min: PropTypes.number,
+  max: PropTypes.number,
 };
 
 export default ExpandingTextField;
diff --git a/src/components/forms/Fields/TextField.js b/src/components/forms/Fields/TextField.js
@@ -7,7 +7,7 @@ import * as styles from './commonStyles.less';
 
 const TextField = ({
   input: { value, ...input },
-  meta: { active, dirty, error = null, warning = null },
+  meta: { active, dirty, error = null, warning = null, ...restMeta },
   type = 'text',
   label = null,
   groupClassName = '',
diff --git a/src/helpers/exercise/configSimple.js b/src/helpers/exercise/configSimple.js
@@ -1,15 +1,16 @@
 import { lruMemoize } from 'reselect';
 import { safeGet, encodeNumId, identity, deepReduce, objectMap, EMPTY_ARRAY } from '../common.js';
 import {
+  ENV_ARDUINO_ID,
+  ENV_C_GCC_ID,
+  ENV_CPP_GCC_ID,
   ENV_DATA_ONLY_ID,
+  ENV_GROOVY_ID,
+  ENV_HASKELL_ID,
   ENV_JAVA_ID,
   ENV_KOTLIN_ID,
-  ENV_GROOVY_ID,
+  ENV_MAVEN_ID,
   ENV_SCALA_ID,
-  ENV_HASKELL_ID,
-  ENV_C_GCC_ID,
-  ENV_CPP_GCC_ID,
-  ENV_ARDUINO_ID,
   ENV_SYCL_ID,
 } from './environments.js';
 
@@ -306,6 +307,7 @@ const _PIPELINE_DEFAULT_VARS_DESCRIPTORS = [
     .individualEnvs()
     .forCompilation()
     .setRuntimeFilter([ENV_C_GCC_ID, ENV_CPP_GCC_ID, ENV_ARDUINO_ID, ENV_SYCL_ID]),
+  new Variable('exec-targets', 'string[]', ['exec:java']).individualEnvs().setRuntimeFilter([ENV_MAVEN_ID]),
   new Variable('entry-point', 'file')
     .individualEnvs()
     .setPipelineFilter('hasEntryPoint')
diff --git a/src/locales/cs.json b/src/locales/cs.json
@@ -443,6 +443,7 @@
   "app.editExerciseConfigForm.validation.ambiguousEntryPoint": "Některé vstupní body tohoto běhového prostředí byly nastaveny a některé byly ponechány k nastavení studentem při odevzdání, což může být poměrně matoucí.",
   "app.editExerciseConfigForm.validation.duplicateFile": "Nalezen duplicitní soubor.",
   "app.editExerciseConfigForm.validation.duplicateFileName": "Nalezeno duplicitní jméno. Aliasy vstupních souborů musí být unikátní.",
+  "app.editExerciseConfigForm.validation.execTargetInvalidName": "Neplatné jméno cíle.",
   "app.editExerciseConfigForm.validation.fileDoesNotExist": "Zde byl vybrán neexistující soubor \"{file}\".",
   "app.editExerciseConfigForm.validation.noFileSelected": "Prosíme, vyberte soubor.",
   "app.editExerciseConfigForm.validation.stdinFileEmpty": "Prosíme, vyberte soubor pro std. vstup.",
@@ -486,6 +487,8 @@
   "app.editExerciseSimpleConfigTests.customJudgeBinary": "Spustitelný soubor sudího:",
   "app.editExerciseSimpleConfigTests.entryPoint": "Vstupní bod (zaváděcí soubor):",
   "app.editExerciseSimpleConfigTests.entryPointLabel": "Identifikátor vstupního bodu:",
+  "app.editExerciseSimpleConfigTests.execTargets": "Cíle ke spuštění:",
+  "app.editExerciseSimpleConfigTests.execTargetsExplanation": "Cíle maven projektu ke spuštění. Výchozí cíl je 'exec:java'. Alespoň jeden cíl musí být specifikován.",
   "app.editExerciseSimpleConfigTests.executionArguments": "Spouštěcí argumenty:",
   "app.editExerciseSimpleConfigTests.expectedOutput": "Očekávaný výstup:",
   "app.editExerciseSimpleConfigTests.extraFilesActual": "Přídavný soubor:",
@@ -2158,4 +2161,4 @@
   "recodex-judge-shuffle-all": "Sudí neuspořádaných tokenů a řádků",
   "recodex-judge-shuffle-newline": "Sudí neuspořádaných tokenů (ignorující konce řádků)",
   "recodex-judge-shuffle-rows": "Sudí neuspořádaných řádků"
-}
+}
diff --git a/src/locales/en.json b/src/locales/en.json
@@ -443,6 +443,7 @@
   "app.editExerciseConfigForm.validation.ambiguousEntryPoint": "Some entry points of this environment are specified whilst some are left to be specified by the student. This may be quite ambiguous.",
   "app.editExerciseConfigForm.validation.duplicateFile": "Duplicate file detected.",
   "app.editExerciseConfigForm.validation.duplicateFileName": "Duplicate name detected.",
+  "app.editExerciseConfigForm.validation.execTargetInvalidName": "Invalid goal name.",
   "app.editExerciseConfigForm.validation.fileDoesNotExist": "File \"{file}\" was selected here, but no such file exists.",
   "app.editExerciseConfigForm.validation.noFileSelected": "Please select a file.",
   "app.editExerciseConfigForm.validation.stdinFileEmpty": "Please, fill in the std. input file.",
@@ -486,6 +487,8 @@
   "app.editExerciseSimpleConfigTests.customJudgeBinary": "Custom judge executable:",
   "app.editExerciseSimpleConfigTests.entryPoint": "Point of entry (bootstrap file):",
   "app.editExerciseSimpleConfigTests.entryPointLabel": "Entry point identifier:",
+  "app.editExerciseSimpleConfigTests.execTargets": "Execution goals:",
+  "app.editExerciseSimpleConfigTests.execTargetsExplanation": "Maven project goals to be executed. The default is 'exec:java'. At least one goal must be specified.",
   "app.editExerciseSimpleConfigTests.executionArguments": "Execution arguments:",
   "app.editExerciseSimpleConfigTests.expectedOutput": "Expected output:",
   "app.editExerciseSimpleConfigTests.extraFilesActual": "Extra file:",
diff --git a/src/redux/modules/exerciseConfigs.js b/src/redux/modules/exerciseConfigs.js
@@ -347,6 +347,7 @@ export const exerciseConfigFormSmartFillAll = (formName, firstTestId, tests, fil
     'entry-point-string', // standalone, used for Haskell
     'jar-files',
     'compile-args',
+    'exec-targets',
   ]);
 
 export const exerciseConfigFormSmartFillInput = (formName, firstTestId, tests, files) =>
@@ -375,6 +376,7 @@ export const exerciseConfigFormSmartFillCompilation = (formName, firstTestId, te
     'entry-point',
     'jar-files',
     'compile-args',
+    'exec-targets',
   ]);
 
 export const exerciseConfigFormSmartFillExtraFiles = (formName, firstTestId, tests, files) =>
