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

Commitfd7f68d

Browse files
committed
make fmt patch
1 parent6b80b33 commitfd7f68d

File tree

4 files changed

+148
-153
lines changed

4 files changed

+148
-153
lines changed

‎site/src/pages/TemplatesPage/CreateTemplateButton.stories.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { screen, userEvent } from "@storybook/test";
33
import{CreateTemplateButton}from"./CreateTemplateButton";
44

55
constmeta:Meta<typeofCreateTemplateButton>={
6-
title:"pages/TemplatesPage/CreateTemplateButton",
7-
component:CreateTemplateButton,
6+
title:"pages/TemplatesPage/CreateTemplateButton",
7+
component:CreateTemplateButton,
88
};
99

1010
exportdefaultmeta;
@@ -13,10 +13,10 @@ type Story = StoryObj<typeof CreateTemplateButton>;
1313
exportconstClose:Story={};
1414

1515
exportconstOpen:Story={
16-
play:async({ step})=>{
17-
constuser=userEvent.setup();
18-
awaitstep("click on trigger",async()=>{
19-
awaituser.click(screen.getByRole("button"));
20-
});
21-
},
16+
play:async({ step})=>{
17+
constuser=userEvent.setup();
18+
awaitstep("click on trigger",async()=>{
19+
awaituser.click(screen.getByRole("button"));
20+
});
21+
},
2222
};

‎site/src/pages/TemplatesPage/CreateTemplateButton.tsx

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,54 +3,54 @@ import Inventory2 from "@mui/icons-material/Inventory2";
33
importNoteAddOutlinedfrom"@mui/icons-material/NoteAddOutlined";
44
importUploadOutlinedfrom"@mui/icons-material/UploadOutlined";
55
importButtonfrom"@mui/material/Button";
6+
importtype{FC}from"react";
67
import{
7-
MoreMenu,
8-
MoreMenuContent,
9-
MoreMenuItem,
10-
MoreMenuTrigger,
8+
MoreMenu,
9+
MoreMenuContent,
10+
MoreMenuItem,
11+
MoreMenuTrigger,
1112
}from"components/MoreMenu/MoreMenu";
12-
importtype{FC}from"react";
1313

1414
typeCreateTemplateButtonProps={
15-
onNavigate:(path:string)=>void;
15+
onNavigate:(path:string)=>void;
1616
};
1717

1818
exportconstCreateTemplateButton:FC<CreateTemplateButtonProps>=({
19-
onNavigate,
19+
onNavigate,
2020
})=>{
21-
return(
22-
<MoreMenu>
23-
<MoreMenuTrigger>
24-
<ButtonstartIcon={<AddIcon/>}variant="contained">
25-
Create Template
26-
</Button>
27-
</MoreMenuTrigger>
28-
<MoreMenuContent>
29-
<MoreMenuItem
30-
onClick={()=>{
31-
onNavigate("/templates/new?exampleId=scratch");
32-
}}
33-
>
34-
<NoteAddOutlined/>
35-
From scratch
36-
</MoreMenuItem>
37-
<MoreMenuItem
38-
onClick={()=>{
39-
onNavigate("/templates/new");
40-
}}
41-
>
42-
<UploadOutlined/>
43-
Upload template
44-
</MoreMenuItem>
45-
<MoreMenuItem
46-
onClick={()=>{
47-
onNavigate("/starter-templates");
48-
}}
49-
>
50-
<Inventory2/>
51-
Choose a starter template
52-
</MoreMenuItem>
53-
</MoreMenuContent>
54-
</MoreMenu>
55-
);
21+
return(
22+
<MoreMenu>
23+
<MoreMenuTrigger>
24+
<ButtonstartIcon={<AddIcon/>}variant="contained">
25+
Create Template
26+
</Button>
27+
</MoreMenuTrigger>
28+
<MoreMenuContent>
29+
<MoreMenuItem
30+
onClick={()=>{
31+
onNavigate("/templates/new?exampleId=scratch");
32+
}}
33+
>
34+
<NoteAddOutlined/>
35+
From scratch
36+
</MoreMenuItem>
37+
<MoreMenuItem
38+
onClick={()=>{
39+
onNavigate("/templates/new");
40+
}}
41+
>
42+
<UploadOutlined/>
43+
Upload template
44+
</MoreMenuItem>
45+
<MoreMenuItem
46+
onClick={()=>{
47+
onNavigate("/starter-templates");
48+
}}
49+
>
50+
<Inventory2/>
51+
Choose a starter template
52+
</MoreMenuItem>
53+
</MoreMenuContent>
54+
</MoreMenu>
55+
);
5656
};

