fix download issues

Author: timjohno

infrastructure/lib/features/translation/translation.ts

@@ -79,10 +79,11 @@ export class dt_translate extends Construct {
 			removalPolicy: props.removalPolicy, // ASM-CFN1
 			cors: [
 				{
-					allowedMethods: [s3.HttpMethods.PUT, s3.HttpMethods.POST],
+					allowedMethods: [s3.HttpMethods.PUT, s3.HttpMethods.POST, s3.HttpMethods.HEAD, s3.HttpMethods.GET],
 					allowedOrigins: ["*"],
 					allowedHeaders: ["*"],
 					exposedHeaders: ["ETag"],
+					maxAge: 3000
 				},
 			],
 		});

website/src/page/translation/historyTable.tsx

@@ -24,6 +24,7 @@ import { amplifyConfigureAppend } from "../../util/amplifyConfigure";
 import { formatJobNameId } from "../../util/formatJobNameId";
 import { formatTimestamp } from "../../util/formatTimestamp";
 import { getPresignedUrl } from "../../util/getPresignedUrl";
+import { formatEstimatedCompletion } from "../../util/formatEstimatedCompletion";
 import { describeS3Key } from "./util/describeS3Key";
 
 const cfnOutputs = require("../../cfnOutputs.json");
@@ -136,11 +137,19 @@ export default function HistoryTable() {
 				const k = describeS3Key({
 					key: keys[i],
 				});
+				console.log("Fetching presigned url");
 				const presignedUrl = await getPresignedUrl({
 					path: `${k.scope}/${k.identity}/${k.jobId}/${k.stage}/${k.translateId}/${k.filename}`,
 					bucketKey: "awsUserFilesS3Bucket",
 				});
-				window.open(presignedUrl, "_blank", "noopener,noreferrer");
+				const response = await fetch(presignedUrl);
+				console.log("Retrieved");
+				
+				const blob = await response.blob();
+				const link = document.createElement('a');
+				link.href = window.URL.createObjectURL(blob);
+				link.download = k.filename;
+				link.click();
 			}
 		} catch (err) {
 			console.log("error: ", err);
@@ -161,6 +170,11 @@ export default function HistoryTable() {
 					header: t("generic_created"),
 					cell: (item: Item) => formatTimestamp(item.createdAt),
 				},
+				{
+					id: "estimatedCompletion",
+					header: "Estimated Completion",
+					cell: (item: Item) => formatEstimatedCompletion(item.createdAt, item.jobStatus),
+				},
 				{
 					id: "source",
 					header: t("generic_source"),

website/src/util/formatEstimatedCompletion.test.tsx

@@ -0,0 +1,37 @@
+import { renderToStaticMarkup } from "react-dom/server";
+import { formatEstimatedCompletion } from "./formatEstimatedCompletion";
+
+const minute = 60;
+
+describe("formatTimestamp", () => {
+
+    test("calculates estimated completion correctly", () => {
+        const currentTimeInSeconds = Math.floor(Date.now() / 1000);
+        const fiveMinutesAgoInSeconds = currentTimeInSeconds - 5 * minute;
+
+        const element = formatEstimatedCompletion(fiveMinutesAgoInSeconds, "processing");
+        const htmlString = renderToStaticMarkup(element);
+    
+        expect(htmlString).toContain("15 minutes");
+    });
+
+    test("calculates estimated completion correctly for single minute", () => {
+        const currentTimeInSeconds = Math.floor(Date.now() / 1000);
+        const nineteenMinutesAgo = currentTimeInSeconds - 19 * minute;
+
+        const element = formatEstimatedCompletion(nineteenMinutesAgo, "uploaded");
+        const htmlString = renderToStaticMarkup(element);
+    
+        expect(htmlString).toContain("1 minute");
+    });
+
+    test("returns empty string for completed job", () => {
+        const currentTimeInSeconds = Math.floor(Date.now() / 1000);
+        const fiveMinutesAgoInSeconds = currentTimeInSeconds - 19 * minute;
+
+        const element = formatEstimatedCompletion(fiveMinutesAgoInSeconds, "COMPLETED");
+        const htmlString = renderToStaticMarkup(element);
+    
+        expect(htmlString).toEqual("");
+    });
+});

website/src/util/formatEstimatedCompletion.tsx

@@ -0,0 +1,36 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT-0
+import React from "react";
+
+function detiledTimestamp(unixSeconds: number) {
+	const unixMilliseconds = unixSeconds * 1000;
+	const timestamp = new Date(unixMilliseconds);
+	return timestamp.toLocaleString();
+}
+
+export function formatEstimatedCompletion(unixSeconds: number, jobStatus: string) {
+	const jobOngoingStatuses = ["UPLOADED", "PROCESSING"]
+	if (!jobOngoingStatuses.includes(jobStatus.toUpperCase())) {
+		return ""
+	}
+
+	const estimatedLengthOfJobMins = 20
+	const timestamp = new Date((unixSeconds + estimatedLengthOfJobMins * 60) * 1000);
+	const now = new Date();
+
+	const diff =  timestamp.getTime() - now.getTime();
+	const diffMinutes = Math.round(diff / (1000 * 60));
+	
+	if (diffMinutes > 0) {
+		return (
+			<span title={detiledTimestamp(unixSeconds)}>
+				{diffMinutes} minute{diffMinutes > 1 ? "s" : ""}
+			</span>
+		);
+	}
+	return (
+		<span title={detiledTimestamp(unixSeconds)}>
+			Now
+		</span>
+	);
+}