Skip to content

chore(site): refactor filter component to be more extendable #13688

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 16 commits into from
Jul 2, 2024
Merged

chore(site): refactor filter component to be more extendable #13688

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d222f72
Replace search by menu search
BrunoQuaresma Jun 25, 2024
050f2c9
Add select menu component
BrunoQuaresma Jun 26, 2024
d4c183b
Add select filter menu
BrunoQuaresma Jun 26, 2024
0706238
Replace filter menu by SelectFilter
BrunoQuaresma Jun 26, 2024
60aa016
Fix search icons
BrunoQuaresma Jun 26, 2024
08b0a82
Fix filter buttons size
BrunoQuaresma Jun 27, 2024
c7e15ec
Improve accessibility and searching
BrunoQuaresma Jun 27, 2024
2e5880f
Fix width of popover and move search to has its own component
BrunoQuaresma Jun 27, 2024
3fae8d4
Update site/src/components/Filter/UserFilter.tsx
BrunoQuaresma Jun 28, 2024
06ae934
Remove important style
BrunoQuaresma Jun 28, 2024
0d83bc8
Apply review comments
BrunoQuaresma Jun 28, 2024
59bd176
Merge branch 'bq/merge-search-and-search-field' of https://github.com…
BrunoQuaresma Jun 28, 2024
928209c
Add auto focus to search
BrunoQuaresma Jun 28, 2024
d344d9c
Fix types
BrunoQuaresma Jul 1, 2024
ebcbaa5
Apply PR suggestions
BrunoQuaresma Jul 2, 2024
50a6ce4
Fix closed story
BrunoQuaresma Jul 2, 2024
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
Apply PR suggestions
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Jul 2, 2024
commit ebcbaa5125016db9976ea05661e271bc54b7fdbc
2 changes: 1 addition & 1 deletion site/src/components/Filter/SelectFilter.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
} from "./SelectFilter";

const options: SelectFilterOption[] = Array.from({ length: 50 }, (_, i) => ({
startIcon: <UserAvatar username={`username ${i}`} size="xs" />,
startIcon: <UserAvatar username={`username ${i + 1}`} size="xs" />,
label: `Option ${i + 1}`,
value: `option-${i + 1}`,
}));
Expand Down
3 changes: 2 additions & 1 deletion site/src/components/SelectMenu/SelectMenu.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { action } from "@storybook/addon-actions";
import type { Meta, StoryObj } from "@storybook/react";
import { userEvent, within } from "@storybook/test";
import { UserAvatar } from "components/UserAvatar/UserAvatar";
Expand Down Expand Up @@ -109,7 +110,7 @@ export const NoSelectedOption: Story = {
<SelectMenuButton css={{ width: 200 }}>All users</SelectMenuButton>
</SelectMenuTrigger>
<SelectMenuContent>
<SelectMenuSearch onChange={() => {}} />
<SelectMenuSearch onChange={action("search")} />
<SelectMenuList>
{opts.map((o) => (
<SelectMenuItem key={o}>
Expand Down
5 changes: 1 addition & 4 deletions site/src/pages/WorkspacesPage/filter/menus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ export const useTemplateFilterMenu = ({
const template = templates.find((template) => template.name === value);
if (template) {
return {
label:
template.display_name !== ""
? template.display_name
: template.name,
label: template.display_name || template.name,
value: template.name,
startIcon: <TemplateAvatar size="xs" template={template} />,
};
Expand Down