‎site/src/pages/TemplatesPage/TemplatesPage.test.tsx

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,37 @@ import { RequireAuth } from "contexts/auth/RequireAuth";
66
importTemplatesPagefrom"./TemplatesPage";
77

88
test("create template from scratch",async()=>{
9-
constuser=userEvent.setup();
10-
constrouter=createMemoryRouter(
11-
[
12-
{
13-
element:<RequireAuth/>,
14-
children:[
15-
{
16-
path:"/templates",
17-
element:<TemplatesPage/>,
18-
},
19-
{
20-
path:"/templates/new",
21-
element:<divdata-testid="new-template-page"/>,
22-
},
23-
],
24-
},
25-
],
26-
{initialEntries:["/templates"]},
27-
);
28-
render(
29-
<AppProviders>
30-
<RouterProviderrouter={router}/>
31-
</AppProviders>,
32-
);
33-
constcreateTemplateButton=awaitscreen.findByRole("button",{
34-
name:"Create Template",
35-
});
36-
awaituser.click(createTemplateButton);
37-
constfromScratchMenuItem=awaitscreen.findByText("From scratch");
38-
awaituser.click(fromScratchMenuItem);
39-
awaitscreen.findByTestId("new-template-page");
40-
expect(router.state.location.pathname).toBe("/templates/new");
41-
expect(router.state.location.search).toBe("?exampleId=scratch");
9+
constuser=userEvent.setup();
10+
constrouter=createMemoryRouter(
11+
[
12+
{
13+
element:<RequireAuth/>,
14+
children:[
15+
{
16+
path:"/templates",
17+
element:<TemplatesPage/>,
18+
},
19+
{
20+
path:"/templates/new",
21+
element:<divdata-testid="new-template-page"/>,
22+
},
23+
],
24+
},
25+
],
26+
{initialEntries:["/templates"]},
27+
);
28+
render(
29+
<AppProviders>
30+
<RouterProviderrouter={router}/>
31+
</AppProviders>,
32+
);
33+
constcreateTemplateButton=awaitscreen.findByRole("button",{
34+
name:"Create Template",
35+
});
36+
awaituser.click(createTemplateButton);
37+
constfromScratchMenuItem=awaitscreen.findByText("From scratch");
38+
awaituser.click(fromScratchMenuItem);
39+
awaitscreen.findByTestId("new-template-page");
40+
expect(router.state.location.pathname).toBe("/templates/new");
41+
expect(router.state.location.search).toBe("?exampleId=scratch");
4242
});

‎site/src/pages/TemplatesPage/TemplatesPageView.tsx

