Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions frontend/src/pages/Files/FileRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,18 @@ const FileRow: React.FC<FileRowProps> = ({
setIsEditing(false);
};

const formatUTCDate = (dateStr: string | null) => {
if (!dateStr) return "N/A";
const formatter = new Intl.DateTimeFormat("en-US", {
timeZone: "UTC",
year: "numeric",
month: "numeric",
day: "numeric"
});
const formattedDate = formatter.format(new Date(dateStr));
return formattedDate;
}

return (
<li className="border-b p-4">
{isEditing ? (
Expand Down Expand Up @@ -187,7 +199,7 @@ const FileRow: React.FC<FileRowProps> = ({
<div className="w-full">
<p>
<strong>Publication Date:</strong>{" "}
{isEditing ? (
{isEditing ?
<input
type="date"
value={publicationDate || ''}
Expand All @@ -196,15 +208,7 @@ const FileRow: React.FC<FileRowProps> = ({
disabled={loading}
placeholder="Publication Date"
/>
) : (
file.publication_date
? new Intl.DateTimeFormat("en-US", {
year: "numeric",
month: "2-digit",
day: "2-digit"
}).format(new Date(file.publication_date))
: "N/A"
)}
: formatUTCDate(file.publication_date)}
</p>
</div>
</div>
Expand Down
61 changes: 28 additions & 33 deletions frontend/src/pages/Files/ListOfFiles.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useState, useEffect } from "react";
import axios from "axios";
import { api } from "../../api/apiClient";
import Layout from "../Layout/Layout";
import FileRow from "./FileRow";
import Table from "../../components/Table/Table";
Expand Down Expand Up @@ -30,17 +30,17 @@ const ListOfFiles: React.FC<{ showTable?: boolean }> = ({
const [downloading, setDownloading] = useState<string | null>(null);
const [opening, setOpening] = useState<string | null>(null);

const baseUrl = import.meta.env.VITE_API_BASE_URL;

useEffect(() => {
const fetchFiles = async () => {
try {
const baseUrl = import.meta.env.VITE_API_BASE_URL;
const response = await axios.get(`${baseUrl}/v1/api/uploadFile`, {
headers: {
Authorization: `JWT ${localStorage.getItem("access")}`,
},
});
if (Array.isArray(response.data)) {
setFiles(response.data);
const url = `${baseUrl}/v1/api/uploadFile`;

const { data } = await api.get(url);

if (Array.isArray(data)) {
setFiles(data);
}
} catch (error) {
console.error("Error fetching files", error);
Expand All @@ -50,7 +50,7 @@ const ListOfFiles: React.FC<{ showTable?: boolean }> = ({
};

fetchFiles();
}, []);
}, [baseUrl]);

const updateFileName = (guid: string, updatedFile: Partial<File>) => {
setFiles((prevFiles) =>
Expand All @@ -63,15 +63,9 @@ const ListOfFiles: React.FC<{ showTable?: boolean }> = ({
const handleDownload = async (guid: string, fileName: string) => {
try {
setDownloading(guid);
const baseUrl = import.meta.env.VITE_API_BASE_URL;
const response = await axios.get(`${baseUrl}/v1/api/uploadFile/${guid}`, {
headers: {
Authorization: `JWT ${localStorage.getItem("access")}`,
},
responseType: "blob",
});
const { data } = await api.get(`/v1/api/uploadFile/${guid}`, { responseType: 'blob' });

const url = window.URL.createObjectURL(new Blob([response.data]));
const url = window.URL.createObjectURL(new Blob([data]));
const link = document.createElement("a");
link.href = url;
link.setAttribute("download", fileName);
Expand All @@ -90,15 +84,9 @@ const ListOfFiles: React.FC<{ showTable?: boolean }> = ({
const handleOpen = async (guid: string) => {
try {
setOpening(guid);
const baseUrl = import.meta.env.VITE_API_BASE_URL;
const response = await axios.get(`${baseUrl}/v1/api/uploadFile/${guid}`, {
headers: {
Authorization: `JWT ${localStorage.getItem("access")}`,
},
responseType: "arraybuffer",
});
const { data } = await api.get(`/v1/api/uploadFile/${guid}`, { responseType: 'arraybuffer' });

const file = new Blob([response.data], { type: 'application/pdf' });
const file = new Blob([data], { type: 'application/pdf' });
const fileURL = window.URL.createObjectURL(file);
window.open(fileURL);
} catch (error) {
Expand All @@ -118,17 +106,24 @@ const ListOfFiles: React.FC<{ showTable?: boolean }> = ({
{ Header: 'Date Published', accessor: 'publication_date' },
{ Header: '', accessor: 'file_open' },
];

const formatUTCDate = (dateStr: string | null) => {
if (!dateStr) return "N/A";
const formatter = new Intl.DateTimeFormat("en-US", {
timeZone: "UTC",
year: "numeric",
month: "numeric",
day: "numeric"
});
const formattedDate = formatter.format(new Date(dateStr));
return formattedDate;
}

const data = files.map((file) => (
{
file_name: file?.title || file.file_name.replace(/\.[^/.]+$/, ""),
publication: file?.publication || '',
publication_date: file.publication_date
? new Intl.DateTimeFormat("en-US", {
year: "numeric",
month: "2-digit",
day: "2-digit"
}).format(new Date(file.publication_date))
: "",
publication_date: formatUTCDate(file.publication_date),
file_open:
<a
key={file.guid}
Expand Down