Adding icon mark and usage info for exercise files that has been linked (so they cannot be deleted).

krulis-martin · krulis-martin · commit b537949c7815 · 2025-12-05T00:33:53.000+01:00
diff --git a/src/components/Exercises/FilesTable/ExerciseFilesTableRow.js b/src/components/Exercises/FilesTable/ExerciseFilesTableRow.js
@@ -7,7 +7,7 @@ import Button from '../../widgets/TheButton';
 import DateTime from '../../widgets/DateTime';
 import { prettyPrintBytes } from '../../helpers/stringFormatters.js';
 import Confirm from '../../../components/forms/Confirm';
-import Icon, { DeleteIcon } from '../../../components/icons';
+import Icon, { DeleteIcon, LinkIcon } from '../../../components/icons';
 
 const ExerciseFilesTableRow = ({
   id,
@@ -18,6 +18,7 @@ const ExerciseFilesTableRow = ({
   removeFile,
   viewOnly,
   isBeingUsed = false,
+  linkedFilesIds,
 }) => (
   <tr>
     <td>
@@ -28,6 +29,20 @@ const ExerciseFilesTableRow = ({
       ) : (
         <span>{name}</span>
       )}
+      {linkedFilesIds?.has(id) && (
+        <LinkIcon
+          className="text-warning"
+          gapLeft={2}
+          tooltipId={`linked-${id}`}
+          tooltipPlacement="bottom"
+          tooltip={
+            <FormattedMessage
+              id="app.exerciseFiles.linkedFile"
+              defaultMessage="This file has been made accessible via a link."
+            />
+          }
+        />
+      )}
     </td>
     <td>{prettyPrintBytes(size)}</td>
     <td>
@@ -36,7 +51,34 @@ const ExerciseFilesTableRow = ({
     {!viewOnly && (
       <td className="shrink-col text-nowrap">
         {removeFile &&
-          (!isBeingUsed ? (
+          (isBeingUsed || linkedFilesIds?.has(id) ? (
+            <OverlayTrigger
+              placement="bottom"
+              overlay={
+                <Tooltip id={`cannot-delete-${id}`}>
+                  {isBeingUsed ? (
+                    <FormattedMessage
+                      id="app.exerciseFiles.cannotDeleteUsedExplain"
+                      defaultMessage="The file cannot be deleted since it is being used in the configuration."
+                    />
+                  ) : (
+                    <FormattedMessage
+                      id="app.exerciseFiles.cannotDeleteLinkedExplain"
+                      defaultMessage="The file cannot be deleted since it has an associated download link."
+                    />
+                  )}
+                </Tooltip>
+              }>
+              <em className="text-body-secondary">
+                {isBeingUsed ? (
+                  <Icon icon="paperclip" gapRight={2} className="text-success" />
+                ) : (
+                  <LinkIcon className="text-success" gapRight={2} />
+                )}
+                <FormattedMessage id="generic.inUse" defaultMessage="in use" />
+              </em>
+            </OverlayTrigger>
+          ) : (
             <Confirm
               id={id}
               onConfirmed={() => removeFile(id)}
@@ -52,22 +94,6 @@ const ExerciseFilesTableRow = ({
                 <FormattedMessage id="generic.delete" defaultMessage="Delete" />
               </Button>
             </Confirm>
-          ) : (
-            <OverlayTrigger
-              placement="bottom"
-              overlay={
-                <Tooltip id={`cannot-delete-${id}`}>
-                  <FormattedMessage
-                    id="app.exerciseFiles.cannotDeleteExplain"
-                    defaultMessage="The file cannot be deleted since it is being used in the configuration."
-                  />
-                </Tooltip>
-              }>
-              <em className="text-body-secondary">
-                <Icon icon="paperclip" gapRight={2} className="text-success" />
-                <FormattedMessage id="generic.inUse" defaultMessage="in use" />
-              </em>
-            </OverlayTrigger>
           ))}
       </td>
     )}
@@ -83,6 +109,7 @@ ExerciseFilesTableRow.propTypes = {
   removeFile: PropTypes.func,
   viewOnly: PropTypes.bool,
   isBeingUsed: PropTypes.bool,
+  linkedFilesIds: PropTypes.instanceOf(Set),
 };
 
 export default ExerciseFilesTableRow;
diff --git a/src/components/Exercises/FilesTable/FilesLinksTable.js b/src/components/Exercises/FilesTable/FilesLinksTable.js
@@ -229,7 +229,7 @@ const FilesLinksTable = ({
           </Modal.Title>
         </Modal.Header>
         <Modal.Body>
-          <ExerciseFilesTableContainer exercise={exercise} noBox noRemove />
+          <ExerciseFilesTableContainer exercise={exercise} exerciseFilesLinks={links} noBox noRemove />
         </Modal.Body>
       </Modal>
 
diff --git a/src/components/Exercises/FilesTable/FilesTable.js b/src/components/Exercises/FilesTable/FilesTable.js
@@ -29,6 +29,7 @@ const FilesTable = ({
   viewOnly = false,
   noRemove = false,
   downloadArchive,
+  ...restProps
 }) => (
   <div>
     {description && (
@@ -56,13 +57,14 @@ const FilesTable = ({
       {files.length > 0 && (
         <Table responsive>
           <thead>
-            <HeaderComponent viewOnly={viewOnly} />
+            <HeaderComponent {...restProps} viewOnly={viewOnly} />
           </thead>
           <tbody>
             {files
               .sort((a, b) => a.name.localeCompare(b.name, intl.locale))
               .map((fileData, i) => (
                 <RowComponent
+                  {...restProps}
                   {...fileData}
                   removeFile={noRemove ? null : removeFile}
                   downloadFile={downloadFile}
diff --git a/src/containers/ExerciseFilesTableContainer/ExerciseFilesTableContainer.js b/src/containers/ExerciseFilesTableContainer/ExerciseFilesTableContainer.js
@@ -3,9 +3,11 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { FormattedMessage } from 'react-intl';
+import { lruMemoize } from 'reselect';
 
 import FilesTableContainer from '../FilesTableContainer';
 import { ExerciseFilesTableHeaderRow, ExerciseFilesTableRow } from '../../components/Exercises/FilesTable';
+import { InfoIcon } from '../../components/icons/index.js';
 
 import {
   fetchFilesForExercise,
@@ -14,13 +16,21 @@ import {
   downloadExerciseFilesArchive,
 } from '../../redux/modules/exerciseFiles.js';
 import { download } from '../../redux/modules/files.js';
+import { fetchExerciseFileLinks, fetchExerciseFileLinksIfNeeded } from '../../redux/modules/exerciseFilesLinks.js';
 import { getFilesForExercise, fetchFilesForExerciseStatus } from '../../redux/selectors/exerciseFiles.js';
-import { InfoIcon } from '../../components/icons/index.js';
+import { getExerciseFilesLinks } from '../../redux/selectors/exerciseFilesLinks.js';
+
+import { isReadyOrReloading, getJsData } from '../../redux/helpers/resourceManager';
+
+const createFilesLinksIndex = lruMemoize(filesLinks =>
+  isReadyOrReloading(filesLinks) ? new Set(Object.values(getJsData(filesLinks)).map(link => link.exerciseFileId)) : null
+);
 
 const ExerciseFilesTableContainer = ({
   exercise,
   exerciseFiles,
   exerciseFilesStatus,
+  exerciseFilesLinks,
   usedFiles,
   loadFiles,
   addFiles,
@@ -52,6 +62,7 @@ const ExerciseFilesTableContainer = ({
     RowComponent={ExerciseFilesTableRow}
     viewOnly={!exercise.permissionHints.update}
     downloadArchive={downloadArchive}
+    linkedFilesIds={createFilesLinksIndex(exerciseFilesLinks)}
     {...props}
   />
 );
@@ -64,6 +75,7 @@ ExerciseFilesTableContainer.propTypes = {
   }).isRequired,
   exerciseFiles: ImmutablePropTypes.map,
   exerciseFilesStatus: PropTypes.string,
+  exerciseFilesLinks: PropTypes.array,
   usedFiles: PropTypes.instanceOf(Set),
   loadFiles: PropTypes.func.isRequired,
   addFiles: PropTypes.func.isRequired,
@@ -77,11 +89,17 @@ export default connect(
     return {
       exerciseFiles: getFilesForExercise(exercise.id)(state),
       exerciseFilesStatus: fetchFilesForExerciseStatus(state)(exercise.id),
+      exerciseFilesLinks: getExerciseFilesLinks(state, exercise.id),
     };
   },
   (dispatch, { exercise }) => ({
-    loadFiles: () => dispatch(fetchFilesForExercise(exercise.id)),
-    addFiles: files => dispatch(addExerciseFiles(exercise.id, files)),
+    loadFiles: () =>
+      Promise.all([
+        dispatch(fetchFilesForExercise(exercise.id)),
+        dispatch(fetchExerciseFileLinksIfNeeded(exercise.id)),
+      ]),
+    addFiles: files =>
+      dispatch(addExerciseFiles(exercise.id, files)).then(() => dispatch(fetchExerciseFileLinks(exercise.id))),
     removeFile: id => dispatch(removeExerciseFile(exercise.id, id)),
     downloadFile: (ev, id) => {
       ev.preventDefault();
diff --git a/src/locales/cs.json b/src/locales/cs.json
@@ -205,10 +205,6 @@
   "app.asyncJobs.list.worker": "Obsluha",
   "app.asyncJobs.ping": "Cinkout na obsluhu",
   "app.asyncJobs.title": "Úkoly jádra na pozadí",
-  "app.attachmentFiles.deleteConfirm": "Opravdu chcete smazat tento soubor? Tuto akci není možné vrátit.",
-  "app.attachmentFilesTable.description": "Přiložené soubory jsou soubory které mohou být použity v popisu úlohy pomocí odkazů poskytnutých pod tímto textem. Přiložené soubory mohou být prohlíženy a stahovány studenty.",
-  "app.attachmentFilesTable.title": "Přiložené soubory",
-  "app.attachmentFilesTable.url": "URL",
   "app.badge.effectiveRoleDialog.title": "Změnit efektivní roli",
   "app.badge.failedLoading": "Nepodařilo se načíst data",
   "app.badge.failedLoadingInfo": "Prosim zkontrolujte si své připojení k Internetu.",
@@ -827,8 +823,10 @@
   "app.exerciseFileLinkForm.validation.key.required": "Prosíme vyplňte klíč.",
   "app.exerciseFileLinkForm.validation.saveName.invalid": "Název souboru nemůže obsahovat nebezpečné znaky používané v cestách.",
   "app.exerciseFileLinkForm.validation.saveName.suspicious": "Použité znaky nejsou typické pro běžné názvy souborů. Prosíme ověřte, že se nejedná o chybu.",
-  "app.exerciseFiles.cannotDeleteExplain": "Soubor nelze smazat protože je použit v konfiguraci.",
+  "app.exerciseFiles.cannotDeleteLinkedExplain": "Soubor nelze smazat protože má přidružený odkaz ke stažení.",
+  "app.exerciseFiles.cannotDeleteUsedExplain": "Soubor nelze smazat protože je použit v konfiguraci.",
   "app.exerciseFiles.deleteConfirm": "Opravdu si přejete tento soubor smazat? Tato operace nemůže být vrácena.",
+  "app.exerciseFiles.linkedFile": "Tento soubor je přístupný prostřednictvím odkazu.",
   "app.exerciseFilesTable.description": "Soubory úlohy mohou být použity v nastavení úlohy (jako vstupní soubory, vzorové výstupní soubory, přídavné soubory pro kompilaci, vlastní sudí, ...). Na soubory je také možné vytvořit odkazy ke stažení, které lze vkládat do textů úlohy (specifikace pro studenty, popis).",
   "app.exerciseFilesTable.title": "Soubory úlohy",
   "app.exerciseReferenceSolutions.filters.author": "Autor",
@@ -1019,7 +1017,6 @@
   "app.filesLinksTable.visibleToAll": "Viditelné všem uživatelům (i bez přihlášení)",
   "app.filesTable.downloadArchive": "Stáhnout vše jako ZIP soubor",
   "app.filesTable.empty": "Zatím zde nejsou žádné uložené soubory.",
-  "app.filesTable.originalFileName": "Původní jméno",
   "app.filesTable.saveUploadedFilesButton": "Uložit nahrané soubory",
   "app.filterArchiveGroupsForm.searchName": "Vyhledat podle jména",
   "app.filterArchiveGroupsForm.showAll": "Ukázat také nearchivované skupiny",
diff --git a/src/locales/en.json b/src/locales/en.json
@@ -205,10 +205,6 @@
   "app.asyncJobs.list.worker": "Worker",
   "app.asyncJobs.ping": "Ping Worker",
   "app.asyncJobs.title": "Core Background Jobs",
-  "app.attachmentFiles.deleteConfirm": "Are you sure you want to delete the file? This cannot be undone.",
-  "app.attachmentFilesTable.description": "Attached files are files which can be used within exercise description using links provided below. Attached files can be viewed or downloaded by students.",
-  "app.attachmentFilesTable.title": "Attached files",
-  "app.attachmentFilesTable.url": "URL",
   "app.badge.effectiveRoleDialog.title": "Change Effective Role",
   "app.badge.failedLoading": "Failed to load the data",
   "app.badge.failedLoadingInfo": "Please check your Internet connection.",
@@ -827,8 +823,10 @@
   "app.exerciseFileLinkForm.validation.key.required": "Please fill the key.",
   "app.exerciseFileLinkForm.validation.saveName.invalid": "The file name cannot contain dangerous characters that are used in paths.",
   "app.exerciseFileLinkForm.validation.saveName.suspicious": "Used characters are not typical for common file names. Please verify that this is intended.",
-  "app.exerciseFiles.cannotDeleteExplain": "The file cannot be deleted since it is being used in the configuration.",
+  "app.exerciseFiles.cannotDeleteLinkedExplain": "The file cannot be deleted since it has an associated download link.",
+  "app.exerciseFiles.cannotDeleteUsedExplain": "The file cannot be deleted since it is being used in the configuration.",
   "app.exerciseFiles.deleteConfirm": "Are you sure you want to delete the file? This cannot be undone.",
+  "app.exerciseFiles.linkedFile": "This file has been made accessible via a link.",
   "app.exerciseFilesTable.description": "Exercise files can be used in exercise configuration (as input files, expected output files, extra compilation files, custom judges, ...). Links to exercise files can also be created and then used in exercise texts (specification for students, description).",
   "app.exerciseFilesTable.title": "Exercise Files",
   "app.exerciseReferenceSolutions.filters.author": "Author",
@@ -1019,7 +1017,6 @@
   "app.filesLinksTable.visibleToAll": "Visible to all users (without login)",
   "app.filesTable.downloadArchive": "Download all as ZIP archive",
   "app.filesTable.empty": "There are no saved files yet.",
-  "app.filesTable.originalFileName": "Original File Name",
   "app.filesTable.saveUploadedFilesButton": "Save Uploaded Files",
   "app.filterArchiveGroupsForm.searchName": "Search by name",
   "app.filterArchiveGroupsForm.showAll": "Show also non-archived groups",
@@ -2170,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"
-}
+}
diff --git a/src/locales/whitelist_cs.json b/src/locales/whitelist_cs.json
@@ -1,5 +1,4 @@
 [
-  "app.attachmentFilesTable.url",
   "app.broker.title",
   "app.changePasswordForm.email",
   "app.evaluationProgressStatus.ok",
diff --git a/src/pages/EditExerciseConfig/EditExerciseConfig.js b/src/pages/EditExerciseConfig/EditExerciseConfig.js
@@ -34,29 +34,27 @@ import {
   fetchExerciseConfigIfNeeded,
   setExerciseConfig,
 } from '../../redux/modules/exerciseConfigs.js';
-import { getExercise } from '../../redux/selectors/exercises.js';
-import { exerciseConfigSelector } from '../../redux/selectors/exerciseConfigs.js';
-import { getLoggedInUserEffectiveRole } from '../../redux/selectors/users.js';
 import { fetchRuntimeEnvironments } from '../../redux/modules/runtimeEnvironments.js';
-import { runtimeEnvironmentsSelector } from '../../redux/selectors/runtimeEnvironments.js';
 import { fetchExercisePipelinesVariables } from '../../redux/modules/exercisePipelinesVariables.js';
-import { getExercisePipelinesVariablesJS } from '../../redux/selectors/exercisePipelinesVariables.js';
-import { getFilesForExercise, fetchFilesForExerciseStatus } from '../../redux/selectors/exerciseFiles.js';
-import { isLoadingState } from '../../redux/helpers/resourceManager/status.js';
-
-import withLinks from '../../helpers/withLinks.js';
-import { exerciseEnvironmentConfigSelector } from '../../redux/selectors/exerciseEnvironmentConfigs.js';
 import {
   fetchExerciseEnvironmentConfig,
   fetchExerciseEnvironmentConfigIfNeeded,
   setExerciseEnvironmentConfig,
 } from '../../redux/modules/exerciseEnvironmentConfigs.js';
-import { exerciseScoreConfigSelector } from '../../redux/selectors/exerciseScoreConfig.js';
 import { fetchScoreConfigIfNeeded, setScoreConfig } from '../../redux/modules/exerciseScoreConfig.js';
 import { fetchExerciseTestsIfNeeded, setExerciseTests } from '../../redux/modules/exerciseTests.js';
-import { exerciseTestsSelector } from '../../redux/selectors/exerciseTests.js';
 import { fetchPipelines } from '../../redux/modules/pipelines.js';
+import { exerciseTestsSelector } from '../../redux/selectors/exerciseTests.js';
 import { pipelinesSelector, getPipelinesEnvironmentsWhichHasEntryPoint } from '../../redux/selectors/pipelines.js';
+import { exerciseScoreConfigSelector } from '../../redux/selectors/exerciseScoreConfig.js';
+import { exerciseEnvironmentConfigSelector } from '../../redux/selectors/exerciseEnvironmentConfigs.js';
+import { getExercisePipelinesVariablesJS } from '../../redux/selectors/exercisePipelinesVariables.js';
+import { getFilesForExercise, fetchFilesForExerciseStatus } from '../../redux/selectors/exerciseFiles.js';
+import { runtimeEnvironmentsSelector } from '../../redux/selectors/runtimeEnvironments.js';
+import { getExercise } from '../../redux/selectors/exercises.js';
+import { exerciseConfigSelector } from '../../redux/selectors/exerciseConfigs.js';
+import { getLoggedInUserEffectiveRole } from '../../redux/selectors/users.js';
+import { isLoadingState } from '../../redux/helpers/resourceManager/status.js';
 
 import {
   getTestsInitValues,
@@ -89,6 +87,7 @@ import {
 import { isEmpoweredSupervisorRole } from '../../components/helpers/usersRoles.js';
 import { hasPermissions, safeGet } from '../../helpers/common.js';
 import withRouter, { withRouterProps } from '../../helpers/withRouter.js';
+import withLinks from '../../helpers/withLinks.js';
 
 class EditExerciseConfig extends Component {
   componentDidMount() {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`[`
`2`		`- "app.attachmentFilesTable.url",`
`3`	`2`	`"app.broker.title",`
`4`	`3`	`"app.changePasswordForm.email",`
`5`	`4`	`"app.evaluationProgressStatus.ok",`