Lines changed: 65 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -169,80 +169,75 @@ export const TemplatesPageView: FC<TemplatesPageViewProps> = ({
169169
examples,
170170
canCreateTemplates,
171171
})=>{
172-
const{ experiments}=useDashboard();
173-
constisLoading=!templates;
174-
constisEmpty=templates&&templates.length===0;
175-
constnavigate=useNavigate();
176-
constmultiOrgExperimentEnabled=experiments.includes("multi-organization");
172+
const{ experiments}=useDashboard();
173+
constisLoading=!templates;
174+
constisEmpty=templates&&templates.length===0;
175+
constnavigate=useNavigate();
176+
constmultiOrgExperimentEnabled=experiments.includes("multi-organization");
177177

178-
constcreateTemplateAction=()=>{
179-
returnmultiOrgExperimentEnabled ?(
180-
<Button
181-
startIcon={<AddIcon/>}
182-
variant="contained"
183-
onClick={()=>{
184-
navigate("/starter-templates");
185-
}}
186-
>
187-
Create Template
188-
</Button>
189-
) :(
190-
<CreateTemplateButtononNavigate={navigate}/>
191-
);
192-
};
178+
constcreateTemplateAction=()=>{
179+
returnmultiOrgExperimentEnabled ?(
180+
<Button
181+
startIcon={<AddIcon/>}
182+
variant="contained"
183+
onClick={()=>{
184+
navigate("/starter-templates");
185+
}}
186+
>
187+
Create Template
188+
</Button>
189+
) :(
190+
<CreateTemplateButtononNavigate={navigate}/>
191+
);
192+
};
193193

194-
return(
195-
<Margins>
196-
<PageHeaderactions={canCreateTemplates&&createTemplateAction()}>
197-
<PageHeaderTitle>
198-
<Stackspacing={1}direction="row"alignItems="center">
199-
Templates
200-
<TemplateHelpTooltip/>
201-
</Stack>
202-
</PageHeaderTitle>
203-
<PageHeaderSubtitle>
204-
Select a template to create a workspace.
205-
</PageHeaderSubtitle>
206-
</PageHeader>
194+
return(
195+
<Margins>
196+
<PageHeaderactions={canCreateTemplates&&createTemplateAction()}>
197+
<PageHeaderTitle>
198+
<Stackspacing={1}direction="row"alignItems="center">
199+
Templates
200+
<TemplateHelpTooltip/>
201+
</Stack>
202+
</PageHeaderTitle>
203+
<PageHeaderSubtitle>
204+
Select a template to create a workspace.
205+
</PageHeaderSubtitle>
206+
</PageHeader>
207207

208-
{error ?(
209-
<ErrorAlerterror={error}/>
210-
) :(
211-
<TableContainer>
212-
<Table>
213-
<TableHead>
214-
<TableRow>
215-
<TableCellwidth="35%">{Language.nameLabel}</TableCell>
216-
<TableCellwidth="15%">
217-
{Language.usedByLabel}
218-
</TableCell>
219-
<TableCellwidth="10%">{Language.buildTimeLabel}</TableCell>
220-
<TableCellwidth="15%">{Language.lastUpdatedLabel}</TableCell>
221-
<TableCellwidth="1%"/>
222-
</TableRow>
223-
</TableHead>
224-
<TableBody>
225-
{isLoading&&<TableLoader/>}
208+
{error ?(
209+
<ErrorAlerterror={error}/>
210+
) :(
211+
<TableContainer>
212+
<Table>
213+
<TableHead>
214+
<TableRow>
215+
<TableCellwidth="35%">{Language.nameLabel}</TableCell>
216+
<TableCellwidth="15%">{Language.usedByLabel}</TableCell>
217+
<TableCellwidth="10%">{Language.buildTimeLabel}</TableCell>
218+
<TableCellwidth="15%">{Language.lastUpdatedLabel}</TableCell>
219+
<TableCellwidth="1%"/>
220+
</TableRow>
221+
</TableHead>
222+
<TableBody>
223+
{isLoading&&<TableLoader/>}
226224

227-
{isEmpty ?(
228-
<EmptyTemplates
229-
canCreateTemplates={canCreateTemplates}
230-
examples={examples??[]}
231-
/>
232-
) :(
233-
templates?.map((template)=>(
234-
<TemplateRow
235-
key={template.id}
236-
template={template}
237-
/>
238-
))
239-
)}
240-
</TableBody>
241-
</Table>
242-
</TableContainer>
243-
)}
244-
</Margins>
245-
);
225+
{isEmpty ?(
226+
<EmptyTemplates
227+
canCreateTemplates={canCreateTemplates}
228+
examples={examples??[]}
229+
/>
230+
) :(
231+
templates?.map((template)=>(
232+
<TemplateRowkey={template.id}template={template}/>
233+
))
234+
)}
235+
</TableBody>
236+
</Table>
237+
</TableContainer>
238+
)}
239+
</Margins>
240+
);
246241
};
247242

248243
constTableLoader:FC=()=>{

0 commit comments

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