Skip to content

refactor(site): Improve workspaces filtering #7681

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 25 commits into from
May 30, 2023
Merged

refactor(site): Improve workspaces filtering #7681

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8a95c55
Add base filter
BrunoQuaresma May 19, 2023
cc7d01d
Merge branch 'main' into bq/workspace-filter
BrunoQuaresma May 23, 2023
858ee93
Refactor filter
BrunoQuaresma May 23, 2023
1341444
Regreats and improvements
BrunoQuaresma May 23, 2023
c7ac047
Fix filter
BrunoQuaresma May 24, 2023
bb2ff77
Move logic to the page
BrunoQuaresma May 24, 2023
d9858f5
Add skeleton to the filter
BrunoQuaresma May 24, 2023
2e103b4
Fix defaults
BrunoQuaresma May 24, 2023
8671d6a
Minor adjustments
BrunoQuaresma May 24, 2023
a423ac6
Add check
BrunoQuaresma May 25, 2023
fc56553
Merge branch 'main' into bq/workspace-filter
BrunoQuaresma May 25, 2023
d6a7c6f
Fix refetch on error
BrunoQuaresma May 25, 2023
8fe547c
Fix errors
BrunoQuaresma May 25, 2023
2dcd815
Ignore debounce
BrunoQuaresma May 25, 2023
82720e4
Organize folder
BrunoQuaresma May 25, 2023
88b4bb7
Fix pagination
BrunoQuaresma May 25, 2023
66dec40
Fix on search change
BrunoQuaresma May 25, 2023
76bf6ec
Fix sync with smart cache
BrunoQuaresma May 25, 2023
92c628c
Add debounce
BrunoQuaresma May 25, 2023
68bd9f2
Minor fixes
BrunoQuaresma May 25, 2023
4fbbc1a
Merge branch 'main' into bq/workspace-filter
BrunoQuaresma May 30, 2023
4e8f4f2
Merge branch 'main' into bq/workspace-filter
BrunoQuaresma May 30, 2023
161a8af
Add filter to experiments
BrunoQuaresma May 30, 2023
9728631
Add filter behind an experiment
BrunoQuaresma May 30, 2023
3a77c84
Fix storybook
BrunoQuaresma May 30, 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
Prev Previous commit
Next Next commit
Add check
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed May 25, 2023
commit a423ac6da844e1bd9675f2ad0dfbf8de03ee83db
130 changes: 88 additions & 42 deletions site/src/pages/WorkspacesPage/Filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { useSearchParams } from "react-router-dom"
import { useQuery } from "@tanstack/react-query"
import { getUsers, getTemplates } from "api/api"
import Skeleton, { SkeletonProps } from "@mui/material/Skeleton"
import CheckOutlined from "@mui/icons-material/CheckOutlined"

/** Filter */

Expand Down Expand Up @@ -431,32 +432,36 @@ const OwnerFilter = ({ autocomplete }: { autocomplete: UsersAutocomplete }) => {
handleClose()
}}
>
<UserOptionItem option={option} />
<UserOptionItem
option={option}
isSelected={option.value === autocomplete.selectedOption?.value}
/>
</MenuItem>
)}
/>
</div>
)
}

const UserOptionItem = ({ option }: { option: OwnerOption }) => {
const UserOptionItem = ({
option,
isSelected,
}: {
option: OwnerOption
isSelected?: boolean
}) => {
return (
<Box
display="flex"
alignItems="center"
gap={2}
fontSize={14}
overflow="hidden"
>
<UserAvatar
username={option.label}
avatarURL={option.avatarUrl}
sx={{ width: 16, height: 16, fontSize: 8 }}
/>
<Box component="span" overflow="hidden" textOverflow="ellipsis">
{option.label}
</Box>
</Box>
<OptionItem
option={option}
isSelected={isSelected}
left={
<UserAvatar
username={option.label}
avatarURL={option.avatarUrl}
sx={{ width: 16, height: 16, fontSize: 8 }}
/>
}
/>
)
}

Expand Down Expand Up @@ -502,32 +507,36 @@ const TemplatesFilter = ({
handleClose()
}}
>
<TemplateOptionItem option={option} />
<TemplateOptionItem
option={option}
isSelected={option.value === autocomplete.selectedOption?.value}
/>
</MenuItem>
)}
/>
</div>
)
}

const TemplateOptionItem = ({ option }: { option: TemplateOption }) => {
const TemplateOptionItem = ({
option,
isSelected,
}: {
option: TemplateOption
isSelected?: boolean
}) => {
return (
<Box
display="flex"
alignItems="center"
gap={2}
fontSize={14}
overflow="hidden"
>
<TemplateAvatar
templateName={option.label}
icon={option.icon}
sx={{ width: 14, height: 14, fontSize: 8 }}
/>
<Box component="span" overflow="hidden" textOverflow="ellipsis">
{option.label}
</Box>
</Box>
<OptionItem
option={option}
isSelected={isSelected}
left={
<TemplateAvatar
templateName={option.label}
icon={option.icon}
sx={{ width: 14, height: 14, fontSize: 8 }}
/>
}
/>
)
}

Expand Down Expand Up @@ -589,20 +598,30 @@ const StatusFilter = ({
handleClose()
}}
>
<StatusOptionItem option={option} />
<StatusOptionItem
option={option}
isSelected={option.value === autocomplete.selectedOption?.value}
/>
</MenuItem>
))}
</Menu>
</div>
)
}

const StatusOptionItem = ({ option }: { option: StatusOption }) => {
const StatusOptionItem = ({
option,
isSelected,
}: {
option: StatusOption
isSelected?: boolean
}) => {
return (
<Box display="flex" alignItems="center" gap={2} fontSize={14}>
<StatusIndicator option={option} />
<span>{option.label}</span>
</Box>
<OptionItem
option={option}
left={<StatusIndicator option={option} />}
isSelected={isSelected}
/>
)
}

Expand All @@ -620,6 +639,33 @@ const StatusIndicator: FC<{ option: StatusOption }> = ({ option }) => {
)
}

type OptionItemProps = {
option: BaseOption
left?: ReactNode
isSelected?: boolean
}

const OptionItem = ({ option, left, isSelected }: OptionItemProps) => {
return (
<Box
display="flex"
alignItems="center"
gap={2}
fontSize={14}
overflow="hidden"
width="100%"
>
{left}
<Box component="span" overflow="hidden" textOverflow="ellipsis">
{option.label}
</Box>
{isSelected && (
<CheckOutlined sx={{ width: 16, height: 16, marginLeft: "auto" }} />
)}
</Box>
)
}

const MenuButton = forwardRef<HTMLButtonElement, ButtonProps>((props, ref) => {
return (
<Button
Expand Down