Download should be incremented as soon as you click on downloads (#1120)

ddey2 · web-flow · commit e5ed21e1510f · 2024-06-27T15:20:38.000-05:00
* Download should be incremented as soon as you click on downloads * Revert "Download should be incremented as soon as you click on downloads" This reverts commit b8d7e11. * reverted to old download logic and incrmenting download count on clientside on clicking download button
diff --git a/frontend/src/actions/dataset.js b/frontend/src/actions/dataset.js
@@ -495,3 +495,5 @@ export function fetchDatasetRoles(datasetId) {
 			});
 	};
 }
+
+export const INCREMENT_DATASET_DOWNLOADS = "INCREMENT_DATASET_DOWNLOADS";
diff --git a/frontend/src/actions/file.js b/frontend/src/actions/file.js
@@ -393,3 +393,5 @@ export function submitFileExtractionAction(fileId, extractorName, requestBody) {
 // 			document.body.removeChild(anchor);
 // 		}
 // 	});
+
+export const INCREMENT_FILE_DOWNLOADS = "INCREMENT_FILE_DOWNLOADS";
diff --git a/frontend/src/actions/public_dataset.js b/frontend/src/actions/public_dataset.js
@@ -192,3 +192,6 @@ export function fetchPublicFoldersFilesInDataset(
 			});
 	};
 }
+
+export const INCREMENT_PUBLIC_DATASET_DOWNLOADS =
+	"INCREMENT_PUBLIC_DATASET_DOWNLOADS";
diff --git a/frontend/src/actions/public_file.js b/frontend/src/actions/public_file.js
@@ -159,3 +159,6 @@ export function filePublicDownloaded(
 		}
 	};
 }
+
+export const INCREMENT_PUBLIC_FILE_DOWNLOADS =
+	"INCREMENT_PUBLIC_FILE_DOWNLOADS";
diff --git a/frontend/src/components/datasets/ActionsMenu.tsx b/frontend/src/components/datasets/ActionsMenu.tsx
@@ -1,13 +1,14 @@
 import { Button, Stack } from "@mui/material";
 import React from "react";
-import { useSelector } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { RootState } from "../../types/data";
 import { Download } from "@mui/icons-material";
 import { NewMenu } from "./NewMenu";
 import { OtherMenu } from "./OtherMenu";
 import { ShareMenu } from "./ShareMenu";
 import { AuthWrapper } from "../auth/AuthWrapper";
 import config from "../../app.config";
