Skip to content

Issue 4062 Filter ans Sorting Icons goes to new line #4063

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 8, 2025
Merged

Issue 4062 Filter ans Sorting Icons goes to new line #4063

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
75 changes: 41 additions & 34 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,8 +74,9 @@ export const DataActionsBar: FC<DataActionsBarProps> = ({
alignItems="center"
display="flex"
justifyContent="space-between"
gap={1.5}
flexWrap="wrap"
gap={{ xs: 0.75, sm: 1.5 }}
flexWrap="nowrap"
width="100%"
>
<InputBase
inputProps={{ "data-testid": "search-input" }}
Expand Down Expand Up @@ -113,38 +114,47 @@ export const DataActionsBar: FC<DataActionsBarProps> = ({
fontWeight: 500,
height: 48,
padding: "16px 24px",
maxWidth: 500,
flex: "0 0 auto",
flex: "1 1 auto",
minWidth: 0,
maxWidth: "none",
}}
/>

<OrderActionsChip
chosenFiltersLength={chosenFiltersLength}
filtersOpen={effectiveFiltersOpen}
isFiltering={isFiltering}
setFiltersOpen={setEffectiveFiltersOpen}
chosenSorting={chosenSorting}
setSortOpen={setEffectiveSortOpen}
sortOpen={effectiveSortOpen}
<Box
sx={{
display: "flex",
alignItems: "center",
gap: { xs: 0.5, sm: 1.25 },
}}
>
{effectiveFiltersOpen && (
<DataActionsFilters
chosenFilters={chosenFilters}
setChosenFilters={setChosenFilters}
closeFilters={closeFilters}
options={filterOptions}
title={filtersTitle}
/>
)}
{effectiveSortOpen && (
<DataActionsSorting
chosenSorting={chosenSorting}
setChosenSorting={setChosenSorting}
closeSorts={closeSorts}
options={sortOptions}
/>
)}
</OrderActionsChip>
<OrderActionsChip
chosenFiltersLength={chosenFiltersLength}
filtersOpen={effectiveFiltersOpen}
isFiltering={isFiltering}
setFiltersOpen={setEffectiveFiltersOpen}
chosenSorting={chosenSorting}
setSortOpen={setEffectiveSortOpen}
sortOpen={effectiveSortOpen}
>
{effectiveFiltersOpen && (
<DataActionsFilters
chosenFilters={chosenFilters}
setChosenFilters={setChosenFilters}
closeFilters={closeFilters}
options={filterOptions}
title={filtersTitle}
/>
)}
{effectiveSortOpen && (
<DataActionsSorting
chosenSorting={chosenSorting}
setChosenSorting={setChosenSorting}
closeSorts={closeSorts}
options={sortOptions}
/>
)}
</OrderActionsChip>
</Box>
</Box>

{selectedFilterItems.length > 0 && (
Expand All @@ -153,10 +163,7 @@ export const DataActionsBar: FC<DataActionsBarProps> = ({
flexWrap="wrap"
gap={1}
alignItems="flex-start"
sx={{
mt: 2,
"& > *": { flex: "0 0 auto", alignSelf: "flex-start" },
}}
sx={{ mt: 2, "& > *": { flex: "0 0 auto", alignSelf: "flex-start" } }}
>
{selectedFilterItems.map(({ key, label }) => (
<ChipButton
Expand Down
129 changes: 73 additions & 56 deletions govtool/frontend/src/components/organisms/DashboardDrawerMobile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,34 @@ import { useFeatureFlag } from "@context";
import { DashboardDrawerMobileProps } from "./types";

const DRAWER_PADDING = 2;
// 8 is number of multiple in Material UI 2 is left and right side
const CALCULATED_DRAWER_PADDING = DRAWER_PADDING * 8 * 2;

type DrawerLinkBase = {
dataTestId?: string;
label: string;
navTo: string;
newTabLink?: string;
};

type NavItem = DrawerLinkBase & {
childNavItems?: DrawerLinkBase[];
};

export const DashboardDrawerMobile = ({
isDrawerOpen,
setIsDrawerOpen,
}: DashboardDrawerMobileProps) => {
const { isProposalDiscussionForumEnabled, isGovernanceOutcomesPillarEnabled } = useFeatureFlag();
const {
isProposalDiscussionForumEnabled,
isGovernanceOutcomesPillarEnabled,
} = useFeatureFlag();
const { screenWidth } = useScreenDimension();
const { voter } = useGetVoterInfo();

const openDrawer = () => {
setIsDrawerOpen(true);
};
const openDrawer = () => setIsDrawerOpen(true);
const closeDrawer = () => setIsDrawerOpen(false);

const closeDrawer = () => {
setIsDrawerOpen(false);
};
const navItems = CONNECTED_NAV_ITEMS as unknown as NavItem[];

return (
<SwipeableDrawer
Expand Down Expand Up @@ -73,65 +83,72 @@ export const DashboardDrawerMobile = ({
<img alt="drawer" src={ICONS.closeDrawerIcon} />
</IconButton>
</Box>

<Grid container direction="column" rowGap={4} mt={6}>
{CONNECTED_NAV_ITEMS.map((navItem) => (
<Grid item>
{navItems.map((navItem, i) => (
<Grid
item
key={
navItem.dataTestId ??
navItem.label ??
navItem.navTo ??
`nav-${i}`
}
>
<Link
{...navItem}
size="big"
onClick={() => {
if (navItem.newTabLink) {
openInNewTab(navItem.newTabLink);
}
setIsDrawerOpen(false);
}}
if (navItem.newTabLink) openInNewTab(navItem.newTabLink);
setIsDrawerOpen(false);
}}
isConnectWallet
/>
{navItem.childNavItems && (
<Grid
container
direction="column"
rowGap={4}
mt={3}
pl={3}
>
{navItem.childNavItems.map((childItem) => {
if (
!isProposalDiscussionForumEnabled &&
childItem.dataTestId === "proposal-discussion-link"
) {
return null;
}

if (
!isGovernanceOutcomesPillarEnabled &&
(childItem.dataTestId === "governance-actions-voted-by-me-link" ||
childItem.dataTestId === "governance-actions-outcomes-link")
) {
return null;
}

return (
<Link
key={childItem.label}
{...childItem}
size="big"
onClick={() => {
if (childItem.newTabLink) {
openInNewTab(childItem.newTabLink);
}
setIsDrawerOpen(false);
}}
isConnectWallet
/>
);
})}
</Grid>
)}
{!!navItem.childNavItems?.length && (
<Grid container direction="column" rowGap={4} mt={3} pl={3}>
{navItem.childNavItems.map((childItem, ci) => {
if (
!isProposalDiscussionForumEnabled &&
childItem.dataTestId === "proposal-discussion-link"
) {
return null;
}
if (
!isGovernanceOutcomesPillarEnabled &&
(childItem.dataTestId ===
"governance-actions-voted-by-me-link" ||
childItem.dataTestId ===
"governance-actions-outcomes-link")
) {
return null;
}
return (
<Link
key={
childItem.dataTestId ??
childItem.label ??
childItem.navTo ??
`child-${i}-${ci}`
}
{...childItem}
size="big"
onClick={() => {
if (childItem.newTabLink)
openInNewTab(childItem.newTabLink);
setIsDrawerOpen(false);
}}
isConnectWallet
/>
);
})}
</Grid>
)}
</Grid>
))}
))}
</Grid>
</Box>

{(voter?.isRegisteredAsDRep || voter?.isRegisteredAsSoleVoter) && (
<DRepInfoCard />
)}
Expand Down