Allowing solution files to be always downloaded in ZIP archive. Changing name of that ZIP file to include name of the author.

Author: Martin Krulis

src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js

@@ -139,9 +139,9 @@ class ReferenceSolutionDetail extends Component {
                     </a>
                   </Col>
                 ))}
-              {files.length > 1 && (
+              {files.length > 0 && (
                 <Col lg={6} md={12}>
-                  <DownloadSolutionArchiveContainer solutionId={id} isReference={true} />
+                  <DownloadSolutionArchiveContainer solutionId={id} submittedBy={submittedBy} isReference={true} />
                 </Col>
               )}
             </Row>

src/components/Solutions/SolutionDetail/SolutionDetail.js

@@ -130,9 +130,9 @@ class SolutionDetail extends Component {
                     </a>
                   </Col>
                 ))}
-              {files.length > 1 && (
+              {files.length > 0 && (
                 <Col lg={6} md={12}>
-                  <DownloadSolutionArchiveContainer solutionId={id} />
+                  <DownloadSolutionArchiveContainer solutionId={id} submittedBy={submittedBy} />
                 </Col>
               )}
             </Row>

src/containers/DownloadSolutionArchiveContainer/DownloadSolutionArchiveContainer.js

@@ -1,54 +1,76 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
 import { FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 
 import { downloadSolutionArchive } from '../../redux/modules/submissionEvaluations';
 import { downloadSolutionArchive as downloadRefSolutionArchive } from '../../redux/modules/referenceSolutionEvaluations';
+import { getUser } from '../../redux/selectors/users';
 import SolutionArchiveInfoBox from '../../components/Solutions/SolutionArchiveInfoBox';
 import Button from '../../components/widgets/TheButton';
 import Icon from '../../components/icons';
+import ResourceRenderer from '../../components/helpers/ResourceRenderer';
+import { toPlainAscii } from '../../helpers/common';
 
-const DownloadResultArchiveContainer = ({
+const solutionArchiveFileName = (solutionId, user) => {
+  const name = toPlainAscii(`${user.name.lastName}-${user.name.firstName}`);
+  return `${name}_${solutionId}.zip`;
+};
+
+const DownloadSolutionArchiveContainer = ({
   solutionId,
   downloadSolutionArchive,
   downloadRefSolutionArchive,
   isReference = false,
   simpleButton = false,
   variant = 'primary',
   size = null,
-}) =>
-  simpleButton ? (
-    <Button onClick={isReference ? downloadRefSolutionArchive : downloadSolutionArchive} variant={variant} size={size}>
-      <Icon icon={['far', 'file-archive']} gapRight />
-      <FormattedMessage id="app.solutionArchiveInfoBox.description" defaultMessage="All files in a ZIP archive" />
-    </Button>
-  ) : (
-    <a href="#" onClick={isReference ? downloadRefSolutionArchive : downloadSolutionArchive}>
-      <SolutionArchiveInfoBox id={solutionId} />
-    </a>
-  );
+  submittedByUser,
+}) => (
+  <ResourceRenderer resource={submittedByUser}>
+    {user =>
+      simpleButton ? (
+        <Button
+          onClick={isReference ? downloadRefSolutionArchive(user) : downloadSolutionArchive(user)}
+          variant={variant}
+          size={size}>
+          <Icon icon={['far', 'file-archive']} gapRight />
+          <FormattedMessage id="app.solutionArchiveInfoBox.description" defaultMessage="All files in a ZIP archive" />
+        </Button>
+      ) : (
+        <a href="#" onClick={isReference ? downloadRefSolutionArchive(user) : downloadSolutionArchive(user)}>
+          <SolutionArchiveInfoBox id={solutionId} />
+        </a>
+      )
+    }
+  </ResourceRenderer>
+);
 
-DownloadResultArchiveContainer.propTypes = {
+DownloadSolutionArchiveContainer.propTypes = {
   solutionId: PropTypes.string.isRequired,
-  downloadSolutionArchive: PropTypes.func.isRequired,
-  downloadRefSolutionArchive: PropTypes.func.isRequired,
+  submittedBy: PropTypes.string.isRequired,
   isReference: PropTypes.bool,
   simpleButton: PropTypes.bool,
   variant: PropTypes.string,
   size: PropTypes.string,
+  submittedByUser: ImmutablePropTypes.map,
+  downloadSolutionArchive: PropTypes.func.isRequired,
+  downloadRefSolutionArchive: PropTypes.func.isRequired,
 };
 
 export default connect(
-  (state, props) => ({}),
+  (state, { submittedBy }) => ({
+    submittedByUser: getUser(submittedBy)(state),
+  }),
   (dispatch, { solutionId }) => ({
-    downloadSolutionArchive: e => {
+    downloadSolutionArchive: user => e => {
       e.preventDefault();
-      dispatch(downloadSolutionArchive(solutionId));
+      dispatch(downloadSolutionArchive(solutionId, solutionArchiveFileName(solutionId, user)));
     },
-    downloadRefSolutionArchive: e => {
+    downloadRefSolutionArchive: user => e => {
       e.preventDefault();
-      dispatch(downloadRefSolutionArchive(solutionId));
+      dispatch(downloadRefSolutionArchive(solutionId, solutionArchiveFileName(solutionId, user)));
     },
   })
-)(DownloadResultArchiveContainer);
+)(DownloadSolutionArchiveContainer);

src/containers/SourceCodeViewerContainer/SourceCodeViewerContainer.js

@@ -90,13 +90,14 @@ class SourceCodeViewerContainer extends Component {
                 <FormattedMessage id="app.sourceCodeViewer.downloadButton" defaultMessage="Download file" />
               </Button>
 
-              {files.length > 1 && (
+              {files.length > 0 && (
                 <DownloadSolutionArchiveContainer
                   solutionId={solutionId}
                   simpleButton
                   size="sm"
                   variant="outline-secondary"
                   isReference={isReference}
+                  submittedBy={submittedBy}
                 />
               )}
 

src/helpers/common.js

@@ -55,8 +55,10 @@ export const safeSet = (obj, path, value) => {
 };
 
 /*
- * IDs Management
+ * String and related (ID management) functions
  */
+export const toPlainAscii = str => str && str.normalize('NFD').replace(/[^-_a-zA-Z0-9.()[\] ]/g, '');
+
 export const encodeId = id => {
   return 'BID' + btoa(id);
 };

src/pages/AssignmentStats/AssignmentStats.js

@@ -52,7 +52,7 @@ import { isReady, getJsData, getId } from '../../redux/helpers/resourceManager';
 
 import { getLocalizedName } from '../../helpers/localizedData';
 import withLinks from '../../helpers/withLinks';
-import { safeGet, identity, arrayToObject } from '../../helpers/common';
+import { safeGet, identity, arrayToObject, toPlainAscii } from '../../helpers/common';
 
 const prepareTableColumnDescriptors = defaultMemoize((loggedUserId, assignmentId, groupId, locale, links) => {
   const { SOLUTION_DETAIL_URI_FACTORY } = links;
@@ -255,7 +255,7 @@ class AssignmentStats extends Component {
     const name =
       assignment &&
       safeGet(assignment, ['localizedTexts', ({ locale }) => locale === pageLocale, 'name'], assignment.name);
-    const safeName = name && name.normalize('NFD').replace(/[^-_a-zA-Z0-9.()[\] ]/g, '');
+    const safeName = toPlainAscii(name);
     return `${safeName || assignmentId}.zip`;
   };
 

src/redux/helpers/api/download.js

@@ -1,7 +1,7 @@
 import { createApiAction } from '../../middleware/apiMiddleware';
 import { addNotification } from '../../modules/notifications';
 
-const trivialFileNameSelector = (id, state) => id;
+const trivialFileNameSelector = (id, _) => id;
 
 export const downloadHelper =
   ({ fetch, endpoint, actionType, fileNameSelector = trivialFileNameSelector, contentType }) =>