synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-13 21:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: show template name on workspace page when template display name is unset (#15262)

Browse Source
This commit is contained in:
Kayla Washburn-Love
2024-10-29 12:30:13 -06:00
committed by GitHub
parent d83f4eb076
commit bbd2dd80e2
2 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
site/src/pages/WorkspacePage/WorkspaceTopbar.stories.tsx
View File

@ -320,3 +320,39 @@ export const TemplateDoesNotAllowAutostop: Story = {
},
},
};
export const TemplateInfoPopover: Story = {
play: async ({ canvasElement, step }) => {
const canvas = within(canvasElement);
await step("activate hover trigger", async () => {
await userEvent.hover(canvas.getByText(baseWorkspace.name));
await waitFor(() =>
expect(
canvas.getByRole("presentation", { hidden: true }),
).toHaveTextContent(MockTemplate.display_name),
);
});
},
};
export const TemplateInfoPopoverWithoutDisplayName: Story = {
args: {
workspace: {
...baseWorkspace,
template_display_name: "",
},
},
play: async ({ canvasElement, step }) => {
const canvas = within(canvasElement);
await step("activate hover trigger", async () => {
await userEvent.hover(canvas.getByText(baseWorkspace.name));
await waitFor(() =>
expect(
canvas.getByRole("presentation", { hidden: true }),
).toHaveTextContent(MockTemplate.name),
);
});
},
};

12
site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
View File

@ -160,7 +160,9 @@ export const WorkspaceTopbar: FC<WorkspaceProps> = ({
templateIconUrl={workspace.template_icon}
rootTemplateUrl={templateLink}
templateVersionName={workspace.latest_build.template_version_name}
templateVersionDisplayName={workspace.template_display_name}
templateDisplayName={
workspace.template_display_name || workspace.template_name
}
latestBuildVersionName={
workspace.latest_build.template_version_name
}
@ -366,7 +368,7 @@ type WorkspaceBreadcrumbProps = Readonly<{
rootTemplateUrl: string;
templateVersionName: string;
latestBuildVersionName: string;
templateVersionDisplayName?: string;
templateDisplayName: string;
}>;
const WorkspaceBreadcrumb: FC<WorkspaceBreadcrumbProps> = ({
@ -375,7 +377,7 @@ const WorkspaceBreadcrumb: FC<WorkspaceBreadcrumbProps> = ({
rootTemplateUrl,
templateVersionName,
latestBuildVersionName,
templateVersionDisplayName = templateVersionName,
templateDisplayName,
}) => {
return (
<Popover mode="hover">
@ -399,7 +401,7 @@ const WorkspaceBreadcrumb: FC<WorkspaceBreadcrumbProps> = ({
to={rootTemplateUrl}
css={{ color: "inherit" }}
>
{templateVersionDisplayName}
{templateDisplayName}
</Link>
}
subtitle={
@ -419,7 +421,7 @@ const WorkspaceBreadcrumb: FC<WorkspaceBreadcrumbProps> = ({
fitImage
/>
}
imgFallbackText={templateVersionDisplayName}
imgFallbackText={templateDisplayName}
/>
</HelpTooltipContent>
</Popover>