Skip to content

Fix/Issue 4062 Filter ans Sorting Icons goes to new line #4090

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
bosko-m merged 1 commit into from
Sep 19, 2025
Merged

Fix/Issue 4062 Filter ans Sorting Icons goes to new line #4090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 10 additions & 7 deletions govtool/frontend/src/components/molecules/DataActionsBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,16 @@ export const DataActionsBar: FC<DataActionsBarProps> = ({
setChosenFilters?.((prev) => (prev ?? []).filter((k) => k !== key));

return (
<Box display="flex" flexDirection="column" gap={1.5}>
<Box display="flex" flexDirection="column" gap={1.5} sx={{ width: "100%" }}>
<Box
display="grid"
gridTemplateColumns={{
xs: "minmax(0,1fr) max-content",
sm: "minmax(0,1fr) max-content",
}}
columnGap={{ xs: 1, sm: 1.5 }}
alignItems="center"
display="flex"
justifyContent="space-between"
gap={{ xs: 0.75, sm: 1.5 }}
flexWrap={{ xs: "wrap", sm: "nowrap" }}
width="100%"
sx={{ width: "100%" }}
>
<InputBase
inputProps={{ "data-testid": "search-input" }}
Expand Down Expand Up @@ -115,7 +117,7 @@ export const DataActionsBar: FC<DataActionsBarProps> = ({
borderColor: "#6E87D9",
borderRadius: 50,
boxShadow: "2px 2px 20px 0 rgba(0,0,0,0.05)",
fontSize: 11,
fontSize: { xs: 16, sm: 11 },
fontWeight: 500,
height: 48,
padding: "16px 24px",
Expand All @@ -133,6 +135,7 @@ export const DataActionsBar: FC<DataActionsBarProps> = ({
flex: "0 0 auto",
flexShrink: 0,
mt: { xs: 1, sm: 0 },
mr: { xs: 2, sm: 0 },
}}
>
<OrderActionsChip
Expand Down
140 changes: 85 additions & 55 deletions govtool/frontend/src/pages/DRepDirectoryContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ export const DRepDirectoryContent: FC<DRepDirectoryContentProps> = ({
const [inProgressDelegationDRepData, setInProgressDelegationDRepData] =
useState<DRepData | undefined>(undefined);

// Set initial filters and sort
useEffect(() => {
if (!lastPath.includes("drep_directory")) {
setChosenFilters([DRepStatus.Active]);
Expand Down Expand Up @@ -104,7 +103,7 @@ export const DRepDirectoryContent: FC<DRepDirectoryContentProps> = ({
baselineTotalForStatus,
} = useGetDRepListPaginatedQuery(
{
page: page - 1, // convert 1-based UI -> 0-based API
page: page - 1,
pageSize,
searchPhrase: debouncedSearchText,
sorting: chosenSorting as DRepListSort,
Expand Down Expand Up @@ -152,8 +151,13 @@ export const DRepDirectoryContent: FC<DRepDirectoryContentProps> = ({
AutomatedVotingOptionCurrentDelegation.drep_always_no_confidence);

return (
<Box display="flex" flex={1} flexDirection="column" gap={4}>
{/* My delegation */}
<Box
display="flex"
flex={1}
flexDirection="column"
gap={4}
sx={{ width: "100%", maxWidth: "100vw", overflowX: "hidden" }}
>
{myDrep &&
!inProgressDelegation &&
currentDelegation &&
Expand All @@ -162,61 +166,65 @@ export const DRepDirectoryContent: FC<DRepDirectoryContentProps> = ({
<Typography variant="title2" sx={{ mb: 2 }}>
<Trans i18nKey="dRepDirectory.myDelegation" values={{ ada }} />
</Typography>
<DRepCard
dRep={myDrep}
isConnected={!!isConnected}
isInProgress={isSameDRep(myDrep, inProgressDelegation)}
isMe={isSameDRep(myDrep, myDRepId)}
/>
<Box sx={{ width: "100%" }}>
<DRepCard
dRep={myDrep}
isConnected={!!isConnected}
isInProgress={isSameDRep(myDrep, inProgressDelegation)}
isMe={isSameDRep(myDrep, myDRepId)}
/>
</Box>
</div>
)}
{inProgressDelegation &&
inProgressDelegation !== myDRepId &&
inProgressDelegationDRepData && (
<DRepCard
dRep={inProgressDelegationDRepData}
isConnected={!!isConnected}
isMe={isSameDRep(inProgressDelegationDRepData, myDRepId)}
isInProgress
/>
<Box sx={{ width: "100%" }}>
<DRepCard
dRep={inProgressDelegationDRepData}
isConnected={!!isConnected}
isMe={isSameDRep(inProgressDelegationDRepData, myDRepId)}
isInProgress
/>
</Box>
)}

{/* Automated voting options */}
{isConnected && (
<div>
<Typography variant="title2" sx={{ mb: 2 }}>
{t("dRepDirectory.delegationOptions")}
</Typography>
<AutomatedVotingOptions
currentDelegation={
!pendingTransaction.delegate && isAnAutomatedVotingOptionChosen
? currentDelegation?.dRepView
: undefined
}
delegate={delegate}
delegationInProgress={
inProgressDelegation &&
(inProgressDelegation ===
AutomatedVotingOptionDelegationId.abstain ||
inProgressDelegation ===
AutomatedVotingOptionDelegationId.no_confidence)
? inProgressDelegation
: undefined
}
isConnected={!!isConnected}
isDelegationLoading={isDelegating}
votingPower={ada.toString()}
pendingTransaction={pendingTransaction}
txHash={
!pendingTransaction.delegate && isAnAutomatedVotingOptionChosen
? currentDelegation?.txHash
: undefined
}
/>
<Box sx={{ width: "100%" }}>
<AutomatedVotingOptions
currentDelegation={
!pendingTransaction.delegate && isAnAutomatedVotingOptionChosen
? currentDelegation?.dRepView
: undefined
}
delegate={delegate}
delegationInProgress={
inProgressDelegation &&
(inProgressDelegation ===
AutomatedVotingOptionDelegationId.abstain ||
inProgressDelegation ===
AutomatedVotingOptionDelegationId.no_confidence)
? inProgressDelegation
: undefined
}
isConnected={!!isConnected}
isDelegationLoading={isDelegating}
votingPower={ada.toString()}
pendingTransaction={pendingTransaction}
txHash={
!pendingTransaction.delegate && isAnAutomatedVotingOptionChosen
? currentDelegation?.txHash
: undefined
}
/>
</Box>
</div>
)}

{/* DRep list */}
<>
<Typography fontSize={18} fontWeight={500} sx={{ mb: 3 }}>
{t("dRepDirectory.listTitle")}
Expand Down Expand Up @@ -266,11 +274,31 @@ export const DRepDirectoryContent: FC<DRepDirectoryContentProps> = ({
opacity: isPrev ? 0.5 : 1,
transition: "opacity 0.2s",
flex: 1,
width: "100%",
maxWidth: "100%",
overflowX: "hidden",
}}
>
{filteredDoNotListDReps?.length === 0 && <EmptyStateDrepDirectory />}
{filteredDoNotListDReps?.map((dRep) => (
<Box key={dRep.view} component="li" sx={{ listStyle: "none" }}>
<Box
key={dRep.view}
component="li"
sx={{
listStyle: "none",
width: "100%",
maxWidth: "100%",
"& .MuiCard-root, & .MuiPaper-root": {
width: "100% !important",
maxWidth: "100% !important",
marginLeft: "0 !important",
marginRight: "0 !important",
},
"& .MuiCardContent-root, & .MuiCardActions-root": {
minWidth: 0,
},
}}
>
<DRepCard
dRep={dRep}
isConnected={!!isConnected}
Expand All @@ -288,16 +316,18 @@ export const DRepDirectoryContent: FC<DRepDirectoryContentProps> = ({
))}
</Box>

<PaginationFooter
page={page}
total={total || 0}
pageSize={pageSize}
onPageChange={setPage}
onPageSizeChange={(n) => {
setPageSize(n);
setPage(1);
}}
/>
<Box sx={{ width: "100%", maxWidth: "100%", overflowX: "hidden" }}>
<PaginationFooter
page={page}
total={total || 0}
pageSize={pageSize}
onPageChange={setPage}
onPageSizeChange={(n) => {
setPageSize(n);
setPage(1);
}}
/>
</Box>
</>
</Box>
);
Expand Down