Fix links to publications (#536)

* Fix links to publications * Open files in new tab
ZdruzenieSTROM · Dec 14, 2024 · 761846d · 761846d
1 parent 03818f6
commit 761846d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/src/components/Archive/Archive.tsx b/src/components/Archive/Archive.tsx
@@ -20,12 +20,11 @@ type MyEvent = Omit<Event, 'publication_set'> & {
 }
 
 const PublicationButton: FC<{
-  publicationId: number
-  publicationName: string
-}> = ({publicationId, publicationName}) => {
+  publication: Publication
+}> = ({publication}) => {
   return (
-    <Link variant="button2" href={`/api/competition/publication/${publicationId}/download`} target="_blank">
-      Časopis {publicationName}
+    <Link variant="button2" href={`/api${publication.file}`} target="_blank">
+      {publication.name}
     </Link>
   )
 }
@@ -79,11 +78,7 @@ export const Archive: FC = () => {
             <ResultsButton eventYear={event.year} eventSeason={event.season_code} />
             <ProblemsButton eventYear={event.year} eventSeason={event.season_code} />
             {event.publication_set.map((publication) => (
-              <PublicationButton
-                key={publication.id}
-                publicationId={publication.id}
-                publicationName={publication.name}
-              />
+              <PublicationButton key={publication.id} publication={publication} />
             ))}
           </Stack>
         </Stack>

diff --git a/src/components/CompetitionPage/CompetitionPage.tsx b/src/components/CompetitionPage/CompetitionPage.tsx
@@ -94,19 +94,19 @@ export const CompetitionPage: FC<CompetitionPageProps> = ({
               </Grid>
               <Grid xs={2} display="flex" justifyContent="end">
                 {results && (
-                  <Link variant="button2" key={results.id} href={`/api${results.file}`}>
+                  <Link variant="button2" key={results.id} href={`/api${results.file}`} target="_blank">
                     {PublicationTypes.RESULTS.display_name}
                   </Link>
                 )}
               </Grid>
               <Grid xs={2} display="flex" justifyContent="end">
                 {solutions ? (
-                  <Link variant="button2" key={solutions.id} href={`/api${solutions.file}`}>
+                  <Link variant="button2" key={solutions.id} href={`/api${solutions.file}`} target="_blank">
                     {PublicationTypes.SOLUTIONS.display_name}
                   </Link>
                 ) : (
                   problems && (
-                    <Link variant="button2" key={problems.id} href={`/api${problems.file}`}>
+                    <Link variant="button2" key={problems.id} href={`/api${problems.file}`} target="_blank">
                       {PublicationTypes.PROBLEMS.display_name}
                     </Link>
                   )

diff --git a/src/components/PublicationUploader/PublicationUploader.tsx b/src/components/PublicationUploader/PublicationUploader.tsx
@@ -32,7 +32,7 @@ export const PublicationUploader: FC<PublicationUploaderProps> = ({semesterId, o
     <Stack direction="row" gap={2} alignItems="center">
       <Typography variant="body1">{order}. Časopis:</Typography>
       {publication && (
-        <Link variant="button2" href={`/api/competition/publication/${publication.id}/download`}>
+        <Link variant="button2" href={`/api${publication.file}`} target="_blank">
           {publication.name}
         </Link>
       )}