Skip to content

Fix Inventory Result Scrolling (CRASM-2209) #849

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
rapidray12 merged 2 commits into from
Apr 9, 2025
Merged

Fix Inventory Result Scrolling (CRASM-2209) #849

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ff677c
Refactor Result Card div to allow scrolling
hawkishpolicy Apr 8, 2025
e0f2605
Merge remote-tracking branch 'origin/develop' into Fix-Inventory-Sear…
hawkishpolicy Apr 8, 2025
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
154 changes: 79 additions & 75 deletions frontend/src/pages/Search/Inventory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,36 @@ export const DashboardUI: React.FC<ContextType & { location: any }> = (
paddingLeft: '0%'
}}
/>
<Box
width="90%"
display="flex"
alignSelf={'anchor-center'}
flexDirection={'column'}
>
<FilterTags filters={filtersToDisplay} removeFilter={removeFilter} />
<Stack
spacing={2}
direction="row"
alignItems="center"
justifyContent="space-between"
>
<SortBar
sortField={sortField}
sortDirection={sortDirection}
setSort={setSort}
isFixed={resultsScrolled}
advancedFiltersReq={advanceFiltersReq}
/>
<SaveSearchModal
searchTerm={searchTerm}
filters={filters}
totalResults={totalResults}
sortField={''}
sortDirection={''}
advancedFiltersReq={advanceFiltersReq}
/>
</Stack>
</Box>
<Box
position="relative"
height="calc(100% - 32px - 32px - 46px - 10px)"
Expand All @@ -125,82 +155,56 @@ export const DashboardUI: React.FC<ContextType & { location: any }> = (
flexDirection="column"
alignItems="center"
justifyContent="center"
overflow="auto"
>
<Box width="90%" height="100%" display="flex" flexDirection="column">
<FilterTags filters={filtersToDisplay} removeFilter={removeFilter} />
<Stack
spacing={2}
direction="row"
alignItems="center"
justifyContent="space-between"
>
<SortBar
sortField={sortField}
sortDirection={sortDirection}
setSort={setSort}
isFixed={resultsScrolled}
advancedFiltersReq={advanceFiltersReq}
/>
<SaveSearchModal
searchTerm={searchTerm}
filters={filters}
totalResults={totalResults}
sortField={''}
sortDirection={''}
advancedFiltersReq={advanceFiltersReq}
/>
</Stack>
<Box
height="100%"
flexDirection="column"
flexWrap="nowrap"
gap="1rem"
alignItems="stretch"
display="flex"
position="relative"
padding="0 0 2rem 0"
sx={{ overflowY: 'auto' }}
>
{noResults ? (
<Box
display="flex"
flex="1"
alignItems="center"
justifyContent="center"
height="100%"
>
<Stack spacing={2} alignItems="center" direction={'column'}>
<NoResults
message={
"We don't see any results that match your criteria."
}
></NoResults>
<Button
variant="contained"
onClick={() =>
initialFiltersForUser.forEach((filter) => {
filter.values.forEach((value) => {
addFilter(filter.field, value, filter.type);
});
})
}
>
{' '}
Reset Filters
</Button>
</Stack>
</Box>
) : (
results.map((result) => (
<ResultCard
key={result.id.raw}
{...result}
onDomainSelected={(id) => setSelectedDomain(id)}
selected={result.id.raw === selectedDomain}
/>
))
)}
</Box>
<Box
height="100%"
width="90%"
flexDirection="column"
flexWrap="nowrap"
gap="1rem"
alignItems="stretch"
display="flex"
position="relative"
padding="0 0 2rem 0"
>
{noResults ? (
<Box
display="flex"
flex="1"
alignItems="center"
justifyContent="center"
height="100%"
>
<Stack spacing={2} alignItems="center" direction={'column'}>
<NoResults
message={"We don't see any results that match your criteria."}
></NoResults>
<Button
variant="contained"
onClick={() =>
initialFiltersForUser.forEach((filter) => {
filter.values.forEach((value) => {
addFilter(filter.field, value, filter.type);
});
})
}
>
{' '}
Reset Filters
</Button>
</Stack>
</Box>
) : (
results.map((result) => (
<ResultCard
key={result.id.raw}
{...result}
onDomainSelected={(id) => setSelectedDomain(id)}
selected={result.id.raw === selectedDomain}
/>
))
)}
</Box>
</Box>
<Paper className={classes.pagination}>
Expand Down
Loading