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

Commit4b9d029

Browse files
committed
chore: enforce correct template page routes
1 parent54901e3 commit4b9d029

File tree

2 files changed

+75
-19
lines changed

2 files changed

+75
-19
lines changed
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,4 +1,4 @@
1-
import{Suspense,lazy}from"react";
1+
import{lazy,Suspense}from"react";
22
import{
33
createBrowserRouter,
44
createRoutesFromChildren,
@@ -23,6 +23,7 @@ import { UsersLayout } from "./pages/UsersPage/UsersLayout";
2323
importUsersPagefrom"./pages/UsersPage/UsersPage";
2424
import{WorkspaceSettingsLayout}from"./pages/WorkspaceSettingsPage/WorkspaceSettingsLayout";
2525
importWorkspacesPagefrom"./pages/WorkspacesPage/WorkspacesPage";
26+
import{TemplateRedirectController}from"pages/TemplatePage/TemplateRedirectController";
2627

2728
// Lazy load pages
2829
// - Pages that are secondary, not in the main navigation or not usually accessed
@@ -282,27 +283,29 @@ const RoutesWithSuspense = () => {
282283
consttemplateRouter=()=>{
283284
return(
284285
<Routepath=":template">
285-
<Routeelement={<TemplateLayout/>}>
286-
<Routeindexelement={<TemplateSummaryPage/>}/>
287-
<Routepath="docs"element={<TemplateDocsPage/>}/>
288-
<Routepath="files"element={<TemplateFilesPage/>}/>
289-
<Routepath="versions"element={<TemplateVersionsPage/>}/>
290-
<Routepath="embed"element={<TemplateEmbedPage/>}/>
291-
<Routepath="insights"element={<TemplateInsightsPage/>}/>
292-
</Route>
286+
<Routeelement={<TemplateRedirectController/>}>
287+
<Routeelement={<TemplateLayout/>}>
288+
<Routeindexelement={<TemplateSummaryPage/>}/>
289+
<Routepath="docs"element={<TemplateDocsPage/>}/>
290+
<Routepath="files"element={<TemplateFilesPage/>}/>
291+
<Routepath="versions"element={<TemplateVersionsPage/>}/>
292+
<Routepath="embed"element={<TemplateEmbedPage/>}/>
293+
<Routepath="insights"element={<TemplateInsightsPage/>}/>
294+
</Route>
293295

294-
<Routepath="workspace"element={<CreateWorkspacePage/>}/>
296+
<Routepath="workspace"element={<CreateWorkspacePage/>}/>
295297

296-
<Routepath="settings"element={<TemplateSettingsLayout/>}>
297-
<Routeindexelement={<TemplateSettingsPage/>}/>
298-
<Routepath="permissions"element={<TemplatePermissionsPage/>}/>
299-
<Routepath="variables"element={<TemplateVariablesPage/>}/>
300-
<Routepath="schedule"element={<TemplateSchedulePage/>}/>
301-
</Route>
298+
<Routepath="settings"element={<TemplateSettingsLayout/>}>
299+
<Routeindexelement={<TemplateSettingsPage/>}/>
300+
<Routepath="permissions"element={<TemplatePermissionsPage/>}/>
301+
<Routepath="variables"element={<TemplateVariablesPage/>}/>
302+
<Routepath="schedule"element={<TemplateSchedulePage/>}/>
303+
</Route>
302304

303-
<Routepath="versions">
304-
<Routepath=":version">
305-
<Routeindexelement={<TemplateVersionPage/>}/>
305+
<Routepath="versions">
306+
<Routepath=":version">
307+
<Routeindexelement={<TemplateVersionPage/>}/>
308+
</Route>
306309
</Route>
307310
</Route>
308311
</Route>

0 commit comments

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