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

Commit82ed9e4

authored

chore: patch 2.12.4 (#13925)

* fix(site): enable dormant workspace to be deleted (#13850)(cherry picked from commit01b30ea)* chore: add SVG desktop icon (#13765)* chore: add SVG desktop icon* fix: add desktop icon to to icons.json(cherry picked from commit21a923a)* fix: update import order for Storybook---------Co-authored-by: Bruno Quaresma <bruno@coder.com>Co-authored-by: Michael Smith <throwawayclover@gmail.com>

1 parent534d4ea commit82ed9e4Copy full SHA for 82ed9e4

File tree

4 files changed

+22

-1

lines changed

site
- src
  - pages/WorkspacePage/WorkspaceActions
    - WorkspaceActions.stories.tsx
    - constants.ts
  - theme
    - icons.json
- static/icon
  - desktop.svg

4 files changed

+22

-1

lines changed

`‎site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`importtype{Meta,StoryObj}from"@storybook/react";`
	`2`	`+import{userEvent,within,expect}from"@storybook/test";`
`2`	`3`	`import*asMocksfrom"testHelpers/entities";`
`3`	`4`	`import{WorkspaceActions}from"./WorkspaceActions";`
`4`	`5`
`@@ -140,3 +141,15 @@ export const CancelHiddenForUser: Story = {`
`140`	`141`	`isOwner:false,`
`141`	`142`	`},`
`142`	`143`	`};`
	`144`	`+`
	`145`	`+exportconstCanDeleteDormantWorkspace:Story={`
	`146`	`+args:{`
	`147`	`+workspace:Mocks.MockDormantWorkspace,`
	`148`	`+},`
	`149`	`+play:async({ canvasElement})=>{`
	`150`	`+constcanvas=within(canvasElement);`
	`151`	`+awaituserEvent.click(canvas.getByRole("button",{name:"More options"}));`
	`152`	`+constdeleteButton=canvas.getByText("Delete…");`
	`153`	`+awaitexpect(deleteButton).toBeEnabled();`
	`154`	`+},`
	`155`	`+};`

`‎site/src/pages/WorkspacePage/WorkspaceActions/constants.ts`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ export const abilitiesByWorkspaceStatus = (`
`49`	`49`	`return{`
`50`	`50`	`actions:["activate"],`
`51`	`51`	`canCancel:false,`
`52`		`-canAcceptJobs:false,`
	`52`	`+canAcceptJobs:true,`
`53`	`53`	`};`
`54`	`54`	`}`
`55`	`55`

`‎site/src/theme/icons.json`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`"datagrip.svg",`
`26`	`26`	`"dataspell.svg",`
`27`	`27`	`"debian.svg",`
	`28`	`+"desktop.svg",`
`28`	`29`	`"discord.svg",`
`29`	`30`	`"do.png",`
`30`	`31`	`"docker-white.svg",`

`‎site/static/icon/desktop.svg`

Lines changed: 7 additions & 0 deletions

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!

Commit82ed9e4

File tree

4 files changed

4 files changed

`‎site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx`

`‎site/src/pages/WorkspacePage/WorkspaceActions/constants.ts`

`‎site/src/theme/icons.json`

`‎site/static/icon/desktop.svg`

0 commit comments