Skip to content

chore: update workspaces page filter to include organization controls #14597

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 34 commits into from
Sep 16, 2024
Merged

chore: update workspaces page filter to include organization controls #14597

Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
f90f088
chore: move schedule controls to the right side of the screen
Parkreiner Sep 4, 2024
4956ebb
chore: add org display to workspace topbar
Parkreiner Sep 4, 2024
43ce786
fix: force organizations to be readonly array
Parkreiner Sep 4, 2024
6570b51
Merge branch 'main' into mes/filter-work-1
Parkreiner Sep 5, 2024
b2512a7
fix update type mismatch for organizations again
Parkreiner Sep 5, 2024
3211805
refactor: tuck main loading skeleton for filter into base definition
Parkreiner Sep 5, 2024
cdcc907
refactor: give filter files different names to reduce confusion
Parkreiner Sep 5, 2024
99a3792
refactor: remove separate base filter skeleton
Parkreiner Sep 5, 2024
66a55a6
fix: update responsive logic for audit table filter
Parkreiner Sep 5, 2024
d7c9571
chore: add organizations option group to workspaces table
Parkreiner Sep 6, 2024
74d5ff8
refactor: make prop contracts more explicit
Parkreiner Sep 6, 2024
8acc33b
refactor: centralize the organizations dropdown logic
Parkreiner Sep 6, 2024
5a0c523
fix: update imports and formatting
Parkreiner Sep 6, 2024
6829017
fix: update quota querying logic to use new endpoint
Parkreiner Sep 6, 2024
dcfb84f
fix: add logic for handling long workspace or org names
Parkreiner Sep 6, 2024
836a2d4
chore: add links for workspaces by org
Parkreiner Sep 6, 2024
6696c0a
chore: expand tooltip styling for org
Parkreiner Sep 6, 2024
de554d6
chore: expand tooltip styling for owner
Parkreiner Sep 6, 2024
3b410f7
refactor: split off breadcrumbs for readability
Parkreiner Sep 6, 2024
c8f9226
fix: display correct template version name in dropdown
Parkreiner Sep 6, 2024
83788e7
Merge branch 'mes/filter-work-1' into mes/filter-work-2
Parkreiner Sep 6, 2024
36eba47
fix: update overflow styling for breadcrumb segments
Parkreiner Sep 9, 2024
5e0689d
fix: favor org display name
Parkreiner Sep 9, 2024
7c1e859
fix: centralize org display name logic
Parkreiner Sep 9, 2024
552b93d
Merge branch 'mes/filter-work-1' into mes/filter-work-2
Parkreiner Sep 9, 2024
ba8515d
fix: make sure skeletons stay synced with org feature toggles
Parkreiner Sep 12, 2024
17a9e8c
Merge branch 'main' into mes/filter-work-1
Parkreiner Sep 12, 2024
7c7a9fb
Merge branch 'mes/filter-work-1' into mes/filter-work-2
Parkreiner Sep 12, 2024
775486f
fix: ensure that mock query cache key and component key are properly …
Parkreiner Sep 13, 2024
f7f8c3e
Merge branch 'mes/filter-work-1' into mes/filter-work-2
Parkreiner Sep 13, 2024
d40167f
docs: clean up wording on SearchField comment
Parkreiner Sep 13, 2024
3806867
Merge branch 'main' into mes/filter-work-2
Parkreiner Sep 16, 2024
5db1400
fix: shrink mix width threshold for search field
Parkreiner Sep 16, 2024
6dbfe06
chore: add navigation test for workspace details page (#14629)
Parkreiner Sep 16, 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
chore: expand tooltip styling for owner
  • Loading branch information
@Parkreiner
Parkreiner committed Sep 6, 2024
commit de554d6133c3453a17af421a0db2c49113313b75
55 changes: 34 additions & 21 deletions site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,28 +145,41 @@ export const WorkspaceTopbar: FC<WorkspaceProps> = ({
}}
>
<TopbarData>
<Tooltip title={`Owner: ${workspace.owner_name}`}>
<span
css={{
display: "flex",
flexFlow: "row nowrap",
gap: "8px",
maxWidth: "160px",
textOverflow: "ellipsis",
overflowX: "hidden",
whiteSpace: "nowrap",
cursor: "default",
}}
<Popover mode="hover">
<PopoverTrigger>
<span
css={{
display: "flex",
flexFlow: "row nowrap",
gap: "8px",
maxWidth: "160px",
textOverflow: "ellipsis",
overflowX: "hidden",
whiteSpace: "nowrap",
cursor: "default",
}}
>
<UserAvatar
size="xs"
username={workspace.owner_name}
avatarURL={workspace.owner_avatar_url}
/>

{workspace.owner_name}
</span>
</PopoverTrigger>

<HelpTooltipContent
anchorOrigin={{ vertical: "bottom", horizontal: "center" }}
transformOrigin={{ vertical: "top", horizontal: "center" }}
>
<UserAvatar
size="xs"
username={workspace.owner_name}
avatarURL={workspace.owner_avatar_url}
<AvatarData
title={workspace.owner_name}
subtitle="Owner"
avatar={workspace.owner_avatar_url}
/>

{workspace.owner_name}
</span>
</Tooltip>
</HelpTooltipContent>
</Popover>

{showOrganizations && (
<>
Expand Down Expand Up @@ -272,7 +285,7 @@ export const WorkspaceTopbar: FC<WorkspaceProps> = ({
to={`${templateLink}/versions/${workspace.latest_build.template_version_name}`}
css={{ color: "inherit" }}
>
{workspace.latest_build.template_version_name}
Version: {workspace.latest_build.template_version_name}
</Link>
}
avatar={
Expand Down