+import { INCREMENT_DATASET_DOWNLOADS } from "../../actions/dataset";
 
 type ActionsMenuProps = {
 	datasetId: string;
@@ -21,6 +22,7 @@ export const ActionsMenu = (props: ActionsMenuProps): JSX.Element => {
 	const datasetRole = useSelector(
 		(state: RootState) => state.dataset.datasetRole
 	);
+	const dispatch = useDispatch();
 
 	return (
 		<Stack
@@ -32,7 +34,13 @@ export const ActionsMenu = (props: ActionsMenuProps): JSX.Element => {
 			<Button
 				sx={{ minWidth: "auto" }}
 				variant="contained"
-				href={`${config.hostname}/api/v2/datasets/${datasetId}/download`}
+				onClick={() => {
+					dispatch({
+						type: INCREMENT_DATASET_DOWNLOADS,
+						receivedAt: Date.now(),
+					});
+					window.location.href = `${config.hostname}/api/v2/datasets/${datasetId}/download`;
+				}}
 				endIcon={<Download />}
 			>
 				Download
diff --git a/frontend/src/components/datasets/PublicActionsMenu.tsx b/frontend/src/components/datasets/PublicActionsMenu.tsx
@@ -2,6 +2,8 @@ import { Button, Stack } from "@mui/material";
 import React from "react";
 import { Download } from "@mui/icons-material";
 import config from "../../app.config";
+import { useDispatch } from "react-redux";
+import { INCREMENT_PUBLIC_DATASET_DOWNLOADS } from "../../actions/public_dataset";
 
 type ActionsMenuProps = {
 	datasetId: string;
@@ -10,6 +12,7 @@ type ActionsMenuProps = {
 export const PublicActionsMenu = (props: ActionsMenuProps): JSX.Element => {
 	const { datasetId } = props;
 
+	const dispatch = useDispatch();
 	return (
 		<Stack
 			direction="row"
@@ -20,7 +23,13 @@ export const PublicActionsMenu = (props: ActionsMenuProps): JSX.Element => {
 			<Button
 				sx={{ minWidth: "auto" }}
 				variant="contained"
-				href={`${config.hostname}/api/v2/public_datasets/${datasetId}/download`}
+				onClick={() => {
+					dispatch({
+						type: INCREMENT_PUBLIC_DATASET_DOWNLOADS,
+						receivedAt: Date.now(),
+					});
+					window.location.href = `${config.hostname}/api/v2/public_datasets/${datasetId}/download`;
+				}}
 				endIcon={<Download />}
 			>
 				Download
diff --git a/frontend/src/components/files/FileActionsMenu.tsx b/frontend/src/components/files/FileActionsMenu.tsx
@@ -13,6 +13,7 @@ import {
 	fetchFileSummary,
 	fileDeleted,
 	generateFilePresignedUrl as generateFilePresignedUrlAction,
+	INCREMENT_FILE_DOWNLOADS,
 	RESET_FILE_PRESIGNED_URL,
 } from "../../actions/file";
 import { useDispatch, useSelector } from "react-redux";
@@ -150,7 +151,10 @@ export const FileActionsMenu = (props: FileActionsMenuProps): JSX.Element => {
 				sx={{ minWidth: "auto" }}
 				variant="contained"
 				onClick={() => {
-					listFileSummary(fileId);
+					dispatch({
+						type: INCREMENT_FILE_DOWNLOADS,
+						receivedAt: Date.now(),
+					});
 					window.location.href = `${config.hostname}/api/v2/files/${fileId}`;
 				}}
 				endIcon={<Download />}
diff --git a/frontend/src/components/files/PublicFileActionsMenu.tsx b/frontend/src/components/files/PublicFileActionsMenu.tsx
@@ -9,7 +9,10 @@ import {
 	Stack,
 } from "@mui/material";
 import React, { useState } from "react";
-import { fetchPublicFileSummary } from "../../actions/public_file";
+import {
+	fetchPublicFileSummary,
+	INCREMENT_PUBLIC_FILE_DOWNLOADS,
+} from "../../actions/public_file";
 import { useDispatch, useSelector } from "react-redux";
 import { Download, MoreHoriz, Upload } from "@mui/icons-material";
 import { useNavigate } from "react-router-dom";
@@ -56,7 +59,10 @@ export const PublicFileActionsMenu = (
 				sx={{ minWidth: "auto" }}
 				variant="contained"
 				onClick={() => {
-					listFileSummary(fileId);
+					dispatch({
+						type: INCREMENT_PUBLIC_FILE_DOWNLOADS,
+						receivedAt: Date.now(),
+					});
 					window.location.href = `${config.hostname}/api/v2/public_files/${fileId}`;
 				}}
 				endIcon={<Download />}
diff --git a/frontend/src/reducers/dataset.ts b/frontend/src/reducers/dataset.ts
@@ -3,6 +3,7 @@ import {
 	DELETE_DATASET,
 	FOLDER_ADDED,
 	FOLDER_UPDATED,
+	INCREMENT_DATASET_DOWNLOADS,
 	RECEIVE_DATASET_ABOUT,
 	RECEIVE_DATASET_LICENSE,
 	RECEIVE_DATASET_ROLES,
@@ -102,6 +103,13 @@ const dataset = (state = defaultState, action: DataAction) => {
 			});
 		case RECEIVE_DATASET_ABOUT:
 			return Object.assign({}, state, { about: action.about });
+		case INCREMENT_DATASET_DOWNLOADS:
+			return Object.assign({}, state, {
+				about: {
+					...state.about,
+					downloads: state.about.downloads + 1,
+				},
+			});
 		case RECEIVE_DATASET_LICENSE:
 			return Object.assign({}, state, { license: action.license });
 		case UPDATE_DATASET_LICENSE:
diff --git a/frontend/src/reducers/file.ts b/frontend/src/reducers/file.ts
@@ -1,6 +1,7 @@
 import {
 	CHANGE_SELECTED_VERSION,
 	DOWNLOAD_FILE,
+	INCREMENT_FILE_DOWNLOADS,
 	RECEIVE_FILE_EXTRACTED_METADATA,
 	RECEIVE_FILE_METADATA_JSONLD,
 	RECEIVE_FILE_PRESIGNED_URL,
@@ -13,6 +14,7 @@ import { DataAction } from "../types/action";
 import { FileState } from "../types/data";
 import { FileOut as FileSummary } from "../openapi/v2";
 import { RECEIVE_FILE_ROLE } from "../actions/authorization";
+import { INCREMENT_DATASET_DOWNLOADS } from "../actions/dataset";
 
 const defaultState: FileState = {
 	fileSummary: <FileSummary>{},
@@ -30,6 +32,13 @@ const file = (state = defaultState, action: DataAction) => {
 	switch (action.type) {
 		case RECEIVE_FILE_SUMMARY:
 			return Object.assign({}, state, { fileSummary: action.fileSummary });
+		case INCREMENT_FILE_DOWNLOADS:
+			return Object.assign({}, state, {
+				fileSummary: {
+					...state.fileSummary,
+					downloads: state.fileSummary.downloads + 1,
+				},
+			});
 		case RECEIVE_FILE_ROLE:
 			return Object.assign({}, state, { fileRole: action.role });
 		case RECEIVE_FILE_EXTRACTED_METADATA:
diff --git a/frontend/src/reducers/public_dataset.ts b/frontend/src/reducers/public_dataset.ts
@@ -1,4 +1,5 @@
 import {
+	INCREMENT_PUBLIC_DATASET_DOWNLOADS,
 	RECEIVE_FILES_IN_PUBLIC_DATASET,
 	RECEIVE_PUBLIC_DATASET_ABOUT,
 	RECEIVE_PUBLIC_DATASETS,
@@ -43,6 +44,13 @@ const publicDataset = (state = defaultState, action: DataAction) => {
 			return Object.assign({}, state, { publicFiles: action.publicFiles });
 		case RECEIVE_PUBLIC_DATASET_ABOUT:
 			return Object.assign({}, state, { publicAbout: action.publicAbout });
+		case INCREMENT_PUBLIC_DATASET_DOWNLOADS:
+			return Object.assign({}, state, {
+				publicAbout: {
+					...state.publicAbout,
+					downloads: state.publicAbout.downloads + 1,
+				},
+			});
 		case RECEIVE_PUBLIC_DATASETS:
 			return Object.assign({}, state, {
 				publicDatasets: action.publicDatasets,
diff --git a/frontend/src/reducers/public_file.ts b/frontend/src/reducers/public_file.ts
@@ -4,6 +4,7 @@ import {
 	RECEIVE_PUBLIC_PREVIEWS,
 	RECEIVE_PUBLIC_VERSIONS,
 	CHANGE_PUBLIC_SELECTED_VERSION,
+	INCREMENT_PUBLIC_FILE_DOWNLOADS,
 } from "../actions/public_file";
 import { DataAction } from "../types/action";
 import { FileOut as FileSummary } from "../openapi/v2";
@@ -25,6 +26,13 @@ const publicFile = (state = defaultState, action: DataAction) => {
 			return Object.assign({}, state, {
 				publicFileSummary: action.publicFileSummary,
 			});
+		case INCREMENT_PUBLIC_FILE_DOWNLOADS:
+			return Object.assign({}, state, {
+				publicFileSummary: {
+					...state.publicFileSummary,
+					downloads: state.publicFileSummary.downloads + 1,
+				},
+			});
 		case RECEIVE_PUBLIC_PREVIEWS:
 			return Object.assign({}, state, {
 				publicPreviews: action.publicPreviews,
diff --git a/frontend/src/types/action.ts b/frontend/src/types/action.ts
@@ -53,6 +53,10 @@ interface RECEIVE_DATASET_ABOUT {
 	about: Dataset;
 }
 
+interface INCREMENT_DATASET_DOWNLOADS {
+	type: "INCREMENT_DATASET_DOWNLOADS";
+}
+
 interface RECEIVE_DATASET_LICENSE {
 	type: "RECEIVE_DATASET_LICENSE";
 	license: LicenseOut;
@@ -98,6 +102,10 @@ interface RECEIVE_PUBLIC_DATASET_ABOUT {
 	publicAbout: Dataset;
 }
 
+interface INCREMENT_PUBLIC_DATASET_DOWNLOADS {
+	type: "INCREMENT_PUBLIC_DATASET_DOWNLOADS";
+}
+
 interface RECEIVE_FILES_IN_PUBLIC_DATASET {
 	type: "RECEIVE_FILES_IN_PUBLIC_DATASET";
 	publicFiles: FileSummary[];
@@ -308,11 +316,19 @@ interface RECEIVE_FILE_SUMMARY {
 	fileSummary: FileSummary;
 }
 
+interface INCREMENT_FILE_DOWNLOADS {
+	type: "INCREMENT_FILE_DOWNLOADS";
+}
+
 interface RECEIVE_PUBLIC_FILE_SUMMARY {
 	type: "RECEIVE_PUBLIC_FILE_SUMMARY";
 	publicFileSummary: FileSummary;
 }
 
+interface INCREMENT_PUBLIC_FILE_DOWNLOADS {
+	type: "INCREMENT_PUBLIC_FILE_DOWNLOADS";
+}
+
 interface RECEIVE_DATASET_METADATA {
 	type: "RECEIVE_DATASET_METADATA";
 	metadataList: Metadata[];
@@ -689,22 +705,28 @@ export type DataAction =
 	| RECEIVE_FOLDERS_IN_PUBLIC_DATASET
 	| DELETE_FILE
 	| RECEIVE_DATASET_ABOUT
+	| INCREMENT_DATASET_DOWNLOADS
 	| RECEIVE_DATASET_ROLE
 	| RECEIVE_DATASETS
 	| RECEIVE_MY_DATASETS
 	| RECEIVE_PUBLIC_DATASETS
 	| RECEIVE_PUBLIC_DATASET_ABOUT
+	| INCREMENT_PUBLIC_DATASET_DOWNLOADS
 	| RECEIVE_FILES_IN_PUBLIC_DATASET
 	| DELETE_DATASET
 	| UPDATE_DATASET
 	| RECEIVE_FILE_SUMMARY
+	| INCREMENT_FILE_DOWNLOADS
+	| INCREMENT_FILE_DOWNLOADS
 	| RECEIVE_FILE_ROLE
 	| RECEIVE_FILE_EXTRACTED_METADATA
 	| RECEIVE_FILE_METADATA_JSONLD
 	| RECEIVE_PREVIEWS
 	| RECEIVE_VERSIONS
 	| CHANGE_SELECTED_VERSION
 	| RECEIVE_PUBLIC_FILE_SUMMARY
+	| INCREMENT_PUBLIC_FILE_DOWNLOADS
+	| INCREMENT_PUBLIC_FILE_DOWNLOADS
 	| RECEIVE_PUBLIC_FILE_EXTRACTED_METADATA
 	| RECEIVE_PUBLIC_FILE_METADATA_JSONLD
 	| RECEIVE_PUBLIC_PREVIEWS

Original file line number	Diff line number	Diff line change
`@@ -495,3 +495,5 @@ export function fetchDatasetRoles(datasetId) {`
`495`	`495`	`});`
`496`	`496`	`};`
`497`	`497`	`}`
	`498`	`+`
	`499`	`+export const INCREMENT_DATASET_DOWNLOADS = "INCREMENT_DATASET_DOWNLOADS";`
Original file line number	Diff line number	Diff line change
`@@ -192,3 +192,6 @@ export function fetchPublicFoldersFilesInDataset(`
`192`	`192`	`});`
`193`	`193`	`};`
`194`	`194`	`}`
	`195`	`+`
	`196`	`+export const INCREMENT_PUBLIC_DATASET_DOWNLOADS =`
	`197`	`+ "INCREMENT_PUBLIC_DATASET_DOWNLOADS";`
Original file line number	Diff line number	Diff line change
`@@ -159,3 +159,6 @@ export function filePublicDownloaded(`
`159`	`159`	`}`
`160`	`160`	`};`
`161`	`161`	`}`
	`162`	`+`
	`163`	`+export const INCREMENT_PUBLIC_FILE_DOWNLOADS =`
	`164`	`+ "INCREMENT_PUBLIC_FILE_DOWNLOADS";`