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

Commit4c7132f

Browse files
authored
chore: redirect to the correct template page routes (#14230)
1 parent59a80d7 commit4c7132f

File tree

3 files changed

+115
-19
lines changed

3 files changed

+115
-19
lines changed
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import{waitFor}from"@testing-library/react";
2+
import{API}from"api/api";
3+
import*asMfrom"testHelpers/entities";
4+
import{renderWithAuth}from"testHelpers/renderHelpers";
5+
import{TemplateRedirectController}from"./TemplateRedirectController";
6+
7+
constrenderTemplateRedirectController=(route:string)=>{
8+
returnrenderWithAuth(<TemplateRedirectController/>,{
9+
route,
10+
path:"/templates/:organization?/:template",
11+
});
12+
};
13+
14+
it("redirects from multi-org to single-org",async()=>{
15+
const{ router}=renderTemplateRedirectController(
16+
`/templates/${M.MockTemplate.organization_name}/${M.MockTemplate.name}`,
17+
);
18+
19+
awaitwaitFor(()=>
20+
expect(router.state.location.pathname).toEqual(
21+
`/templates/${M.MockTemplate.name}`,
22+
),
23+
);
24+
});
25+
26+
it("redirects from single-org to multi-org",async()=>{
27+
jest
28+
.spyOn(API,"getOrganizations")
29+
.mockResolvedValueOnce([M.MockDefaultOrganization,M.MockOrganization2]);
30+
31+
const{ router}=renderTemplateRedirectController(
32+
`/templates/${M.MockTemplate.name}`,
33+
);
34+
35+
awaitwaitFor(()=>
36+
expect(router.state.location.pathname).toEqual(
37+
`/templates/${M.MockDefaultOrganization.name}/${M.MockTemplate.name}`,
38+
),
39+
);
40+
});
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
importtype{FC}from"react";
2+
import{Navigate,Outlet,useLocation,useParams}from"react-router-dom";
3+
importtype{Organization}from"api/typesGenerated";
4+
import{useDashboard}from"modules/dashboard/useDashboard";
5+
6+
exportconstTemplateRedirectController:FC=()=>{
7+
const{ organizations, showOrganizations}=useDashboard();
8+
const{ organization, template}=useParams()as{
9+
organization?:string;
10+
template:string;
11+
};
12+
constlocation=useLocation();
13+
14+
// We redirect templates without an organization to the default organization,
15+
// as that's likely what any links floating around expect.
16+
if(showOrganizations&&!organization){
17+
constextraPath=removePrefix(location.pathname,`/templates/${template}`);
18+
19+
return(
20+
<Navigate
21+
to={`/templates/${getOrganizationNameByDefault(
22+
organizations,
23+
)}/${template}${extraPath}${location.search}`}
24+
replace
25+
/>
26+
);
27+
}
28+
29+
// `showOrganizations` can only be false when there is a single organization,
30+
// so it's safe to throw away the organization name.
31+
if(!showOrganizations&&organization){
32+
constextraPath=removePrefix(
33+
location.pathname,
34+
`/templates/${organization}/${template}`,
35+
);
36+
37+
return(
38+
<Navigate
39+
to={`/templates/${template}${extraPath}${location.search}`}
40+
replace
41+
/>
42+
);
43+
}
44+
45+
return<Outlet/>;
46+
};
47+
48+
constgetOrganizationNameByDefault=(organizations:Organization[])=>
49+
organizations.find((org)=>org.is_default)?.name;
50+
51+
// I really hate doing it this way, but React Router does not provide a better way.
52+
constremovePrefix=(self:string,prefix:string)=>
53+
self.startsWith(prefix) ?self.slice(prefix.length) :self;

‎site/src/router.tsx

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import{Suspense,lazy}from"react";
1+
import{lazy,Suspense}from"react";
22
import{
33
createBrowserRouter,
44
createRoutesFromChildren,
55
Navigate,
66
Outlet,
77
Route,
88
}from"react-router-dom";
9+
import{TemplateRedirectController}from"pages/TemplatePage/TemplateRedirectController";
910
import{Loader}from"./components/Loader/Loader";
1011
import{RequireAuth}from"./contexts/auth/RequireAuth";
1112
import{DashboardLayout}from"./modules/dashboard/DashboardLayout";
@@ -289,27 +290,29 @@ const RoutesWithSuspense = () => {
289290
consttemplateRouter=()=>{
290291
return(
291292
<Routepath=":template">
292-
<Routeelement={<TemplateLayout/>}>
293-
<Routeindexelement={<TemplateSummaryPage/>}/>
294-
<Routepath="docs"element={<TemplateDocsPage/>}/>
295-
<Routepath="files"element={<TemplateFilesPage/>}/>
296-
<Routepath="versions"element={<TemplateVersionsPage/>}/>
297-
<Routepath="embed"element={<TemplateEmbedPage/>}/>
298-
<Routepath="insights"element={<TemplateInsightsPage/>}/>
299-
</Route>
293+
<Routeelement={<TemplateRedirectController/>}>
294+
<Routeelement={<TemplateLayout/>}>
295+
<Routeindexelement={<TemplateSummaryPage/>}/>
296+
<Routepath="docs"element={<TemplateDocsPage/>}/>
297+
<Routepath="files"element={<TemplateFilesPage/>}/>
298+
<Routepath="versions"element={<TemplateVersionsPage/>}/>
299+
<Routepath="embed"element={<TemplateEmbedPage/>}/>
300+
<Routepath="insights"element={<TemplateInsightsPage/>}/>
301+
</Route>
300302

301-
<Routepath="workspace"element={<CreateWorkspacePage/>}/>
303+
<Routepath="workspace"element={<CreateWorkspacePage/>}/>
302304

303-
<Routepath="settings"element={<TemplateSettingsLayout/>}>
304-
<Routeindexelement={<TemplateSettingsPage/>}/>
305-
<Routepath="permissions"element={<TemplatePermissionsPage/>}/>
306-
<Routepath="variables"element={<TemplateVariablesPage/>}/>
307-
<Routepath="schedule"element={<TemplateSchedulePage/>}/>
308-
</Route>
305+
<Routepath="settings"element={<TemplateSettingsLayout/>}>
306+
<Routeindexelement={<TemplateSettingsPage/>}/>
307+
<Routepath="permissions"element={<TemplatePermissionsPage/>}/>
308+
<Routepath="variables"element={<TemplateVariablesPage/>}/>
309+
<Routepath="schedule"element={<TemplateSchedulePage/>}/>
310+
</Route>
309311

310-
<Routepath="versions">
311-
<Routepath=":version">
312-
<Routeindexelement={<TemplateVersionPage/>}/>
312+
<Routepath="versions">
313+
<Routepath=":version">
314+
<Routeindexelement={<TemplateVersionPage/>}/>
315+
</Route>
313316
</Route>
314317
</Route>
315318
</Route>

0 commit comments

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