911 public dataset and file page still query private metadata endpoints (#913)

* only using public metadata definition endpoints in public view

* reverting package lock

* fixing, wrong method called

* clean up the unused code

* more clean up

---------

Co-authored-by: Chen Wang <[email protected]>

Author: tcnichol

frontend/src/components/datasets/PublicDataset.tsx

@@ -13,20 +13,18 @@ import { useParams, useSearchParams } from "react-router-dom";
 import { RootState } from "../../types/data";
 import { useDispatch, useSelector } from "react-redux";
 import { fetchPublicFolderPath } from "../../actions/folder";
-
 import {
 	fetchPublicDatasetAbout,
 	fetchPublicFoldersFilesInDataset as fetchPublicFoldersFilesInDatasetAction,
 } from "../../actions/public_dataset";
-
 import { a11yProps, TabPanel } from "../tabs/TabComponent";
 import FilesTable from "../files/FilesTable";
 import { DisplayMetadata } from "../metadata/DisplayMetadata";
 import { DisplayListenerMetadata } from "../metadata/DisplayListenerMetadata";
 import { MainBreadcrumbs } from "../navigation/BreadCrumb";
 import {
 	deleteDatasetMetadata as deleteDatasetMetadataAction,
-	fetchMetadataDefinitions,
+	fetchPublicMetadataDefinitions,
 	patchDatasetMetadata as patchDatasetMetadataAction,
 } from "../../actions/metadata";
 import PublicLayout from "../PublicLayout";
@@ -75,7 +73,7 @@ export const PublicDataset = (): JSX.Element => {
 		name: string | null,
 		skip: number,
 		limit: number
-	) => dispatch(fetchMetadataDefinitions(name, skip, limit));
+	) => dispatch(fetchPublicMetadataDefinitions(name, skip, limit));
 
 	// mapStateToProps
 	const about = useSelector(
@@ -93,7 +91,6 @@ export const PublicDataset = (): JSX.Element => {
 	const [currPageNum, setCurrPageNum] = useState<number>(1);
 	const [limit] = useState<number>(config.defaultFolderFilePerPage);
 
-	// we use the public files here
 	const pageMetadata = useSelector(
 		(state: RootState) => state.publicDataset.publicFoldersAndFiles.metadata
 	);

frontend/src/components/metadata/DisplayListenerMetadata.tsx

@@ -8,8 +8,9 @@ import {
 	fetchMetadataDefinitions,
 	fetchPublicDatasetMetadata,
 	fetchPublicFileMetadata,
+	fetchPublicMetadataDefinitions,
 } from "../../actions/metadata";
-import { ListenerMetadataEntry } from "../metadata/ListenerMetadataEntry";
+import { ListenerMetadataEntry } from "./ListenerMetadataEntry";
 import Card from "@mui/material/Card";
 import CardContent from "@mui/material/CardContent";
 
@@ -27,14 +28,7 @@ This is the interface displayed already created metadata and allow eidts
 Uses only the list of metadata
 */
 export const DisplayListenerMetadata = (props: MetadataType) => {
-	const {
-		updateMetadata,
-		deleteMetadata,
-		resourceType,
-		resourceId,
-		version,
-		publicView,
-	} = props;
+	const { resourceType, resourceId, version, publicView } = props;
 
 	const dispatch = useDispatch();
 
@@ -43,6 +37,13 @@ export const DisplayListenerMetadata = (props: MetadataType) => {
 		skip: number,
 		limit: number
 	) => dispatch(fetchMetadataDefinitions(name, skip, limit));
+
+	const getPublicMetadatDefinitions = (
+		name: string | null,
+		skip: number,
+		limit: number
+	) => dispatch(fetchPublicMetadataDefinitions(name, skip, limit));
+
 	const listDatasetMetadata = (datasetId: string | undefined) =>
 		dispatch(fetchDatasetMetadata(datasetId));
 	const listFileMetadata = (
@@ -70,7 +71,11 @@ export const DisplayListenerMetadata = (props: MetadataType) => {
 	);
 
 	useEffect(() => {
-		getMetadatDefinitions(null, 0, 100);
+		if (publicView) {
+			getPublicMetadatDefinitions(null, 0, 100);
+		} else {
+			getMetadatDefinitions(null, 0, 100);
+		}
 	}, []);
 
 	// complete metadata list with both definition and values
@@ -101,9 +106,6 @@ export const DisplayListenerMetadata = (props: MetadataType) => {
 					metadataList = publicFileMetadataList;
 				else if (resourceType === "dataset" && publicView)
 					metadataList = publicDatasetMetadataList;
-				let listenerMetadataList = [];
-				let listenerMetadataContent = [];
-
 				return (
 					<Grid container spacing={2}>
 						{metadataList.map((metadata, idx) => {

frontend/src/components/metadata/DisplayMetadata.tsx

@@ -77,8 +77,11 @@ export const DisplayMetadata = (props: MetadataType) => {
 		(state: RootState) => state.metadata.publicFileMetadataList
 	);
 	useEffect(() => {
-		getMetadatDefinitions(null, 0, 100);
-		getPublicMetadatDefinitions(null, 0, 100);
+		if (publicView){
+			getPublicMetadatDefinitions(null, 0, 100);
+		} else {
+			getMetadatDefinitions(null, 0, 100);
+		}
 	}, []);
 
 	// complete metadata list with both definition and values