Skip to content

fix(OpenFileDialog): use table toolbars #1526

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

Open
cooper-joe wants to merge 7 commits into
base: master
Choose a base branch
from
Open

fix(OpenFileDialog): use table toolbars #1526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3409e99
fix(OpenFileDialog): use table toolbars
cooper-joe Jun 28, 2023
b0c001b
chore: bump UI version
cooper-joe Jun 29, 2023
43795d9
Revert "chore: bump UI version"
jenniferarnesen Nov 1, 2024
7af1827
Merge branch 'master' into open-dialog-design
jenniferarnesen Nov 1, 2024
d84881b
Merge branch 'master' into open-dialog-design
jenniferarnesen Nov 4, 2024
5edcdd3
Merge branch 'master' into open-dialog-design
jenniferarnesen Dec 5, 2024
5e7901f
Merge branch 'master' into open-dialog-design
jenniferarnesen Nov 5, 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
159 changes: 86 additions & 73 deletions src/components/OpenFileDialog/OpenFileDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
DataTableRow,
DataTableCell,
DataTableColumnHeader,
DataTableToolbar,
NoticeBox,
CircularLoader,
Button,
Expand Down Expand Up @@ -210,68 +211,6 @@ export const OpenFileDialog = ({
<ModalTitle>{getTranslatedString(type, 'modalTitle')}</ModalTitle>
<ModalContent>
<Box minHeight="496px">
<div className="search-and-filter-bar">
<div className="search-field-container">
<NameFilter
dataTest={`${cypressSelector}-name-filter`}
value={nameFilterValue}
onChange={(value) => {
setNameFilterValue(value)

clearTimeout(searchTimeout)
setSearchTimeout(
setTimeout(
() =>
setState({
page: 1,
filters: {
...filters,
searchTerm: value,
},
}),
200
)
)
}}
/>
</div>
{filterVisTypes?.length && (
<div className="type-field-container">
<VisTypeFilter
visTypes={filterVisTypes}
selected={filters.visType}
onChange={(value) =>
setState({
page: 1,
filters: {
...filters,
visType: value,
},
})
}
/>
</div>
)}
<div className="created-by-field-container">
<CreatedByFilter
selected={filters.createdBy}
onChange={(value) =>
setState({
page: 1,
filters: {
...filters,
createdBy: value,
},
})
}
/>
</div>
{!isEqual(filters, defaultFilters) && (
<Button onClick={resetFilters} secondary small>
{i18n.t('Clear filters')}
</Button>
)}
</div>
{error ? (
<NoticeBox
title={getTranslatedString(type, 'errorTitle')}
Expand All @@ -282,6 +221,75 @@ export const OpenFileDialog = ({
) : (
<>
<div className="data-table-wrapper">
<DataTableToolbar>
<div className="search-and-filter-bar">
<div className="search-field-container">
<NameFilter
dataTest={`${cypressSelector}-name-filter`}
value={nameFilterValue}
onChange={(value) => {
setNameFilterValue(value)

clearTimeout(searchTimeout)
setSearchTimeout(
setTimeout(
() =>
setState({
page: 1,
filters: {
...filters,
searchTerm:
value,
},
}),
200
)
)
}}
/>
</div>
{filterVisTypes?.length && (
<div className="type-field-container">
<VisTypeFilter
visTypes={filterVisTypes}
selected={filters.visType}
onChange={(value) =>
setState({
page: 1,
filters: {
...filters,
visType: value,
},
})
}
/>
</div>
)}
<div className="created-by-field-container">
<CreatedByFilter
selected={filters.createdBy}
onChange={(value) =>
setState({
page: 1,
filters: {
...filters,
createdBy: value,
},
})
}
/>
</div>
{!isEqual(filters, defaultFilters) && (
<Button
onClick={resetFilters}
secondary
small
>
{i18n.t('Clear filters')}
</Button>
)}
</div>
</DataTableToolbar>
<DataTable layout="fixed">
<DataTableHead>
<DataTableRow>
Expand Down Expand Up @@ -339,7 +347,10 @@ export const OpenFileDialog = ({
AOTypeMap[type].apiEndpoint
].length > 0 && (
<DataTableRow>
<DataTableCell large>
<DataTableCell
staticStyle
large
>
<Box minHeight="342px">
<div className="info-cell">
<div className="info-container">
Expand Down Expand Up @@ -400,17 +411,19 @@ export const OpenFileDialog = ({
)}
</DataTableBody>
</DataTable>
<DataTableToolbar position="bottom">
{data?.files[AOTypeMap[type].apiEndpoint]
.length > 0 && (
<div className="pagination-controls">
<PaginationControls
page={data.files.pager.page}
pager={data.files.pager}
onPageChange={setPage}
/>
</div>
)}
</DataTableToolbar>
</div>
{data?.files[AOTypeMap[type].apiEndpoint].length >
0 && (
<div className="pagination-controls">
<PaginationControls
page={data.files.pager.page}
pager={data.files.pager}
onPageChange={setPage}
/>
</div>
)}
</>
)}
<style jsx>{styles}</style>
Expand Down
2 changes: 0 additions & 2 deletions src/components/OpenFileDialog/OpenFileDialog.styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export const styles = css`

.pagination-controls {
width: 100%;
margin-top: ${spacers.dp12};
display: flex;
justify-content: flex-end;
}
Expand All @@ -21,7 +20,6 @@ export const styles = css`
display: flex;
gap: ${spacers.dp4};
align-items: center;
margin-bottom: ${spacers.dp8};
}

.search-field-container {
Expand Down
Loading