Fixing bugs, ux improvements.

Author: krulis-martin

src/components/Exercises/FilesTable/FilesLinksTable.js

@@ -229,7 +229,7 @@ const FilesLinksTable = ({
           </Modal.Title>
         </Modal.Header>
         <Modal.Body>
-          <ExerciseFilesTableContainer exercise={exercise} exerciseFilesLinks={links} noBox noRemove />
+          <ExerciseFilesTableContainer exercise={exercise} noBox noRemove />
         </Modal.Body>
       </Modal>
 

src/components/forms/EditExerciseForm/EditExerciseForm.js

@@ -11,7 +11,6 @@ import Callout from '../../widgets/Callout';
 import FormBox from '../../widgets/FormBox';
 import SubmitButton from '../SubmitButton';
 import LocalizedTextsFormField from '../LocalizedTextsFormField';
-import { LocalizedExerciseName } from '../../helpers/LocalizedNames';
 import { validateExercise } from '../../../redux/modules/exercises.js';
 import { validateLocalizedTextsFormData, replaceLinkKeysWithUrls } from '../../../helpers/localizedData.js';
 import Explanation from '../../widgets/Explanation';
@@ -44,7 +43,6 @@ const previewPreprocessor = lruMemoize(
 
 const EditExerciseForm = ({
   localizedTextsLinks,
-  initialValues: exercise,
   error,
   dirty,
   submitting,
@@ -57,13 +55,7 @@ const EditExerciseForm = ({
 }) => (
   <FormBox
     id="texts-form"
-    title={
-      <FormattedMessage
-        id="app.editExerciseForm.title"
-        defaultMessage="Edit exercise {name}"
-        values={{ name: <LocalizedExerciseName entity={exercise} /> }}
-      />
-    }
+    title={<FormattedMessage id="app.editExerciseForm.title" defaultMessage="Texts and Settings of The Exercise" />}
     succeeded={submitSucceeded}
     dirty={dirty}
     footer={

src/containers/ExerciseFilesLinksContainer/ExerciseFilesLinksContainer.js

@@ -11,7 +11,7 @@ import Box from '../../components/widgets/Box';
 
 import { fetchFilesForExercise } from '../../redux/modules/exerciseFiles.js';
 import {
-  fetchExerciseFileLinksIfNeeded,
+  fetchExerciseFilesLinksIfNeeded,
   createExerciseFileLink,
   updateExerciseFileLink,
   removeExerciseFileLink,
@@ -113,7 +113,7 @@ export default connect(
     };
   },
   (dispatch, { exercise }) => ({
-    loadLinks: () => dispatch(fetchExerciseFileLinksIfNeeded(exercise.id)),
+    loadLinks: () => dispatch(fetchExerciseFilesLinksIfNeeded(exercise.id)),
     loadFiles: () => dispatch(fetchFilesForExercise(exercise.id)),
     createLink: data => dispatch(createExerciseFileLink(exercise.id, processLinkBody(data, false))),
     updateLink: ({ id, ...data }) =>

src/containers/ExerciseFilesTableContainer/ExerciseFilesTableContainer.js

@@ -16,7 +16,7 @@ import {
   downloadExerciseFilesArchive,
 } from '../../redux/modules/exerciseFiles.js';
 import { download } from '../../redux/modules/files.js';
-import { fetchExerciseFileLinks, fetchExerciseFileLinksIfNeeded } from '../../redux/modules/exerciseFilesLinks.js';
+import { fetchExerciseFilesLinks, fetchExerciseFilesLinksIfNeeded } from '../../redux/modules/exerciseFilesLinks.js';
 import { getFilesForExercise, fetchFilesForExerciseStatus } from '../../redux/selectors/exerciseFiles.js';
 import { getExerciseFilesLinks } from '../../redux/selectors/exerciseFilesLinks.js';
 
@@ -96,10 +96,10 @@ export default connect(
     loadFiles: () =>
       Promise.all([
         dispatch(fetchFilesForExercise(exercise.id)),
-        dispatch(fetchExerciseFileLinksIfNeeded(exercise.id)),
+        dispatch(fetchExerciseFilesLinksIfNeeded(exercise.id)),
       ]),
     addFiles: files =>
-      dispatch(addExerciseFiles(exercise.id, files)).then(() => dispatch(fetchExerciseFileLinks(exercise.id))),
+      dispatch(addExerciseFiles(exercise.id, files)).then(() => dispatch(fetchExerciseFilesLinks(exercise.id))),
     removeFile: id => dispatch(removeExerciseFile(exercise.id, id)),
     downloadFile: (ev, id) => {
       ev.preventDefault();

src/locales/cs.json

@@ -454,7 +454,7 @@
   "app.editExerciseForm.mergeJudgeLogs": "Spojit logy sudího",
   "app.editExerciseForm.solutionFilesLimit": "Max. počet souborů řešení:",
   "app.editExerciseForm.solutionSizeLimit": "Max. velikost řešení [KiB]:",
-  "app.editExerciseForm.title": "Upravit nastavení úlohy {name}",
+  "app.editExerciseForm.title": "Texty a nastavení úlohy",
   "app.editExerciseForm.validation.difficulty": "Prosíme vyberte obtížnost úlohy.",
   "app.editExerciseForm.validation.emptyName": "Prosíme vyplňte název úlohy.",
   "app.editExerciseForm.validation.versionDiffers": "Někdo změnil tuto úlohu v průběhu její editace. Prosíme obnovte tuto stránku a proveďte své změny znovu.",

src/locales/en.json

@@ -454,7 +454,7 @@
   "app.editExerciseForm.mergeJudgeLogs": "Merge judge logs",
   "app.editExerciseForm.solutionFilesLimit": "Solution files limit:",
   "app.editExerciseForm.solutionSizeLimit": "Solution total size [KiB] limit:",
-  "app.editExerciseForm.title": "Edit exercise {name}",
+  "app.editExerciseForm.title": "Texts and Settings of The Exercise",
   "app.editExerciseForm.validation.difficulty": "Please select the difficulty of the exercise.",
   "app.editExerciseForm.validation.emptyName": "Please fill the name of the exercise.",
   "app.editExerciseForm.validation.versionDiffers": "Somebody has changed the exercise while you have been editing it. Please reload the page and apply your changes once more.",
@@ -2167,4 +2167,4 @@
   "recodex-judge-shuffle-all": "Unordered-tokens-and-rows judge",
   "recodex-judge-shuffle-newline": "Unordered-tokens judge (ignoring ends of lines)",
   "recodex-judge-shuffle-rows": "Unordered-rows judge"
-}
+}

src/redux/modules/exerciseFilesLinks.js

@@ -9,7 +9,7 @@ import factory, {
 } from '../helpers/resourceManager';
 import { arrayToObject } from '../../helpers/common.js';
 
-const resourceName = 'exerciseFileLinks';
+const resourceName = 'exerciseFilesLinks';
 const { actions, actionTypes, reduceActions } = factory({
   resourceName,
   apiEndpointFactory: id => `/exercises/${id}/file-links`,
@@ -22,13 +22,13 @@ const { actions, actionTypes, reduceActions } = factory({
 export { actionTypes };
 
 export const additionalActionTypes = {
-  ...createActionsWithPostfixes('CREATE_FILE_LINK', 'recodex/exerciseFileLinks'),
-  ...createActionsWithPostfixes('UPDATE_FILE_LINK', 'recodex/exerciseFileLinks'),
-  ...createActionsWithPostfixes('REMOVE_FILE_LINK', 'recodex/exerciseFileLinks'),
+  ...createActionsWithPostfixes('CREATE_FILE_LINK', 'recodex/exerciseFilesLinks'),
+  ...createActionsWithPostfixes('UPDATE_FILE_LINK', 'recodex/exerciseFilesLinks'),
+  ...createActionsWithPostfixes('REMOVE_FILE_LINK', 'recodex/exerciseFilesLinks'),
 };
 
-export const fetchExerciseFileLinks = actions.fetchResource;
-export const fetchExerciseFileLinksIfNeeded = actions.fetchOneIfNeeded;
+export const fetchExerciseFilesLinks = actions.fetchResource;
+export const fetchExerciseFilesLinksIfNeeded = actions.fetchOneIfNeeded;
 
 export const createExerciseFileLink = (exerciseId, body) =>
   createApiAction({