Skip to content

[TM-3130] Rebuild Sites Pages - subtitle detail #2125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dottyy merged 6 commits into from
Mar 26, 2026
Merged

[TM-3130] Rebuild Sites Pages - subtitle detail #2125

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc5596d
[TM-3130] Refactor SharedDetails component to simplify conditional re…
dottyy Mar 26, 2026
8bada9b
[TM-3130] Refactor className order in SharedDetails component for imp…
dottyy Mar 26, 2026
ef66683
Refactor className order in EntryValueRenderer and SharedDetails comp…
dottyy Mar 26, 2026
673cff1
Refactor className order in sharedDetails component for improved styl…
dottyy Mar 26, 2026
1bba314
Refactor SharedDetails component to simplify entry title rendering an…
dottyy Mar 26, 2026
906e787
Refactor className order in sharedDetails component for styling consi…
dottyy Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 45 additions & 37 deletions src/components/extensive/PageElements/PageContent/components/sharedDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ const EntryValueRenderer = ({ entry, noGoalTableColumns }: EntryValueRendererPro
{row[idx + 1] !== undefined && row[idx + 1] !== "" && (
<Box
className={classNames(
idx === noCountTableColumns.length - 1 ? "" : "mr-8",
"border-b border-theme-neutral-300 py-4"
"border-b border-theme-neutral-300 py-4",
idx === noCountTableColumns.length - 1 ? "" : "mr-8"
)}
>
{row[idx + 1]}
Expand Down Expand Up @@ -198,44 +198,52 @@ const SharedDetails: FC<SharedDetailsProps> = ({
}
>
<Flex flexDirection="column" gap={3}>
{entries.map((entry, index) => (
<Fragment key={`${step.id}-${entry.title}-${index}`}>
<Flex direction="column" gap={1}>
{entry.title === t("Additional Information") ||
(entry.title === t("Tree Species") && step.title === t("Tree Species")) ? null : (
<Text textStyle="300-bold" color="primary.900">
{t(entry.title)}:
</Text>
)}
<EntryValueRenderer entry={entry} noGoalTableColumns={noGoalTableColumns} />
</Flex>
{stepIndex === 0 && index === 0 && entityName === "projects" && (
{entries.map((entry, index) => {
const isAdditionalInformation =
entry.title === "Additional Information" || entry.title === "Tree Species - Additional Information";
return (
<Fragment key={`${step.id}-${entry.title}-${index}`}>
<Flex direction="column" gap={1}>
<Text textStyle="300-bold" color="primary.900">
{t("Project Stage")}:
<Text
textStyle={isAdditionalInformation ? "400" : "300-bold"}
color={isAdditionalInformation ? "neutral.700" : "primary.900"}
>
{t(entry.title)}
{!isAdditionalInformation && ":"}
</Text>
{entity.plantingStatus !== null ? (
<>
<div className="flex items-center gap-2">
<ProgressTag state={getPlantingStatus(entity.plantingStatus)} />
{(entity.plantingStatus === "replacement-planting" ||
entity.plantingStatus === "no-restoration-expected") && (
<>
<ArrowForward boxSize={4} color="neutral.900" />
<Text textStyle="400" color="neutral.900">
{t(PLANTING_STATUS_MAP[entity.plantingStatus!])}
</Text>
</>
)}
</div>
</>
) : (
"-"
)}
<div
className={classNames("my-2 h-px w-full bg-theme-neutral-300", !isAdditionalInformation && "hidden")}
/>
<EntryValueRenderer entry={entry} noGoalTableColumns={noGoalTableColumns} />
</Flex>
)}
</Fragment>
))}
{stepIndex === 0 && index === 0 && entityName === "projects" && (
<Flex direction="column" gap={1}>
<Text textStyle="300-bold" color="primary.900">
{t("Project Stage")}:
</Text>
{entity.plantingStatus !== null ? (
<>
<div className="flex items-center gap-2">
<ProgressTag state={getPlantingStatus(entity.plantingStatus)} />
{(entity.plantingStatus === "replacement-planting" ||
entity.plantingStatus === "no-restoration-expected") && (
<>
<ArrowForward boxSize={4} color="neutral.900" />
<Text textStyle="400" color="neutral.900">
{t(PLANTING_STATUS_MAP[entity.plantingStatus!])}
</Text>
</>
)}
</div>
</>
) : (
"-"
)}
</Flex>
)}
</Fragment>
);
})}
</Flex>
</Accordion>
);
Expand Down
Loading