8000 fix: prefer organization display name for workspaces table by Parkreiner · Pull Request #14617 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

fix: prefer organization display name for workspaces table #14617

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 3 commits into from
Sep 9, 2024
Merged

fix: prefer organization display name for workspaces table #14617

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bef102
fix: prefer organization display name for workspaces table
Parkreiner Sep 9, 2024
4cdef42
fix: update story to account for organization name changes
Parkreiner Sep 9, 2024
a9ff9a0
fix: resolve typo in regex search for test
Parkreiner Sep 9, 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

Uh oh!

There was an error while loading. Please reload this page.
Diff view
Diff view
Next Next commit
fix: prefer organization display name for workspaces table
  • Loading branch information
@Parkreiner
Parkreiner committed Sep 9, 2024
commit 2bef1021e3278f1998ab18511ddda31162410f34
6 changes: 5 additions & 1 deletion site/src/pages/WorkspacesPage/WorkspacesTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ export const WorkspacesTable: FC<WorkspacesTableProps> = ({
const checked = checkedWorkspaces.some(
(w) => w.id === workspace.id,
);
const activeOrg = dashboard.organizations.find(
(o) => o.id === workspace.organization_id,
);

return (
<WorkspacesRow
workspace={workspace}
Expand Down Expand Up @@ -208,7 +212,7 @@ export const WorkspacesTable: FC<WorkspacesTableProps> = ({
}}
>
<span css={{ ...visuallyHidden }}>Organization: </span>
{workspace.organization_name}
{activeOrg?.display_name || workspace.organization_name}
</div>
)}
</TableCell>
Expand Down
Loading
0