From 8df96219a29159914e28abe7d38257529eae7ad4 Mon Sep 17 00:00:00 2001 From: toddn Date: Sun, 16 Jun 2024 10:51:26 -0500 Subject: [PATCH 1/6] pre-commit run --- .../components/metadata/DisplayMetadata.tsx | 122 ++++++++++-------- 1 file changed, 69 insertions(+), 53 deletions(-) diff --git a/frontend/src/components/metadata/DisplayMetadata.tsx b/frontend/src/components/metadata/DisplayMetadata.tsx index 1ca4a167b..6ec1c1acd 100644 --- a/frontend/src/components/metadata/DisplayMetadata.tsx +++ b/frontend/src/components/metadata/DisplayMetadata.tsx @@ -1,5 +1,5 @@ import React, { useEffect } from "react"; -import { Box, Grid, Typography } from "@mui/material"; +import { Box, Button, Grid, Typography } from "@mui/material"; import { metadataConfig } from "../../metadata.config"; import { useDispatch, useSelector } from "react-redux"; import { RootState } from "../../types/data"; @@ -13,6 +13,7 @@ import { import { Agent } from "./Agent"; import { MetadataDeleteButton } from "./widgets/MetadataDeleteButton"; import { fetchPublicDatasetMetadata } from "../../actions/public_dataset"; +import { Link as RouterLink } from "react-router-dom"; type MetadataType = { updateMetadata: any; @@ -117,61 +118,76 @@ export const DisplayMetadata = (props: MetadataType) => { if (publicView) currentMetadataDefList = publicMetadataDefinitionList; else currentMetadataDefList = metadataDefinitionList; - return currentMetadataDefList.map((metadataDef) => { - return metadataList.map((metadata, idx) => { - if (metadataDef.name === metadata.definition) { - return ( - - {metadata.definition} - - {metadata.description} - - { - // construct metadata using its definition - metadataDef.fields.map((field, idxx) => { - return React.cloneElement( - metadataConfig[field.widgetType ?? "NA"] ?? - metadataConfig["NA"], - { - widgetName: metadataDef.name, - fieldName: field.name, - options: field.config.options ?? [], - updateMetadata: updateMetadata, - initialReadOnly: true, - resourceId: resourceId, - content: metadata.content ?? null, - metadataId: metadata.id ?? null, - isRequired: field.required, - key: idxx, - datasetRole: datasetRole, - } - ); - }) - } - - - - {datasetRole.role !== undefined && - datasetRole.role !== "viewer" ? ( - 0) { + return currentMetadataDefList.map((metadataDef) => { + return metadataList.map((metadata, idx) => { + if (metadataDef.name === metadata.definition) { + return ( + + {metadata.definition} + + {metadata.description} + + { + // construct metadata using its definition + metadataDef.fields.map((field, idxx) => { + return React.cloneElement( + metadataConfig[field.widgetType ?? "NA"] ?? + metadataConfig["NA"], + { + widgetName: metadataDef.name, + fieldName: field.name, + options: field.config.options ?? [], + updateMetadata: updateMetadata, + initialReadOnly: true, + resourceId: resourceId, + content: metadata.content ?? null, + metadataId: metadata.id ?? null, + isRequired: field.required, + key: idxx, + datasetRole: datasetRole, + } + ); + }) + } + + + - ) : ( - <> - )} + {datasetRole.role !== undefined && + datasetRole.role !== "viewer" ? ( + + ) : ( + <> + )} + - - - ); - } + + ); + } + }); }); - }); + } else { + return ( + +

+ Currently there is no user metadata provided for this dataset. + To start adding some click on the Add metadata button. User + metadata is metadata about the dataset added by any user who has + write permission to the dataset. The list of available field is + defined by the administrators of the system. If you would like + to add a new entry please contact one of the administrators. +

+ + ); + } })()} ); From b549275b840b817f1e3b77634f758d552d7df91b Mon Sep 17 00:00:00 2001 From: toddn Date: Mon, 17 Jun 2024 12:43:39 -0500 Subject: [PATCH 2/6] run pre commit --- .../metadata/DisplayListenerMetadata.tsx | 60 +++++++++++-------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/frontend/src/components/metadata/DisplayListenerMetadata.tsx b/frontend/src/components/metadata/DisplayListenerMetadata.tsx index 337836569..85e0004af 100644 --- a/frontend/src/components/metadata/DisplayListenerMetadata.tsx +++ b/frontend/src/components/metadata/DisplayListenerMetadata.tsx @@ -1,5 +1,5 @@ import React, { useEffect } from "react"; -import { Grid } from "@mui/material"; +import { Box, Grid } from "@mui/material"; import { useDispatch, useSelector } from "react-redux"; import { RootState } from "../../types/data"; import { @@ -106,29 +106,41 @@ export const DisplayListenerMetadata = (props: MetadataType) => { metadataList = publicFileMetadataList; else if (resourceType === "dataset" && publicView) metadataList = publicDatasetMetadataList; - return ( - - {metadataList.map((metadata, idx) => { - if (metadata.agent.listener !== null) { - return ( - - - - - - - - ); - } - })} - - ); + if (metadataList.length > 0) { + return ( + + {metadataList.map((metadata, idx) => { + if (metadata.agent.listener !== null) { + return ( + + + + + + + + ); + } + })} + + ); + } else { + return ( + +

+ Currently there is no machine metadata. This means either no + listeners are enabled for this resource, or that this resource + has not been submitted to any listeners. +

+ + ); + } })()} ); From 9627bd3c00caa080cbec7213151e75d55e579659 Mon Sep 17 00:00:00 2001 From: toddn Date: Fri, 28 Jun 2024 13:26:27 -0500 Subject: [PATCH 3/6] pre-commit --- .../components/metadata/DisplayMetadata.tsx | 133 ++++++++++-------- 1 file changed, 74 insertions(+), 59 deletions(-) diff --git a/frontend/src/components/metadata/DisplayMetadata.tsx b/frontend/src/components/metadata/DisplayMetadata.tsx index 5400d43fc..de0a2af67 100644 --- a/frontend/src/components/metadata/DisplayMetadata.tsx +++ b/frontend/src/components/metadata/DisplayMetadata.tsx @@ -122,68 +122,83 @@ export const DisplayMetadata = (props: MetadataType) => { if (publicView) currentMetadataDefList = publicMetadataDefinitionList; else currentMetadataDefList = metadataDefinitionList; - return currentMetadataDefList.map((metadataDef) => { - return metadataList.map((metadata, idx) => { - if (metadataDef.name === metadata.definition) { - return ( - - {metadata.definition} - - {metadata.description} - - { - // construct metadata using its definition - metadataDef.fields.map((field, idxx) => { - return React.cloneElement( - metadataConfig[field.widgetType ?? "NA"] ?? - metadataConfig["NA"], - { - widgetName: metadataDef.name, - fieldName: field.name, - options: field.config.options ?? [], - updateMetadata: updateMetadata, - initialReadOnly: true, - resourceId: resourceId, - content: metadata.content ?? null, - metadataId: metadata.id ?? null, - isRequired: field.required, - key: idxx, - datasetRole: datasetRole, - frozen: about.frozen, - frozenVersionNum: about.frozen_version_num, - } - ); - }) - } - - - - - 0) { + return currentMetadataDefList.map((metadataDef) => { + return metadataList.map((metadata, idx) => { + if (metadataDef.name === metadata.definition) { + return ( + + {metadata.definition} + + {metadata.description} + + { + // construct metadata using its definition + metadataDef.fields.map((field, idxx) => { + return React.cloneElement( + metadataConfig[field.widgetType ?? "NA"] ?? + metadataConfig["NA"], + { + widgetName: metadataDef.name, + fieldName: field.name, + options: field.config.options ?? [], + updateMetadata: updateMetadata, + initialReadOnly: true, + resourceId: resourceId, + content: metadata.content ?? null, + metadataId: metadata.id ?? null, + isRequired: field.required, + key: idxx, + datasetRole: datasetRole, + frozen: about.frozen, + frozenVersionNum: about.frozen_version_num, + } + ); + }) + } + + + + - - - + + + + + - - - ); - } + + ); + } + }); }); - }); + } else { + return ( + +

+ Currently there is no user metadata provided for this dataset. + To start adding some click on the Add metadata button. User + metadata is metadata about the dataset added by any user who has + write permission to the dataset. The list of available field is + defined by the administrators of the system. If you would like + to add a new entry please contact one of the administrators. +

+ + ); + } })()} ); From c098a65a96ffcc93d4ce9f1979128e08fa5faef8 Mon Sep 17 00:00:00 2001 From: toddn Date: Fri, 28 Jun 2024 13:33:09 -0500 Subject: [PATCH 4/6] precommit --- .../src/components/metadata/DisplayListenerMetadata.tsx | 8 +++++++- frontend/src/components/metadata/DisplayMetadata.tsx | 9 +++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/metadata/DisplayListenerMetadata.tsx b/frontend/src/components/metadata/DisplayListenerMetadata.tsx index 70aa4bd0b..aa3a982f8 100644 --- a/frontend/src/components/metadata/DisplayListenerMetadata.tsx +++ b/frontend/src/components/metadata/DisplayListenerMetadata.tsx @@ -104,7 +104,13 @@ export const DisplayListenerMetadata = (props: MetadataType) => { metadataList = publicFileMetadataList; else if (resourceType === "dataset" && publicView) metadataList = publicDatasetMetadataList; - if (metadataList.length > 0) { + let hasAgentMetadata = false; + metadataList.map((metadata, idx) => { + if (metadata.agent.listener !== null) { + hasAgentMetadata = true; + } + }); + if (hasAgentMetadata) { return ( {metadataList.map((metadata, idx) => { diff --git a/frontend/src/components/metadata/DisplayMetadata.tsx b/frontend/src/components/metadata/DisplayMetadata.tsx index de0a2af67..c83adb662 100644 --- a/frontend/src/components/metadata/DisplayMetadata.tsx +++ b/frontend/src/components/metadata/DisplayMetadata.tsx @@ -121,8 +121,13 @@ export const DisplayMetadata = (props: MetadataType) => { metadataList = publicDatasetMetadataList; if (publicView) currentMetadataDefList = publicMetadataDefinitionList; else currentMetadataDefList = metadataDefinitionList; - - if (metadataList.length > 0) { + let hasUserMetadata = false; + metadataList.map((metadata, idx) => { + if (metadata.agent.listener === null) { + hasUserMetadata = true; + } + }); + if (hasUserMetadata) { return currentMetadataDefList.map((metadataDef) => { return metadataList.map((metadata, idx) => { if (metadataDef.name === metadata.definition) { From 5c573f1445a9a1515a09c5ae99510e64963542d0 Mon Sep 17 00:00:00 2001 From: toddn Date: Fri, 28 Jun 2024 15:24:53 -0500 Subject: [PATCH 5/6] changing alignment. using 'resource' instead of 'dataset' in message --- frontend/src/components/metadata/DisplayListenerMetadata.tsx | 2 +- frontend/src/components/metadata/DisplayMetadata.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/metadata/DisplayListenerMetadata.tsx b/frontend/src/components/metadata/DisplayListenerMetadata.tsx index aa3a982f8..0ad1db1fa 100644 --- a/frontend/src/components/metadata/DisplayListenerMetadata.tsx +++ b/frontend/src/components/metadata/DisplayListenerMetadata.tsx @@ -136,7 +136,7 @@ export const DisplayListenerMetadata = (props: MetadataType) => { ); } else { return ( - +

Currently there is no machine metadata. This means either no listeners are enabled for this resource, or that this resource diff --git a/frontend/src/components/metadata/DisplayMetadata.tsx b/frontend/src/components/metadata/DisplayMetadata.tsx index c83adb662..40daf31c6 100644 --- a/frontend/src/components/metadata/DisplayMetadata.tsx +++ b/frontend/src/components/metadata/DisplayMetadata.tsx @@ -192,9 +192,9 @@ export const DisplayMetadata = (props: MetadataType) => { }); } else { return ( - +

- Currently there is no user metadata provided for this dataset. + Currently there is no user metadata provided for this resource. To start adding some click on the Add metadata button. User metadata is metadata about the dataset added by any user who has write permission to the dataset. The list of available field is From 4bbd2cda3b81ca6684b2a1cb5fe8114218e076d7 Mon Sep 17 00:00:00 2001 From: toddn Date: Fri, 28 Jun 2024 15:28:21 -0500 Subject: [PATCH 6/6] remove unused import --- frontend/src/components/metadata/DisplayMetadata.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/components/metadata/DisplayMetadata.tsx b/frontend/src/components/metadata/DisplayMetadata.tsx index 40daf31c6..ad27b50f8 100644 --- a/frontend/src/components/metadata/DisplayMetadata.tsx +++ b/frontend/src/components/metadata/DisplayMetadata.tsx @@ -13,7 +13,6 @@ import { import { Agent } from "./Agent"; import { MetadataDeleteButton } from "./widgets/MetadataDeleteButton"; import { fetchPublicDatasetMetadata } from "../../actions/public_dataset"; -import { Link as RouterLink } from "react-router-dom"; import { AuthWrapper } from "../auth/AuthWrapper"; import { FrozenWrapper } from "../auth/FrozenWrapper";