Adding buttons for selective partial assignment sync with the exercise.

Author: krulis-martin

src/components/Assignments/Assignment/AssignmentSync/AssignmentSync.js

@@ -3,10 +3,11 @@ import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import { Row, Col } from 'react-bootstrap';
 
-import Button from '../../../widgets/TheButton';
+import Button, { TheButtonGroup } from '../../../widgets/TheButton';
 import Callout from '../../../widgets/Callout';
 import DateTime from '../../../widgets/DateTime';
 import { getSyncMessages } from '../../../helpers/assignments.js';
+import { SYNC_OPTIONS_ALL, SYNC_OPTIONS_TEXTS, SYNC_OPTIONS_CONFIG } from '../../../../redux/modules/assignments.js';
 
 const AssignmentSync = ({ syncInfo, exerciseSync }) => {
   const messages = getSyncMessages(syncInfo);
@@ -39,9 +40,41 @@ const AssignmentSync = ({ syncInfo, exerciseSync }) => {
             <ul>{messages}</ul>
           </div>
           <p>
-            <Button variant="primary" onClick={exerciseSync} disabled={!syncInfo.isSynchronizationPossible}>
-              <FormattedMessage id="app.assignment.syncButton" defaultMessage="Update Assignment" />
-            </Button>
+            <TheButtonGroup>
+              {(syncInfo.localizedTexts?.upToDate === false || syncInfo.fileLinks?.upToDate === false) && (
+                <Button
+                  variant="primary"
+                  onClick={() => exerciseSync(SYNC_OPTIONS_TEXTS)}
+                  disabled={!syncInfo.isSynchronizationPossible}>
+                  <FormattedMessage id="app.assignment.syncTextsButton" defaultMessage="Update Texts" />
+                </Button>
+              )}
+
+              {(syncInfo.files?.upToDate === false ||
+                syncInfo.exerciseTests?.upToDate === false ||
+                syncInfo.configurationType?.upToDate === false ||
+                syncInfo.scoreConfig?.upToDate === false ||
+                syncInfo.exerciseConfig?.upToDate === false ||
+                syncInfo.runtimeEnvironments?.upToDate === false ||
+                syncInfo.exerciseEnvironmentConfigs?.upToDate === false ||
+                syncInfo.hardwareGroups?.upToDate === false ||
+                syncInfo.limits?.upToDate === false ||
+                syncInfo.mergeJudgeLogs?.upToDate === false) && (
+                <Button
+                  variant="primary"
+                  onClick={() => exerciseSync(SYNC_OPTIONS_CONFIG)}
+                  disabled={!syncInfo.isSynchronizationPossible}>
+                  <FormattedMessage id="app.assignment.syncConfigButton" defaultMessage="Update Configuration" />
+                </Button>
+              )}
+
+              <Button
+                variant="primary"
+                onClick={() => exerciseSync(SYNC_OPTIONS_ALL)}
+                disabled={!syncInfo.isSynchronizationPossible}>
+                <FormattedMessage id="app.assignment.syncAllButton" defaultMessage="Update Whole Assignment" />
+              </Button>
+            </TheButtonGroup>
 
             {!syncInfo.isSynchronizationPossible && (
               <span style={{ marginLeft: '2em' }} className="text-body-secondary">

src/locales/cs.json

@@ -126,8 +126,9 @@
   "app.assignment.submissionCounterDecreasedByNotEvaluated": "Řešení, která nebyla vyhodnocena nebo jejich vyhodnocení selhalo, se nepočítají do limitu odevzdaných řešení.",
   "app.assignment.submissionsCountLimit": "Počet pokusů",
   "app.assignment.submissionsCountLimitExplanation": "Maximální počet odevzdaných řešení této úlohy od jednoho studenta. Vyučující můž udělit další pokusy tak, že smaže starší odevzdaná řešení.",
-  "app.assignment.syncButton": "Aktualizovat zadání",
+  "app.assignment.syncAllButton": "Aktualizovat celou úlohu",
   "app.assignment.syncButton.exerciseBroken": "Aktualizační tlačítko je zakázané, protože konfigurace úlohy je rozbitá. Nejprve musíte úlohu opravit.",
+  "app.assignment.syncConfigButton": "Aktualizovat konfiguraci",
   "app.assignment.syncConfigurationType": "Konfigurace byla přepnuta do pokročilého módu",
   "app.assignment.syncDescription": "Aktualizovány byly následující položky:",
   "app.assignment.syncExerciseConfig": "Konfigurace úlohy",
@@ -144,6 +145,7 @@
   "app.assignment.syncRequiredTitle": "Data úlohy jsou novější než data zadané úlohy",
   "app.assignment.syncRuntimeEnvironments": "Výběr běhového prostředí",
   "app.assignment.syncScoreConfig": "Konfigurace skóre",
+  "app.assignment.syncTextsButton": "Aktualizovat texty",
   "app.assignment.title": "Podrobnosti zadané úlohy",
   "app.assignment.visible": "Viditelná studentům",
   "app.assignment.visibleFrom": "Viditelná od",

src/locales/en.json

@@ -126,8 +126,9 @@
   "app.assignment.submissionCounterDecreasedByNotEvaluated": "Failed and not evaluated submissions are not counted when restricting submission attempts.",
   "app.assignment.submissionsCountLimit": "Submission attempts",
   "app.assignment.submissionsCountLimitExplanation": "Maximal number of solutions logged by one student for this assignment. The teacher may choose to grant additional attempts by deleting old solutions.",
-  "app.assignment.syncButton": "Update Assignment",
+  "app.assignment.syncAllButton": "Update Whole Assignment",
   "app.assignment.syncButton.exerciseBroken": "The update button is disabled since the exercise is broken. The exercise configuration must be mended first.",
+  "app.assignment.syncConfigButton": "Update Configuration",
   "app.assignment.syncConfigurationType": "Configuration was switched to advanced mode",
   "app.assignment.syncDescription": "The following sections were updated:",
   "app.assignment.syncExerciseConfig": "Exercise configuration",
@@ -144,6 +145,7 @@
   "app.assignment.syncRequiredTitle": "The exercise data are newer than assignment data",
   "app.assignment.syncRuntimeEnvironments": "Selection of runtime environments",
   "app.assignment.syncScoreConfig": "Score configuration",
+  "app.assignment.syncTextsButton": "Update Texts",
   "app.assignment.title": "Assignment Detail",
   "app.assignment.visible": "Visible to students",
   "app.assignment.visibleFrom": "Visible from",

src/pages/Assignment/Assignment.js

@@ -9,7 +9,7 @@ import Box from '../../components/widgets/Box';
 import Callout from '../../components/widgets/Callout';
 import OptionalPopoverWrapper from '../../components/widgets/OptionalPopoverWrapper';
 
-import { fetchAssignmentIfNeeded, syncWithExercise } from '../../redux/modules/assignments.js';
+import { fetchAssignmentIfNeeded, syncWithExercise, SYNC_OPTIONS_ALL } from '../../redux/modules/assignments.js';
 import { canSubmit } from '../../redux/modules/canSubmit.js';
 import {
   init,
@@ -342,7 +342,7 @@ export default injectIntl(
     (dispatch, { params: { assignmentId } }) => ({
       init: userId => () => dispatch(init(userId, assignmentId)),
       loadAsync: userId => Assignment.loadAsync({ assignmentId }, dispatch, { userId }),
-      exerciseSync: () => dispatch(syncWithExercise(assignmentId)),
+      exerciseSync: (syncOptions = SYNC_OPTIONS_ALL) => dispatch(syncWithExercise(assignmentId, syncOptions)),
       reloadCanSubmit: () => dispatch(canSubmit(assignmentId)),
       reloadSolvers: (assignmentId, userId) => dispatch(fetchAssignmentSolvers({ assignmentId, userId })),
     })

src/pages/EditAssignment/EditAssignment.js

@@ -27,6 +27,7 @@ import {
   editAssignment,
   editAssignmentLocalizedTexts,
   syncWithExercise,
+  SYNC_OPTIONS_ALL,
   validateAssignment,
   fetchAssignmentAsyncJobs,
 } from '../../redux/modules/assignments.js';
@@ -227,6 +228,7 @@ class EditAssignment extends Component {
                       form="editAssignmentLocalizedTexts"
                       initialValues={assignment ? prepareEditLocalizedTextsInitialValues(assignment) : {}}
                       onSubmit={this.editLocalizedTextsSubmitHandler}
+                      localizedTextsLinks={assignment.localizedTextsLinks}
                     />
                   )}
                 </ResourceRenderer>
@@ -314,7 +316,7 @@ export default withLinks(
         dispatch(editAssignmentLocalizedTexts(assignmentId, data)).then(() =>
           dispatch(fetchAssignmentAsyncJobs(assignmentId))
         ),
-      exerciseSync: () => dispatch(syncWithExercise(assignmentId)),
+      exerciseSync: (syncOptions = SYNC_OPTIONS_ALL) => dispatch(syncWithExercise(assignmentId, syncOptions)),
       validateAssignment: version => dispatch(validateAssignment(assignmentId, version)),
     })
   )(EditAssignment)

src/pages/ExerciseAssignments/ExerciseAssignments.js

@@ -27,6 +27,7 @@ import {
   editAssignment,
   deleteAssignment,
   syncWithExercise,
+  SYNC_OPTIONS_ALL,
   fetchExerciseAssignments,
 } from '../../redux/modules/assignments.js';
 import { exerciseSelector } from '../../redux/selectors/exercises.js';
@@ -296,7 +297,7 @@ export default connect(
   (dispatch, { params: { exerciseId } }) => ({
     loadAsync: () => ExerciseAssignments.loadAsync({ exerciseId }, dispatch),
     assignExercise: groupId => dispatch(assignExercise(groupId, exerciseId)),
-    syncAssignment: id => dispatch(syncWithExercise(id)),
+    syncAssignment: (id, syncOptions = SYNC_OPTIONS_ALL) => dispatch(syncWithExercise(id, syncOptions)),
     editAssignment: (id, body) => dispatch(editAssignment(id, body)),
     deleteAssignment: id => dispatch(deleteAssignment(id)),
     sendNotification: message => dispatch(sendNotification(exerciseId, message)),

src/redux/modules/assignments.js

@@ -63,11 +63,26 @@ export const validateAssignment = (id, version) =>
     body: { version },
   });
 
-export const syncWithExercise = assignmentId =>
+export const SYNC_OPTIONS_ALL = [];
+export const SYNC_OPTIONS_TEXTS = ['localizedTexts', 'fileLinks'];
+export const SYNC_OPTIONS_CONFIG = [
+  'configurationType',
+  'exerciseConfig',
+  'exerciseEnvironmentConfigs',
+  'exerciseTests',
+  'files',
+  'hardwareGroups',
+  'limits',
+  'mergeJudgeLogs',
+  'runtimeEnvironments',
+  'scoreConfig',
+];
+export const syncWithExercise = (assignmentId, syncOptions = SYNC_OPTIONS_ALL) =>
   createApiAction({
     type: additionalActionTypes.SYNC_ASSIGNMENT,
     endpoint: `/exercise-assignments/${assignmentId}/sync-exercise`,
     method: 'POST',
+    body: { syncOptions },
     meta: { assignmentId },
   });