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

Commiteea8ed5

Browse files
committed
fix type errors
1 parent5e815d9 commiteea8ed5

File tree

8 files changed

+138
-162
lines changed

8 files changed

+138
-162
lines changed

‎site/src/modules/dashboard/Navbar/NavbarView.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ const TasksNavItem: FC<TasksNavItemProps> = ({ user }) => {
200200
process.env.NODE_ENV==="development"||
201201
process.env.STORYBOOK,
202202
);
203-
constfilter={
204-
username:user.username,
203+
constfilter:TypesGen.TasksFilter={
204+
owner:user.username,
205205
};
206206
const{data:idleCount}=useQuery({
207207
queryKey:["tasks",filter],
@@ -211,8 +211,7 @@ const TasksNavItem: FC<TasksNavItemProps> = ({ user }) => {
211211
refetchOnWindowFocus:true,
212212
initialData:[],
213213
select:(data)=>
214-
data.filter((task)=>task.workspace.latest_app_status?.state==="idle")
215-
.length,
214+
data.filter((task)=>task.current_state?.state==="idle").length,
216215
});
217216

218217
if(!canSeeTasks){

‎site/src/modules/tasks/TaskDeleteDialog/TaskDeleteDialog.stories.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import{MockTasks,MockWorkspace}from"testHelpers/entities";
1+
import{MockTask}from"testHelpers/entities";
22
import{withGlobalSnackbar}from"testHelpers/storybook";
33
importtype{Meta,StoryObj}from"@storybook/react-vite";
44
import{API}from"api/api";
@@ -18,7 +18,7 @@ export const DeleteTaskSuccess: Story = {
1818
decorators:[withGlobalSnackbar],
1919
args:{
2020
open:true,
21-
task:{prompt:"My Task",workspace:MockWorkspace},
21+
task:MockTask,
2222
onClose:()=>{},
2323
},
2424
parameters:{
@@ -40,8 +40,8 @@ export const DeleteTaskSuccess: Story = {
4040
awaitstep("Confirm delete",async()=>{
4141
awaitwaitFor(()=>{
4242
expect(API.experimental.deleteTask).toHaveBeenCalledWith(
43-
MockTasks[0].workspace.owner_name,
44-
MockTasks[0].workspace.id,
43+
MockTask.owner_name,
44+
MockTask.id,
4545
);
4646
});
4747
});

‎site/src/modules/tasks/TaskPrompt/TaskPrompt.stories.tsx‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import{
22
MockAIPromptPresets,
3-
MockNewTaskData,
43
MockPresets,
54
MockTask,
65
MockTasks,
@@ -14,10 +13,19 @@ import {
1413
import{withAuthProvider,withGlobalSnackbar}from"testHelpers/storybook";
1514
importtype{Meta,StoryObj}from"@storybook/react-vite";
1615
import{API}from"api/api";
16+
importtype{Task}from"api/typesGenerated";
1717
import{expect,spyOn,userEvent,waitFor,within}from"storybook/test";
1818
importtypeTasksPagefrom"../../../pages/TasksPage/TasksPage";
1919
import{TaskPrompt}from"./TaskPrompt";
2020

21+
constMockNewTaskData:Task={
22+
...MockTask,
23+
current_state:{
24+
...MockTask.current_state,
25+
message:"Task created successfully!",
26+
},
27+
};
28+
2129
constmeta:Meta<typeofTasksPage>={
2230
title:"modules/tasks/TaskPrompt",
2331
component:TaskPrompt,
@@ -77,7 +85,7 @@ export const SubmitEnabledWhenPromptNotEmpty: Story = {
7785
constcanvas=within(canvasElement);
7886

7987
constprompt=awaitcanvas.findByLabelText(/prompt/i);
80-
awaituserEvent.type(prompt,MockNewTaskData.prompt);
88+
awaituserEvent.type(prompt,MockNewTaskData.initial_prompt);
8189

8290
constsubmitButton=canvas.getByRole("button",{name:/runtask/i});
8391
expect(submitButton).toBeEnabled();
@@ -152,7 +160,7 @@ export const OnSuccess: Story = {
152160

153161
awaitstep("Run task",async()=>{
154162
constprompt=awaitcanvas.findByLabelText(/prompt/i);
155-
awaituserEvent.type(prompt,MockNewTaskData.prompt);
163+
awaituserEvent.type(prompt,MockNewTaskData.initial_prompt);
156164
constsubmitButton=canvas.getByRole("button",{name:/runtask/i});
157165
awaitwaitFor(()=>expect(submitButton).toBeEnabled());
158166
awaituserEvent.click(submitButton);
@@ -162,7 +170,7 @@ export const OnSuccess: Story = {
162170
expect(API.experimental.createTask).toHaveBeenCalledWith(
163171
MockUserOwner.id,
164172
{
165-
input:MockNewTaskData.prompt,
173+
input:MockNewTaskData.initial_prompt,
166174
template_version_id:`${MockTemplate.active_version_id}-latest`,
167175
template_version_preset_id:undefined,
168176
},
@@ -267,7 +275,7 @@ export const SelectTemplateVersion: Story = {
267275

268276
awaitstep("Fill prompt",async()=>{
269277
constprompt=awaitcanvas.findByLabelText(/prompt/i);
270-
awaituserEvent.type(prompt,MockNewTaskData.prompt);
278+
awaituserEvent.type(prompt,MockNewTaskData.initial_prompt);
271279
});
272280

273281
awaitstep("Select version",async()=>{
@@ -290,7 +298,7 @@ export const SelectTemplateVersion: Story = {
290298
expect(API.experimental.createTask).toHaveBeenCalledWith(
291299
MockUserOwner.id,
292300
{
293-
input:MockNewTaskData.prompt,
301+
input:MockNewTaskData.initial_prompt,
294302
template_version_id:"test-template-version-2",
295303
template_version_preset_id:undefined,
296304
},
@@ -375,7 +383,7 @@ export const MissingExternalAuth: Story = {
375383

376384
awaitstep("Submit is disabled",async()=>{
377385
constprompt=awaitcanvas.findByLabelText(/prompt/i);
378-
awaituserEvent.type(prompt,MockNewTaskData.prompt);
386+
awaituserEvent.type(prompt,MockNewTaskData.initial_prompt);
379387
constsubmitButton=canvas.getByRole("button",{name:/runtask/i});
380388
expect(submitButton).toBeDisabled();
381389
});
@@ -403,7 +411,7 @@ export const ExternalAuthError: Story = {
403411

404412
awaitstep("Submit is disabled",async()=>{
405413
constprompt=awaitcanvas.findByLabelText(/prompt/i);
406-
awaituserEvent.type(prompt,MockNewTaskData.prompt);
414+
awaituserEvent.type(prompt,MockNewTaskData.initial_prompt);
407415
constsubmitButton=canvas.getByRole("button",{name:/runtask/i});
408416
expect(submitButton).toBeDisabled();
409417
});

‎site/src/modules/tasks/TaskStatus/TaskStatus.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
}from"components/StatusIndicator/StatusIndicator";
77
importtype{FC}from"react";
88

9-
exporttypeTaskStatusProps={
9+
typeTaskStatusProps={
1010
status:TypesGen.TaskStatus;
1111
stateMessage:string;
1212
};

‎site/src/pages/TaskPage/TaskApps.stories.tsx‎

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import{
22
MockPrimaryWorkspaceProxy,
3-
MockTasks,
43
MockUserOwner,
54
MockWorkspace,
65
MockWorkspaceAgent,
@@ -9,10 +8,9 @@ import {
98
}from"testHelpers/entities";
109
import{withAuthProvider,withProxyProvider}from"testHelpers/storybook";
1110
importtype{Meta,StoryObj}from"@storybook/react-vite";
12-
importtype{WorkspaceApp}from"api/typesGenerated";
11+
importtype{Workspace,WorkspaceApp}from"api/typesGenerated";
1312
import{getPreferredProxy}from"contexts/ProxyContext";
1413
importkebabCasefrom"lodash/kebabCase";
15-
importtype{Task}from"modules/tasks/tasks";
1614
import{TaskApps}from"./TaskApps";
1715

1816
constmockExternalApp:WorkspaceApp={
@@ -35,25 +33,25 @@ type Story = StoryObj<typeof TaskApps>;
3533

3634
exportconstNoEmbeddedApps:Story={
3735
args:{
38-
task:mockTask([]),
36+
workspace:mockWorkspaceWithApps([]),
3937
},
4038
};
4139

4240
exportconstWithExternalAppsOnly:Story={
4341
args:{
44-
task:mockTask([mockExternalApp]),
42+
workspace:mockWorkspaceWithApps([mockExternalApp]),
4543
},
4644
};
4745

4846
exportconstWithEmbeddedApps:Story={
4947
args:{
50-
task:mockTask([mockEmbeddedApp()]),
48+
workspace:mockWorkspaceWithApps([mockEmbeddedApp()]),
5149
},
5250
};
5351

5452
exportconstWithMixedApps:Story={
5553
args:{
56-
task:mockTask([mockEmbeddedApp(),mockExternalApp]),
54+
workspace:mockWorkspaceWithApps([mockEmbeddedApp(),mockExternalApp]),
5755
},
5856
};
5957

@@ -71,7 +69,7 @@ export const WithWildcardWarning: Story = {
7169
user:MockUserOwner,
7270
},
7371
args:{
74-
task:mockTask([
72+
workspace:mockWorkspaceWithApps([
7573
{
7674
...mockEmbeddedApp(),
7775
subdomain:true,
@@ -82,7 +80,7 @@ export const WithWildcardWarning: Story = {
8280

8381
exportconstWithManyEmbeddedApps:Story={
8482
args:{
85-
task:mockTask([
83+
workspace:mockWorkspaceWithApps([
8684
mockEmbeddedApp("Code Server"),
8785
mockEmbeddedApp("Jupyter Notebook"),
8886
mockEmbeddedApp("Web Terminal"),
@@ -108,25 +106,22 @@ function mockEmbeddedApp(name = MockWorkspaceApp.display_name): WorkspaceApp {
108106
};
109107
}
110108

111-
functionmockTask(apps:WorkspaceApp[]):Task{
109+
functionmockWorkspaceWithApps(apps:WorkspaceApp[]):Workspace{
112110
return{
113-
...MockTasks[0],
114-
workspace:{
115-
...MockWorkspace,
116-
latest_build:{
117-
...MockWorkspace.latest_build,
118-
resources:[
119-
{
120-
...MockWorkspace.latest_build.resources[0],
121-
agents:[
122-
{
123-
...MockWorkspaceAgent,
124-
apps,
125-
},
126-
],
127-
},
128-
],
129-
},
111+
...MockWorkspace,
112+
latest_build:{
113+
...MockWorkspace.latest_build,
114+
resources:[
115+
{
116+
...MockWorkspace.latest_build.resources[0],
117+
agents:[
118+
{
119+
...MockWorkspaceAgent,
120+
apps,
121+
},
122+
],
123+
},
124+
],
130125
},
131126
};
132127
}

0 commit comments

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