chore: update workspaces page filter to include organization controls #14597
+342
−202
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Parkreiner
commented
Sep 9, 2024
| <> | ||
| <SearchFieldSkeleton /> | ||
| <MenuSkeleton /> |
There was a problem hiding this comment.
We forgot to put a fourth MenuSkeleton here for the orgs dropdown
There was a problem hiding this comment.
it needs to be conditional on showOrganizations :^)
Parkreiner
commented
Sep 9, 2024
| @@ -180,101 +175,3 @@ const ResourceTypeMenu: FC<ResourceTypeMenuProps> = ({ menu, width }) => { | |||
| /> | |||
| ); | |||
| }; | |||
|
|
|||
There was a problem hiding this comment.
All moved to the orgs/filtering file
Parkreiner
commented
Sep 9, 2024
Comment on lines
+200
to
+203
| <> | ||
| <BaseSkeleton width="100%" /> | ||
| {optionsSkeleton} | ||
| </> |
There was a problem hiding this comment.
Inlined the base skeleton because:
- I don't think there will ever be a situation where we don't want a skeleton for the main search box itself
- It felt weird that the component was never in control of any of its skeletons
aslilac
approved these changes
Sep 10, 2024
| @@ -1,6 +1,6 @@ | |||
| import { API } from "api/api"; | |||
| import type { AuditLogResponse } from "api/typesGenerated"; | |||
| import { useFilterParamsKey } from "components/Filter/filter"; | |||
| import { useFilterParamsKey } from "components/Filter/Filter"; | |||
| @@ -52,7 +52,7 @@ export const SelectFilter: FC<SelectFilterProps> = ({ | |||
| <SelectMenuTrigger> | |||
| <SelectMenuButton | |||
| startIcon={selectedOption?.startIcon} | |||
| css={{ width, flexGrow: 1 }} | |||
| css={{ flexBasis: width, flexGrow: 1 }} | |||
There was a problem hiding this comment.
flexBasis!!!!! you're literally so good at your job
| const addMeAsFirstOption = (options: SelectFilterOption[]) => { | ||
| options = options.filter((option) => option.value !== me.username); | ||
| const addMeAsFirstOption = (options: readonly SelectFilterOption[]) => { | ||
| const filtered = options.filter((o) => o.value !== me.username); |
There was a problem hiding this comment.
the only way this line would make me happier is if you did the thing I like where the closure names the parameter it
Comment on lines
24
to
27
| // Have to specify min width so that, as we keep adding more and | ||
| // control options to the filter row, the text box doesn't have a | ||
| // risk of shrinking so much that it becomes un-clickable | ||
| css={{ minWidth: "320px" }} |
There was a problem hiding this comment.
Suggested change
| // Have to specify min width so that, as we keep adding more and | |
| // control options to the filter row, the text box doesn't have a | |
| // risk of shrinking so much that it becomes un-clickable | |
| css={{ minWidth: "320px" }} | |
| // We specify `minWidth` so that the text box can't shrink so much that | |
| // it becomes un-clickable as we add more filter controls. |
| <> | ||
| <SearchFieldSkeleton /> | ||
| <MenuSkeleton /> |
There was a problem hiding this comment.
it needs to be conditional on showOrganizations :^)
| menu: StatusFilterMenu; | ||
| }>; | ||
|
|
||
| export const StatusMenu: FC<StatusMenuProps> = ({ width, menu }) => { |
…synced for storybook
* chore: add tests for WorkspacePage cross-page navigation * fix: update story to use mock organizations menu
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part 2/3 for #14435
Changes made
Screenshots
Notes