Skip to content

Commit

Permalink
Hide empty fields from the info tab (#503)
Browse files Browse the repository at this point in the history 
* add validation func

* Update DetailsPanel.jsx

fix eslint
  • Loading branch information
@luorlandini
luorlandini authored Sep 16, 2021
1 parent b4c2747 commit 4343015
Showing 1 changed file with 39 additions and 20 deletions.
59 changes: 39 additions & 20 deletions geonode_mapstore_client/client/js/components/DetailsPanel/DetailsPanel.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,34 +173,52 @@ function DetailsPanel({
const detailUrl = resource?.pk && formatDetailUrl(resource);
const documentDownloadUrl = (resource?.href && resource?.href.includes('download')) ? resource?.href : undefined;
const attributeSet = resource?.attribute_set;

const validateDataType = (data) => {

let dataType;
switch (true) {
case data === 'None':
case data?.length === 0:
dataType = undefined;
break;
default:
dataType = data;
}


return dataType;
};


const infoField = [
{
"label": "Title",
"value": resource?.title
"value": validateDataType(resource?.title)
},
{
"label": "Abstract",
"value": resource?.raw_abstract
"value": validateDataType(resource?.raw_abstract)
},
{
"label": "Owner",
"value": <a href={`/people/profile/${resource?.owner?.username}/`}> {(resource?.owner?.first_name !== "" && resource?.owner?.last_name !== "" ) ? (resource?.owner?.first_name + " " + resource?.owner?.last_name) : resource?.owner?.username} </a>
"value": validateDataType(resource?.owner?.username) && <a href={`/people/profile/${resource?.owner?.username}/`}> {(resource?.owner?.first_name !== "" && resource?.owner?.last_name !== "" ) ? (resource?.owner?.first_name + " " + resource?.owner?.last_name) : resource?.owner?.username} </a>
},
{
"label": "Created",
"value": moment(resource?.created).format('MMMM Do YYYY')
"value": validateDataType(resource?.created) && moment(resource?.created).format('MMMM Do YYYY')
},
{
"label": "Published",
"value": moment(resource?.date).format('MMMM Do YYYY')
"value": validateDataType(resource?.date) && moment(resource?.date).format('MMMM Do YYYY')
},
{
"label": "Last Modified",
"value": moment(resource?.last_updated).format('MMMM Do YYYY')
"value": validateDataType(resource?.last_updated) && moment(resource?.last_updated).format('MMMM Do YYYY')
},
{
"label": "Resource Type",
"value": <a href={formatHref({
"value": validateDataType(resource?.resource_type) && <a href={formatHref({
pathname: '/search/filter/',
query: {
'f': resource?.resource_type
Expand All @@ -209,7 +227,7 @@ function DetailsPanel({
},
{
"label": "Category",
"value": <a href={formatHref({
"value": validateDataType(resource.category?.identifier) && <a href={formatHref({
pathname: '/search/filter/',
query: {
'filter{category.identifier.in}': resource.category?.identifier
Expand All @@ -218,7 +236,7 @@ function DetailsPanel({
},
{
"label": "Keywords",
"value": resource?.keywords?.map((map) => {
"value": validateDataType(resource?.keywords) && resource?.keywords?.map((map) => {
return (<a href={formatHref({
pathname: '/search/filter/',
query: {
Expand All @@ -229,7 +247,7 @@ function DetailsPanel({
},
{
"label": "Regions",
"value": resource?.regions?.map((map) => {
"value": validateDataType(resource?.regions) && resource?.regions?.map((map) => {
return (<a href={formatHref({
pathname: '/search/filter/',
query: {
Expand All @@ -240,54 +258,55 @@ function DetailsPanel({
}
];


const extraItemsList = [
{
"label": "Point of Contact",
"value": <a href={`/messages/create/${resource?.poc?.pk}/`}> {(resource?.poc?.first_name !== "" && resource?.poc?.last_name !== "" ) ? (resource?.poc?.first_name + " " + resource?.poc?.last_name) : resource?.poc?.username} </a>
},
{
"label": "License",
"value": resource?.license?.name_long
"value": validateDataType(resource?.license?.name_long)
},
{
"label": "Attribution",
"value": resource?.attribution
"value": validateDataType(resource?.attribution)
},
{
"label": "Restriction",
"value": resource?.restriction_code_type?.identifier
"value": validateDataType(resource?.restriction_code_type?.identifier)
},
{
"label": "Edition",
"value": resource?.edition
"value": validateDataType(resource?.edition)
},
{
"label": "Maintenance Frequency",
"value": resource?.maintenance_frequency
"value": validateDataType(resource?.maintenance_frequency)
},
{
"label": "Language",
"value": resource?.language
"value": validateDataType(resource?.language)
},
{
"label": "Purpose",
"value": resource?.raw_purpose
"value": validateDataType(resource?.raw_purpose)
},
{
"label": "Data Quality",
"value": resource?.raw_data_quality_statement
"value": validateDataType(resource?.raw_data_quality_statement)
},
{
"label": "Temporal extent",
"value": (resource?.temporal_extent_start) ? resource?.temporal_extent_start + " - " : undefined + (resource?.temporal_extent_end) ? resource?.temporal_extent_end : undefined
},
{
"label": "Spatial Representation Type",
"value": resource?.spatial_representation_type?.identifier
"value": validateDataType(resource?.spatial_representation_type?.identifier)
},
{
"label": "Supplemental Information",
"value": resource?.raw_supplemental_information
"value": validateDataType(resource?.raw_supplemental_information)
}
];

Expand Down

0 comments on commit 4343015

Please sign in to comment.