Skip to content

Commit 8502322

Browse files
nebojsactnebojsact
authored
Merge pull request #70 from IntersectMBO/Temp-BugFix-#2650
Temporaly BugFix Sorting Icon #2650
2 parents 99d99c9 + 59b1083 commit 8502322

File tree

2 files changed

+77
-35
lines changed

2 files changed

+77
-35
lines changed

‎pdf-ui/CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
As a minor extension, we also keep a semantic version for the `UNRELEASED`
99
changes.
10+
## [v0.5.8](https://www.npmjs.com/package/@intersect.mbo/pdf-ui/v/0.5.8) 2025-01-27
11+
### Added -
12+
### Fixed
13+
- Temporaly fix for Sorting Icon [Issue #2650](https://github.com/IntersectMBO/govtool/issues/2650)
14+
15+
## [v0.5.7](https://www.npmjs.com/package/@intersect.mbo/pdf-ui/v/0.5.7) 2025-01-19
16+
### Added -
17+
### Fixed
18+
- Search Field Bug, Searches Fail with Trailing Spaces [Issue #2472](https://github.com/IntersectMBO/govtool/issues/2471)
19+
- Markdown Styling Issues in Proposal Formatting [Issue #2651](https://github.com/IntersectMBO/govtool/issues/2651)
1020

1121
## [v0.5.6](https://www.npmjs.com/package/@intersect.mbo/pdf-ui/v/0.5.6) 2025-01-09
1222
### Added -

‎pdf-ui/src/pages/ProposedGovernanceActions/index.jsx‎

Lines changed: 67 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import {
77
IconSort,
88
IconPlusCircle,
99
IconArrowLeft,
10+
IconArrowDown,
11+
IconArrowUp,
1012
} from '@intersect.mbo/intersectmbo.org-icons-set';
1113
import {
1214
Box,
@@ -249,14 +251,31 @@ const ProposedGovernanceActions = () => {
249251
</Grid>
250252
<Grid item>
251253
<Box gap={1} display={'flex'}>
252-
<Tooltip title='Filters'>
253-
<IconButton
254-
id='filters-button'
255-
data-testid='filter-button'
256-
sx={{
257-
width: 40,
258-
height: 40,
259-
}}
254+
<Button
255+
variant="outlined"
256+
onClick={handleFiltersClick}
257+
endIcon={<IconFilter
258+
color={
259+
theme.palette.primary.icons
260+
.black
261+
}
262+
/>}
263+
id='filters-button'
264+
data-testid='filter-button'
265+
sx={{
266+
textTransform: 'none',
267+
borderRadius: '20px',
268+
padding: '8px 16px',
269+
borderColor: 'primary.main',
270+
color: 'text.primary',
271+
'&:hover': {
272+
backgroundColor: 'action.hover',
273+
},
274+
}}
275+
// sx={{
276+
// width: 40,
277+
// height: 40,
278+
// }}
260279
aria-controls={
261280
openFilters
262281
? 'filters-menu'
@@ -266,16 +285,10 @@ const ProposedGovernanceActions = () => {
266285
aria-expanded={
267286
openFilters ? 'true' : undefined
268287
}
269-
onClick={handleFiltersClick}
270-
>
271-
<IconFilter
272-
color={
273-
theme.palette.primary.icons
274-
.black
275-
}
276-
/>
277-
</IconButton>
278-
</Tooltip>
288+
289+
290+
> Filter:
291+
</Button>
279292
<Menu
280293
id='filters-menu'
281294
anchorEl={filtersAnchorEl}
@@ -311,7 +324,7 @@ const ProposedGovernanceActions = () => {
311324
mb: 1,
312325
}}
313326
>
314-
Proposals types
327+
Proposal types
315328
</Typography>
316329
<Divider
317330
sx={{
@@ -381,7 +394,7 @@ const ProposedGovernanceActions = () => {
381394
variant='body1'
382395
sx={{ mb: 1, mt: 2 }}
383396
>
384-
Proposals status
397+
Proposal status
385398
</Typography>
386399
<Divider
387400
sx={{
@@ -447,34 +460,53 @@ const ProposedGovernanceActions = () => {
447460
label={'Active proposal'}
448461
/>
449462
</MenuItem>
463+
450464
<MenuItem
451465
onClick={() => resetFilters()}
452466
data-testid='reset-filters'
453-
>
454-
<Typography color={'primary'}>
467+
> <Typography color={'primary'}>
455468
Reset filters
456469
</Typography>
457470
</MenuItem>
458471
</Box>
459472
</Menu>
460-
<Tooltip title='Sort'>
461-
<IconButton
462-
id='sort-button'
463-
data-testid='sort-button'
464-
onClick={() =>
465-
setSortType((prev) =>
466-
prev === 'desc' ? 'asc' : 'desc'
467-
)
468-
}
469-
>
470-
<IconSort
473+
<Button
474+
variant="outlined"
475+
onClick={() =>
476+
setSortType((prev) =>
477+
prev === 'desc' ? 'asc' : 'desc'
478+
)}
479+
endIcon={
480+
sortType === 'desc' ? (
481+
<IconArrowUp
471482
color={
472483
theme.palette.primary.icons
473484
.black
474485
}
475486
/>
476-
</IconButton>
477-
</Tooltip>
487+
) : (
488+
<IconArrowDown
489+
color={
490+
theme.palette.primary.icons
491+
.red
492+
}
493+
/>
494+
// <IconArrowDown />
495+
)
496+
}
497+
sx={{
498+
textTransform: 'none',
499+
borderRadius: '20px',
500+
padding: '8px 16px',
501+
borderColor: 'primary.main',
502+
color: 'text.primary',
503+
'&:hover': {
504+
backgroundColor: 'action.hover',
505+
},
506+
}}
507+
>
508+
Sort: {sortType === 'desc' ? 'Last modified (asc)' : 'Last modified (desc)'}
509+
</Button>
478510
</Box>
479511
</Grid>
480512
</Grid>

0 commit comments

Comments
 (0)