[DEV-3015] Add generic filtered grid #1738
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "nextjs-website": minor | ||
| --- | ||
|
|
||
| Generalise filtered grid component |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,7 @@ const DesktopFilterSelector = ({ | |
| }: DesktopFilterSelectorProps) => { | ||
| return ( | ||
| <Stack | ||
| id={'filters'} | ||
| component='section' | ||
| spacing={{ md: '32px', sm: '16px' }} | ||
| direction={'row'} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,6 +40,7 @@ const MobileFilterSelector = ({ | |
| const icon = isExpanded ? null : <ExpandMoreIcon />; | ||
| return ( | ||
| <Box | ||
| id={'filters'} | ||
| sx={{ | ||
| backgroundColor: '#EBF4FD', | ||
| paddingY: '24px', | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,7 +1,9 @@ | ||||||
| 'use client'; | ||||||
|
|
||||||
| import { Tag } from '@/lib/types/tag'; | ||||||
| import Newsroom, { | ||||||
| INewsroomItem, | ||||||
| } from '@/editorialComponents/Newsroom/Newsroom'; | ||||||
| import { Box, useMediaQuery } from '@mui/material'; | ||||||
| import React, { useState } from 'react'; | ||||||
| import { useTranslations } from 'next-intl'; | ||||||
|
|
@@ -12,21 +14,23 @@ import SectionTitle from '@/components/molecules/SectionTitle/SectionTitle'; | |||||
| import { UseCase } from '@/lib/types/useCaseData'; | ||||||
| import { PRODUCT_HEADER_HEIGHT } from '@/components/atoms/ProductHeader/ProductHeader'; | ||||||
|
|
||||||
| type FilteredGridLayoutProps = { | ||||||
| readonly items: readonly (INewsroomItem & { tags: readonly Tag[] })[]; | ||||||
| readonly tags: readonly Tag[]; | ||||||
|
There was a problem hiding this comment. Would put this optional
Suggested change
|
||||||
| readonly enableFilters?: boolean; | ||||||
| readonly noItemsMessageKey?: string; | ||||||
| }; | ||||||
|
|
||||||
| export const FilteredGridLayout = ({ | ||||||
| tags, | ||||||
| items, | ||||||
| enableFilters, | ||||||
| noItemsMessageKey = '', | ||||||
| }: FilteredGridLayoutProps) => { | ||||||
| const t = useTranslations(); | ||||||
| const updatedTags = [ | ||||||
| { | ||||||
| name: t('overview.all'), | ||||||
| icon: { | ||||||
| data: { | ||||||
| attributes: { | ||||||
|
|
@@ -53,17 +57,17 @@ export const UseCaseList = ({ | |||||
| ); | ||||||
| const [selectedTag, setSelectedTag] = useState(tagValue); | ||||||
|
|
||||||
| const filteredItems = items.filter((item) => { | ||||||
| return ( | ||||||
| selectedTag === 0 || | ||||||
| item.tags?.some((tag) => tag.name === updatedTags[selectedTag].name) | ||||||
|
There was a problem hiding this comment. this should already handle the null tags scenario |
||||||
| ); | ||||||
| }); | ||||||
| // eslint-disable-next-line functional/no-return-void | ||||||
| const setSelectedTagFilter = (newTag: number): void => { | ||||||
| if (newTag === selectedTag) return; | ||||||
| addQueryParam('tag', `${newTag}`); | ||||||
| const element = document.getElementById('filtered-grid'); | ||||||
| if (element) { | ||||||
| const y = | ||||||
| element.getBoundingClientRect().top + | ||||||
|
|
@@ -81,8 +85,8 @@ export const UseCaseList = ({ | |||||
| }; | ||||||
| const isSmallScreen = useMediaQuery('(max-width: 1000px)'); | ||||||
| return ( | ||||||
| <Box id='filtered-grid'> | ||||||
| <Box sx={{ paddingBottom: filteredItems.length > 0 ? '24px' : 0 }}> | ||||||
| {enableFilters && | ||||||
| tags.length > 0 && | ||||||
| (isSmallScreen ? ( | ||||||
|
|
@@ -99,7 +103,7 @@ export const UseCaseList = ({ | |||||
| /> | ||||||
| ))} | ||||||
| </Box> | ||||||
| {filteredItems.length <= 0 ? ( | ||||||
| <Box | ||||||
| pt={8} | ||||||
| pb={2} | ||||||
|
|
@@ -109,24 +113,12 @@ export const UseCaseList = ({ | |||||
| alignItems: 'center', | ||||||
| }} | ||||||
| > | ||||||
| <SectionTitle title={t(noItemsMessageKey)} /> | ||||||
| </Box> | ||||||
| ) : ( | ||||||
| <Newsroom | ||||||
| items={filteredItems.map((item) => ({ | ||||||
| ...item, | ||||||
| }))} | ||||||
| /> | ||||||
| )} | ||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would put a default value for tags on the FilteredGridLayout component itself allowing it to take undefined or falsey tags and handle the case with a fallback to empty array in the component