Refactoring and fixing sorting issues.

Author: krulis-martin

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

@@ -6,7 +6,7 @@ import { Row, Col } from 'react-bootstrap';
 import Button from '../../../widgets/TheButton';
 import Callout from '../../../widgets/Callout';
 import DateTime from '../../../widgets/DateTime';
-import { getSyncMessages } from '../assignmentSyncHelper';
+import { getSyncMessages } from '../../../helpers/assignments';
 
 const AssignmentSync = ({ syncInfo, exerciseSync }) => {
   const messages = getSyncMessages(syncInfo);

src/components/Assignments/Assignment/AssignmentSyncIcon/AssignmentSyncIcon.js

@@ -5,7 +5,7 @@ import { OverlayTrigger, Popover } from 'react-bootstrap';
 
 import DateTime from '../../../widgets/DateTime';
 import { WarningIcon } from '../../../icons';
-import { isUpToDate } from '../assignmentSyncHelper';
+import { isUpToDate } from '../../../helpers/assignments';
 
 const AssignmentSyncIcon = ({ id, syncInfo, ...props }) => {
   return !isUpToDate(syncInfo) ? (

src/components/Assignments/Assignment/AssignmentTableRow/AssignmentTableRow.js

@@ -72,7 +72,9 @@ const AssignmentTableRow = ({
       )}
       <MaybeBonusAssignmentIcon gapLeft id={id} isBonus={isBonus} />
 
-      {exerciseSynchronizationInfo && <AssignmentSyncIcon id={id} syncInfo={exerciseSynchronizationInfo} gapLeft />}
+      {(permissionHints.update || permissionHints.viewAssignmentSolutions) && exerciseSynchronizationInfo && (
+        <AssignmentSyncIcon id={id} syncInfo={exerciseSynchronizationInfo} gapLeft />
+      )}
     </td>
 
     {showNames && (

src/components/Assignments/Assignment/AssignmentsTable/AssignmentsTable.js

@@ -11,11 +11,10 @@ import AssignmentTableRow, { LoadingAssignmentTableRow } from '../AssignmentTabl
 import CommentThreadContainer from '../../../../containers/CommentThreadContainer';
 import Icon, { DeleteIcon, InvertIcon, LoadingIcon, RefreshIcon, SquareIcon, VisibleIcon } from '../../../icons';
 import Button, { TheButtonGroup } from '../../../widgets/TheButton';
-import { compareAssignmentsReverted, isBeforeDeadline } from '../../../helpers/assignments';
+import { compareAssignmentsReverted, isBeforeDeadline, isUpToDate } from '../../../helpers/assignments';
 import { LocalizedExerciseName } from '../../../helpers/LocalizedNames';
 import { EMPTY_LIST, EMPTY_OBJ, EMPTY_ARRAY } from '../../../../helpers/common';
 import { prepareInitialValues, transformSubmittedData } from '../../../forms/EditAssignmentForm';
-import { isUpToDate } from '../assignmentSyncHelper';
 
 const fetchAssignmentStatus = (statuses, assignmentId) => {
   const assignStatus =

src/components/Assignments/Assignment/assignmentSyncHelper.js

@@ -1,3 +1,62 @@
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+import { defaultMemoize } from 'reselect';
+import Explanation from '../widgets/Explanation';
+
+const syncMessages = {
+  supplementaryFiles: (
+    <FormattedMessage id="app.assignment.syncSupplementaryFiles" defaultMessage="Supplementary files" />
+  ),
+  attachmentFiles: <FormattedMessage id="app.assignment.syncAttachmentFiles" defaultMessage="Text attachment files" />,
+  exerciseTests: <FormattedMessage id="app.assignment.syncExerciseTests" defaultMessage="Exercise tests" />,
+  localizedTexts: <FormattedMessage id="app.assignment.syncLocalizedTexts" defaultMessage="Localized texts" />,
+  configurationType: (
+    <FormattedMessage
+      id="app.assignment.syncConfigurationType"
+      defaultMessage="Configuration was switched to advanced mode"
+    />
+  ),
+  scoreConfig: <FormattedMessage id="app.assignment.syncScoreConfig" defaultMessage="Score configuration" />,
+  exerciseConfig: <FormattedMessage id="app.assignment.syncExerciseConfig" defaultMessage="Exercise configuration" />,
+  runtimeEnvironments: (
+    <FormattedMessage id="app.assignment.syncRuntimeEnvironments" defaultMessage="Selection of runtime environments" />
+  ),
+  exerciseEnvironmentConfigs: (
+    <FormattedMessage id="app.assignment.syncExerciseEnvironmentConfigs" defaultMessage="Environment configuration" />
+  ),
+  hardwareGroups: <FormattedMessage id="app.assignment.syncHardwareGroups" defaultMessage="Hardware groups" />,
+  limits: <FormattedMessage id="app.assignment.syncLimits" defaultMessage="Limits" />,
+  mergeJudgeLogs: (
+    <span>
+      <FormattedMessage id="app.assignment.syncMergeJudgeLogs" defaultMessage="Judge logs merge flag" />
+      <Explanation id="syncMergeJudgeLogs">
+        <FormattedMessage
+          id="app.exercise.mergeJudgeLogsExplanation"
+          defaultMessage="The merge flag indicates whether primary (stdout) and secondary (stderr) judge logs are are concatenated in one log (which should be default for built-in judges). If the logs are separated, the visibility of each part may be controlled idividually in assignments. That might be helpful if you need to pass two separate logs from a custom judge (e.g., one is for students and one is for supervisors)."
+        />
+      </Explanation>
+    </span>
+  ),
+};
+
+export const getSyncMessages = syncInfo => {
+  const res = [];
+  for (const field in syncMessages) {
+    if (!syncInfo[field]) {
+      continue;
+    }
+
+    if (!syncInfo[field].upToDate) {
+      res.push(<li key={field}>{syncMessages[field]}</li>);
+    }
+  }
+  return res;
+};
+
+export const isUpToDate = defaultMemoize(syncInfo =>
+  Object.keys(syncMessages).every(field => syncInfo[field] && syncInfo[field].upToDate)
+);
+
 export const compareAssignments = (a, b) => {
   // first compare by deadline
   if (a.firstDeadline < b.firstDeadline) {
@@ -19,8 +78,8 @@ export const compareAssignments = (a, b) => {
         // if second deadlines are equal, continue
       }
 
-      // none of them have second deadline or they are queal, compare creation times
-      return b.createdAt - a.createdAt;
+      // none of them have second deadline or they are equal, compare creation times
+      return b.createdAt - a.createdAt || a.id.localeCompare(b.id);
     }
   } else {
     return 1;