NotificationsYou must be signed in to change notification settings
Fork928
Star10.1k

Commit9da6467

authored

fix: prefer organization display name for workspaces table (#14617)

* fix: prefer organization display name for workspaces table* fix: update story to account for organization name changes* fix: resolve typo in regex search for test

1 parenteb646f0 commit9da6467Copy full SHA for 9da6467

File tree

4 files changed

+23

-13

lines changed

site/src
- @types
  - storybook.d.ts
- pages/WorkspacesPage
  - WorkspacesPageView.stories.tsx
  - WorkspacesTable.tsx
- testHelpers
  - storybook.tsx

4 files changed

+23

-13

lines changed

`‎site/src/@types/storybook.d.ts`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import type {`
`3`	`3`	`DeploymentValues,`
`4`	`4`	`Experiments,`
`5`	`5`	`FeatureName,`
	`6`	`+Organization,`
`6`	`7`	`SerpentOption,`
`7`	`8`	`User,`
`8`	`9`	`}from"api/typesGenerated";`
`@@ -17,6 +18,7 @@ declare module "@storybook/react" {`
`17`	`18`	`features?:FeatureName[];`
`18`	`19`	`experiments?:Experiments;`
`19`	`20`	`showOrganizations?:boolean;`
	`21`	`+organizations?:Organization[];`
`20`	`22`	`queries?:{key:QueryKey;data:unknown}[];`
`21`	`23`	`webSocket?:WebSocketEvent[];`
`22`	`24`	`user?:User;`

`‎site/src/pages/WorkspacesPage/WorkspacesPageView.stories.tsx`

Lines changed: 13 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import uniqueId from "lodash/uniqueId";`
`15`	`15`	`importtype{ComponentProps}from"react";`
`16`	`16`	`import{`
`17`	`17`	`MockBuildInfo,`
	`18`	`+MockOrganization,`
`18`	`19`	`MockPendingProvisionerJob,`
`19`	`20`	`MockTemplate,`
`20`	`21`	`MockUser,`
`@@ -269,25 +270,27 @@ export const InvalidPageNumber: Story = {`
`269`	`270`
`270`	`271`	`exportconstShowOrganizations:Story={`
`271`	`272`	`args:{`
`272`		`-workspaces:[`
`273`		`-{`
`274`		`-...MockWorkspace,`
`275`		`-organization_name:"Limbus Co.",`
`276`		`-},`
`277`		`-],`
	`273`	`+workspaces:[{ ...MockWorkspace,organization_name:"limbus-co"}],`
`278`	`274`	`},`
`279`	`275`
`280`	`276`	`parameters:{`
`281`	`277`	`showOrganizations:true,`
	`278`	`+organizations:[`
	`279`	`+{`
	`280`	`+...MockOrganization,`
	`281`	`+name:"limbus-co",`
	`282`	`+display_name:"Limbus Company, LLC",`
	`283`	`+},`
	`284`	`+],`
`282`	`285`	`},`
`283`	`286`
`284`	`287`	`play:async({ canvasElement})=>{`
`285`	`288`	`constcanvas=within(canvasElement);`
`286`	`289`	`constaccessibleTableCell=awaitcanvas.findByRole("cell",{`
`287`		`-//Need whitespace classes because different parts oftheelement`
`288`		`-//are going in different spans, and Storybook doesn't consolidate`
`289`		`-//these`
`290`		`-name:/org\s?(?:anization)?\s?:\s?LimbusCo\./i,`
	`290`	`+//The organization label is always visually hidden, butthetest`
	`291`	`+//makes sure that there's a screen reader hook to give the table`
	`292`	`+//cell more structured output`
	`293`	`+name:/organization:LimbusCompany,LLC/i,`
`291`	`294`	`});`
`292`	`295`
`293`	`296`	`expect(accessibleTableCell).toBeDefined();`

`‎site/src/pages/WorkspacesPage/WorkspacesTable.tsx`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,10 @@ export const WorkspacesTable: FC<WorkspacesTableProps> = ({`
`115`	`115`	`constchecked=checkedWorkspaces.some(`
`116`	`116`	`(w)=>w.id===workspace.id,`
`117`	`117`	`);`
	`118`	`+constactiveOrg=dashboard.organizations.find(`
	`119`	`+(o)=>o.id===workspace.organization_id,`
	`120`	`+);`
	`121`	`+`
`118`	`122`	`return(`
`119`	`123`	`<WorkspacesRow`
`120`	`124`	`workspace={workspace}`
`@@ -208,7 +212,7 @@ export const WorkspacesTable: FC<WorkspacesTableProps> = ({`
`208`	`212`	`}}`
`209`	`213`	`>`
`210`	`214`	`<spancss={{ ...visuallyHidden}}>Organization:</span>`
`211`		`-{workspace.organization_name}`
	`215`	`+{activeOrg?.display_name\|\|workspace.organization_name}`
`212`	`216`	`</div>`
`213`	`217`	`)}`
`214`	`218`	`</TableCell>`

`‎site/src/testHelpers/storybook.tsx`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ export const withDashboardProvider = (`
`24`	`24`	`features=[],`
`25`	`25`	`experiments=[],`
`26`	`26`	`showOrganizations=false,`
	`27`	`+organizations=[MockDefaultOrganization],`
`27`	`28`	`}=parameters;`
`28`	`29`
`29`	`30`	`constentitlements:Entitlements={`
`@@ -44,9 +45,9 @@ export const withDashboardProvider = (`
`44`	`45`	`value={{`
`45`	`46`	`entitlements,`
`46`	`47`	`experiments,`
`47`		`-appearance:MockAppearanceConfig,`
`48`		`-organizations:[MockDefaultOrganization],`
	`48`	`+organizations,`
`49`	`49`	`showOrganizations,`
	`50`	`+appearance:MockAppearanceConfig,`
`50`	`51`	`}}`
`51`	`52`	`>`
`52`	`53`	`<Story/>`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9da6467

File tree

4 files changed

4 files changed

`‎site/src/@types/storybook.d.ts`

`‎site/src/pages/WorkspacesPage/WorkspacesPageView.stories.tsx`

`‎site/src/pages/WorkspacesPage/WorkspacesTable.tsx`

`‎site/src/testHelpers/storybook.tsx`

0 commit comments