Skip to content

feat(site): add presets back to the filters #7876

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
merged 2 commits into from
Jun 7, 2023
Merged

feat(site): add presets back to the filters #7876

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
204e8a4
Add more info about advanced queries
BrunoQuaresma Jun 6, 2023
18d7403
refactor(site): add presets back on filtering
BrunoQuaresma Jun 6, 2023
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
Next Next commit
Add more info about advanced queries
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Jun 6, 2023
commit 204e8a42ac13ec725be364b3026706fa0b85f34f
48 changes: 35 additions & 13 deletions site/src/components/Filter/filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { BaseOption } from "./options"
import debounce from "just-debounce-it"
import MenuList from "@mui/material/MenuList"
import { Loader } from "components/Loader/Loader"
import InfoOutlined from "@mui/icons-material/InfoOutlined"

type FilterValues = Record<string, string | undefined>

Expand Down Expand Up @@ -127,10 +128,12 @@ export const Filter = ({
error,
skeleton,
options,
learnMoreLink,
}: {
filter: ReturnType<typeof useFilter>
skeleton: ReactNode
isLoading: boolean
learnMoreLink: string
error?: unknown
options?: ReactNode
}) => {
Expand Down Expand Up @@ -168,6 +171,9 @@ export const Filter = ({
"& input::placeholder": {
color: (theme) => theme.palette.text.secondary,
},
"& .MuiInputAdornment-root": {
marginLeft: 0,
},
},
startAdornment: (
<InputAdornment position="start">
Expand All @@ -179,19 +185,35 @@ export const Filter = ({
/>
</InputAdornment>
),
endAdornment: hasFilterQuery && (
<InputAdornment position="end">
<Tooltip title="Clear filter">
<IconButton
size="small"
onClick={() => {
filter.update("")
}}
>
<CloseOutlined sx={{ fontSize: 14 }} />
</IconButton>
</Tooltip>
</InputAdornment>
endAdornment: (
<>
{hasFilterQuery && (
<InputAdornment position="end">
<Tooltip title="Clear filter">
<IconButton
size="small"
onClick={() => {
filter.update("")
}}
>
<CloseOutlined sx={{ fontSize: 14 }} />
</IconButton>
</Tooltip>
</InputAdornment>
)}

<InputAdornment position="end">
<Tooltip title="View advanced filtering">
<IconButton
href={learnMoreLink}
size="small"
target="_blank"
>
<InfoOutlined sx={{ fontSize: 14 }} />
</IconButton>
</Tooltip>
</InputAdornment>
</>
),
}}
/>
Expand Down
1 change: 1 addition & 0 deletions site/src/pages/UsersPage/UsersFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export const UsersFilter = ({
}) => {
return (
<Filter
learnMoreLink="https://coder.com/docs/v2/latest/admin/users#user-filtering"
isLoading={menus.status.isInitializing}
filter={filter}
error={error}
Expand Down
1 change: 1 addition & 0 deletions site/src/pages/WorkspacesPage/filter/filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export const WorkspacesFilter = ({
isLoading={menus.status.isInitializing}
filter={filter}
error={error}
learnMoreLink="https://coder.com/docs/v2/latest/workspaces#workspace-filtering"
options={
<>
{menus.user && <UserMenu {...menus.user} />}
Expand Down