Skip to content

Commit 7386be2

Browse files
Merge pull request #161 from CivicDataLab/155-fix-bugs
155 fix bugs
2 parents 96a8aa0 + fbaeeff commit 7386be2

File tree

4 files changed

+176
-180
lines changed

4 files changed

+176
-180
lines changed

app/[locale]/(user)/datasets/[datasetIdentifier]/components/Metadata/index.tsx

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React from 'react';
22
import Link from 'next/link';
33
import { Button, Icon, Text } from 'opub-ui';
4-
54
import { toTitleCase } from '@/lib/utils';
65
import { Icons } from '@/components/icons';
76

@@ -20,7 +19,7 @@ const MetadataComponent: React.FC<MetadataProps> = ({ data, setOpen }) => {
2019
);
2120

2221
return (
23-
<div className="rounded-md shadow-md flex flex-col gap-6 bg-surfaceDefault px-6 py-4 lg:px-8 lg:py-6">
22+
<div className="rounded-md shadow-md flex flex-col gap-6 bg-surfaceDefault px-6 py-4 lg:px-8 lg:py-6">
2423
<div className="flex items-center justify-between">
2524
<Text variant="headingMd" fontWeight="semibold">
2625
Metadata
@@ -31,7 +30,6 @@ const MetadataComponent: React.FC<MetadataProps> = ({ data, setOpen }) => {
3130
</Button>
3231
)}
3332
</div>
34-
3533
<div className="flex flex-col gap-5 align-baseline">
3634
{filteredMetadataArray.map((item: any, index: any) => (
3735
<div
@@ -41,11 +39,13 @@ const MetadataComponent: React.FC<MetadataProps> = ({ data, setOpen }) => {
4139
<Text className="text-base min-w-[120px] basis-1/4 font-medium">
4240
{toTitleCase(item.metadataItem.label)}:
4341
</Text>
44-
<Text className="text-base">{item.value}</Text>
42+
<Text className="text-base truncate max-w-xs " title={item.value}>
43+
{item.value}
44+
</Text>
4545
</div>
4646
))}
4747
{data?.formats.length > 0 && (
48-
<div className="flex items-baseline gap-2 border-b-2 border-solid border-baseGraySlateSolid6 pb-2">
48+
<div className="flex items-baseline gap-2 border-b-2 border-solid border-baseGraySlateSolid6 pb-2">
4949
<Text className="text-base min-w-[120px] basis-1/4 font-medium">
5050
Formats:
5151
</Text>
@@ -57,7 +57,7 @@ const MetadataComponent: React.FC<MetadataProps> = ({ data, setOpen }) => {
5757
</div>
5858
)}
5959
{data?.categories.length > 0 && (
60-
<div className="flex items-baseline gap-2 border-b-2 border-solid border-baseGraySlateSolid6 pb-2">
60+
<div className="flex items-baseline gap-2 border-b-2 border-solid border-baseGraySlateSolid6 pb-2">
6161
<Text className="text-base min-w-[120px] basis-1/4 font-medium">
6262
Category:
6363
</Text>
@@ -69,15 +69,14 @@ const MetadataComponent: React.FC<MetadataProps> = ({ data, setOpen }) => {
6969
className="flex justify-center"
7070
key={index}
7171
>
72-
<Text className=" underline">{item.name}</Text>
72+
<Text className="underline">{item.name}</Text>
7373
</Link>
7474
))}
7575
</div>
7676
</div>
7777
)}
78-
7978
{data?.tags.length > 0 && (
80-
<div className="flex items-baseline gap-2 pb-2">
79+
<div className="flex items-baseline gap-2 pb-2">
8180
<Text className="text-base min-w-[120px] basis-1/4 font-medium">
8281
Tags:
8382
</Text>
@@ -89,7 +88,7 @@ const MetadataComponent: React.FC<MetadataProps> = ({ data, setOpen }) => {
8988
className="flex justify-center"
9089
key={index}
9190
>
92-
<Text className=" underline">{item.value}</Text>
91+
<Text className="underline">{item.value}</Text>
9392
</Link>
9493
))}
9594
</div>

app/[locale]/(user)/datasets/components/Card/index.tsx

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ interface Dataset {
2727
}
2828

2929
const Cards = ({ data }: { data: Dataset }) => {
30+
31+
3032
function getMetadataValue(data: Dataset, label: string): string | null {
3133
const metadataEntry = data.metadata.find(
3234
(entry) => entry.metadata_item.label === label
@@ -107,19 +109,7 @@ const Cards = ({ data }: { data: Dataset }) => {
107109
{getMetadataValue(data, 'Update Frequency') || 'NA'}
108110
</Text>
109111
</div>
110-
<Text
111-
color="default"
112-
className="text-textSubdued"
113-
variant="bodySm"
114-
fontWeight="regular"
115-
>
116-
Reference Period:{' '}
117-
{formatDateString(getMetadataValue(data, 'Period From')) ||
118-
'NA'}{' '}
119-
to{' '}
120-
{formatDateString(getMetadataValue(data, 'Period To')) ||
121-
'NA'}
122-
</Text>
112+
123113
</span>
124114
</div>
125115

0 commit comments

Comments
 (0)