Thanks to visit codestin.com
Credit goes to github.com

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

Show file tree
Hide file tree
Changes from all commits
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
Diff view
Diff view
2 changes: 2 additions & 0 deletions site/src/@types/storybook.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type {
DeploymentValues,
Experiments,
FeatureName,
Organization,
SerpentOption,
User,
} from "api/typesGenerated";
Expand All @@ -17,6 +18,7 @@ declare module "@storybook/react" {
features?: FeatureName[];
experiments?: Experiments;
showOrganizations?: boolean;
organizations?: Organization[];
queries?: { key: QueryKey; data: unknown }[];
webSocket?: WebSocketEvent[];
user?: User;
Expand Down
23 changes: 13 additions & 10 deletions site/src/pages/WorkspacesPage/WorkspacesPageView.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import uniqueId from "lodash/uniqueId";
import type { ComponentProps } from "react";
import {
MockBuildInfo,
MockOrganization,
MockPendingProvisionerJob,
MockTemplate,
MockUser,
Expand Down Expand Up @@ -269,25 +270,27 @@ export const InvalidPageNumber: Story = {

export const ShowOrganizations: Story = {
args: {
workspaces: [
{
...MockWorkspace,
organization_name: "Limbus Co.",
},
],
workspaces: [{ ...MockWorkspace, organization_name: "limbus-co" }],
},

parameters: {
showOrganizations: true,
organizations: [
{
...MockOrganization,
name: "limbus-co",
display_name: "Limbus Company, LLC",
},
],
},

play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
const accessibleTableCell = await canvas.findByRole("cell", {
// Need whitespace classes because different parts of the element
// are going in different spans, and Storybook doesn't consolidate
// these
name: /org\s?(?:anization)?\s?:\s?Limbus Co\./i,
// The organization label is always visually hidden, but the test
// makes sure that there's a screen reader hook to give the table
// cell more structured output
name: /organization: Limbus Company, LLC/i,
});

expect(accessibleTableCell).toBeDefined();
Expand Down
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
5 changes: 3 additions & 2 deletions site/src/testHelpers/storybook.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export const withDashboardProvider = (
features = [],
experiments = [],
showOrganizations = false,
organizations = [MockDefaultOrganization],
} = parameters;

const entitlements: Entitlements = {
Expand All @@ -44,9 +45,9 @@ export const withDashboardProvider = (
value={{
entitlements,
experiments,
appearance: MockAppearanceConfig,
organizations: [MockDefaultOrganization],
organizations,
showOrganizations,
appearance: MockAppearanceConfig,
}}
>
<Story />
Expand Down
Loading