Skip to content

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

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 2 commits into from
Oct 29, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58e0630
fix: show template name on workspace page when template display name …
aslilac Oct 29, 2024
ee48b37
thanks I hate it
aslilac Oct 29, 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
36 changes: 36 additions & 0 deletions site/src/pages/WorkspacePage/WorkspaceTopbar.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 7 additions & 5 deletions site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -366,7 +368,7 @@ type WorkspaceBreadcrumbProps = Readonly<{
rootTemplateUrl: string;
templateVersionName: string;
latestBuildVersionName: string;
templateVersionDisplayName?: string;
templateDisplayName: string;
}>;

const WorkspaceBreadcrumb: FC<WorkspaceBreadcrumbProps> = ({
Expand All @@ -375,7 +377,7 @@ const WorkspaceBreadcrumb: FC<WorkspaceBreadcrumbProps> = ({
rootTemplateUrl,
templateVersionName,
latestBuildVersionName,
templateVersionDisplayName = templateVersionName,
templateDisplayName,
}) => {
return (
<Popover mode="hover">
Expand All @@ -399,7 +401,7 @@ const WorkspaceBreadcrumb: FC<WorkspaceBreadcrumbProps> = ({
to={rootTemplateUrl}
css={{ color: "inherit" }}
>
{templateVersionDisplayName}
{templateDisplayName}
</Link>
}
subtitle={
Expand All @@ -419,7 +421,7 @@ const WorkspaceBreadcrumb: FC<WorkspaceBreadcrumbProps> = ({
fitImage
/>
}
imgFallbackText={templateVersionDisplayName}
imgFallbackText={templateDisplayName}
/>
</HelpTooltipContent>
</Popover>
Expand Down
Loading