Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite5e4a0f

Browse files
committed
feat: display Task icon for workspaces associated with tasks
1 parent753e125 commite5e4a0f

File tree

4 files changed

+86
-0
lines changed

4 files changed

+86
-0
lines changed

‎coderd/database/modelmethods.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -662,6 +662,7 @@ func ConvertWorkspaceRows(rows []GetWorkspacesRow) []Workspace {
662662
TemplateIcon:r.TemplateIcon,
663663
TemplateDescription:r.TemplateDescription,
664664
NextStartAt:r.NextStartAt,
665+
TaskID:r.TaskID,
665666
}
666667
}
667668

‎coderd/workspaces_test.go‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4794,6 +4794,69 @@ func TestWorkspaceFilterHasAITask(t *testing.T) {
47944794
require.Len(t,res.Workspaces,4)
47954795
}
47964796

4797+
funcTestWorkspaceListTasks(t*testing.T) {
4798+
t.Parallel()
4799+
4800+
var (
4801+
ctx=testutil.Context(t,testutil.WaitShort)
4802+
taskPrompt="Some task prompt"
4803+
)
4804+
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
4805+
user:=coderdtest.CreateFirstUser(t,client)
4806+
expClient:=codersdk.NewExperimentalClient(client)
4807+
4808+
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,&echo.Responses{
4809+
Parse:echo.ParseComplete,
4810+
ProvisionApply:echo.ApplyComplete,
4811+
ProvisionPlan: []*proto.Response{
4812+
{Type:&proto.Response_Plan{Plan:&proto.PlanComplete{
4813+
HasAiTasks:true,
4814+
}}},
4815+
},
4816+
})
4817+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
4818+
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
4819+
4820+
// Given: a regular user workspace
4821+
workspaceWithoutTask,err:=client.CreateUserWorkspace(ctx,codersdk.Me, codersdk.CreateWorkspaceRequest{
4822+
TemplateID:template.ID,
4823+
TemplateVersionID: uuid.UUID{},
4824+
Name:"user-workspace",
4825+
})
4826+
require.NoError(t,err)
4827+
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspaceWithoutTask.LatestBuild.ID)
4828+
4829+
// Given: a workspace associated with a task
4830+
task,err:=expClient.CreateTask(ctx,codersdk.Me, codersdk.CreateTaskRequest{
4831+
TemplateVersionID:template.ActiveVersionID,
4832+
Input:taskPrompt,
4833+
})
4834+
require.NoError(t,err)
4835+
assert.True(t,task.WorkspaceID.Valid)
4836+
workspaceWithTask,err:=client.Workspace(ctx,task.WorkspaceID.UUID)
4837+
require.NoError(t,err)
4838+
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspaceWithTask.LatestBuild.ID)
4839+
assert.NotEmpty(t,task.Name)
4840+
assert.Equal(t,template.ID,task.TemplateID)
4841+
4842+
// When: listing the workspaces
4843+
workspaces,err:=client.Workspaces(ctx, codersdk.WorkspaceFilter{})
4844+
require.NoError(t,err)
4845+
4846+
assert.Equal(t,workspaces.Count,2)
4847+
4848+
// Then: regular user workspaces should not have a taskID and
4849+
// task workspaces should have a taskID
4850+
for_,workspace:=rangeworkspaces.Workspaces {
4851+
ifworkspace.ID==workspaceWithoutTask.ID {
4852+
assert.False(t,workspace.TaskID.Valid)
4853+
}elseifworkspace.ID==workspaceWithTask.ID {
4854+
assert.True(t,workspace.TaskID.Valid)
4855+
require.Equal(t,task.ID,workspace.TaskID.UUID)
4856+
}
4857+
}
4858+
}
4859+
47974860
funcTestWorkspaceAppUpsertRestart(t*testing.T) {
47984861
t.Parallel()
47994862

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {
22
MockBuildInfo,
33
MockOrganization,
44
MockPendingProvisionerJob,
5+
MockTaskWorkspace,
56
MockTemplate,
67
MockUserOwner,
78
MockWorkspace,
@@ -381,3 +382,18 @@ export const ShowOrganizations: Story = {
381382
expect(accessibleTableCell).toBeDefined();
382383
},
383384
};
385+
386+
exportconstShowWorkspaceTasks:Story={
387+
args:{
388+
workspaces:[
389+
{
390+
...MockWorkspace,
391+
name:"regular-user-workspace",
392+
},
393+
{
394+
...MockTaskWorkspace,
395+
name:"task-workspace",
396+
},
397+
],
398+
},
399+
};

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import type {
1717
import{Avatar}from"components/Avatar/Avatar";
1818
import{AvatarData}from"components/Avatar/AvatarData";
1919
import{AvatarDataSkeleton}from"components/Avatar/AvatarDataSkeleton";
20+
import{Badge}from"components/Badge/Badge";
2021
import{Button}from"components/Button/Button";
2122
import{ConfirmDialog}from"components/Dialogs/ConfirmDialog/ConfirmDialog";
2223
import{ExternalImage}from"components/ExternalImage/ExternalImage";
@@ -207,6 +208,11 @@ export const WorkspacesTable: FC<WorkspacesTableProps> = ({
207208
{workspace.outdated&&(
208209
<WorkspaceOutdatedTooltipworkspace={workspace}/>
209210
)}
211+
{workspace.task_id&&(
212+
<Badgesize="xs"variant="default">
213+
Task
214+
</Badge>
215+
)}
210216
</Stack>
211217
}
212218
subtitle={

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp