Skip to content

Commit 759bddf

Browse files
committed
Fix FE errors
1 parent f28156f commit 759bddf

File tree

5 files changed

+40
-156
lines changed

5 files changed

+40
-156
lines changed

site/src/AppRouter.tsx

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import { useSelector } from "@xstate/react"
22
import { FeatureNames } from "api/types"
33
import { FullScreenLoader } from "components/Loader/FullScreenLoader"
44
import { RequirePermission } from "components/RequirePermission/RequirePermission"
5+
import { TemplateLayout } from "components/TemplateLayout/TemplateLayout"
56
import IndexPage from "pages"
67
import AuditPage from "pages/AuditPage/AuditPage"
78
import LoginPage from "pages/LoginPage/LoginPage"
8-
import { TemplateLayout } from "components/TemplateLayout/TemplateLayout"
99
import { SetupPage } from "pages/SetupPage/SetupPage"
10-
import TemplateCollaboratorsPage from "pages/TemplatePage/TemplateCollaboratorsPage/TemplateCollaboratorsPage"
10+
import TemplatePermissionsPage from "pages/TemplatePage/TemplatePermissionsPage/TemplatePermissionsPage"
1111
import TemplateSummaryPage from "pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage"
1212
import { TemplateSettingsPage } from "pages/TemplateSettingsPage/TemplateSettingsPage"
1313
import TemplatesPage from "pages/TemplatesPage/TemplatesPage"
@@ -93,43 +93,41 @@ export const AppRouter: FC = () => {
9393
}
9494
/>
9595

96-
<Route path=":template">
97-
<Route
98-
index
99-
element={
100-
<AuthAndFrame>
101-
<TemplateLayout />
102-
</AuthAndFrame>
103-
}
104-
>
105-
<Route index element={<TemplateSummaryPage />} />
106-
<Route path="collaborators" element={<TemplateCollaboratorsPage />} />
107-
</Route>
108-
<Route
109-
path="workspace"
110-
element={
111-
<RequireAuth>
112-
<CreateWorkspacePage />
113-
</RequireAuth>
114-
}
115-
/>
116-
<Route
117-
path="workspace"
118-
element={
119-
<RequireAuth>
120-
<CreateWorkspacePage />
121-
</RequireAuth>
122-
}
123-
/>
124-
<Route
125-
path="settings"
126-
element={
127-
<RequireAuth>
128-
<TemplateSettingsPage />
129-
</RequireAuth>
130-
}
131-
/>
96+
<Route
97+
path=":template"
98+
element={
99+
<AuthAndFrame>
100+
<TemplateLayout />
101+
</AuthAndFrame>
102+
}
103+
>
104+
<Route index element={<TemplateSummaryPage />} />
105+
<Route path="permissions" element={<TemplatePermissionsPage />} />
132106
</Route>
107+
<Route
108+
path="workspace"
109+
element={
110+
<RequireAuth>
111+
<CreateWorkspacePage />
112+
</RequireAuth>
113+
}
114+
/>
115+
<Route
116+
path="workspace"
117+
element={
118+
<RequireAuth>
119+
<CreateWorkspacePage />
120+
</RequireAuth>
121+
}
122+
/>
123+
<Route
124+
path="settings"
125+
element={
126+
<RequireAuth>
127+
<TemplateSettingsPage />
128+
</RequireAuth>
129+
}
130+
/>
133131
</Route>
134132

135133
<Route path="users">

site/src/components/TemplateLayout/TemplateLayout.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { Loader } from "components/Loader/Loader"
1212
import { PageHeader, PageHeaderSubtitle, PageHeaderTitle } from "components/PageHeader/PageHeader"
1313
import { useOrganizationId } from "hooks/useOrganizationId"
1414
import { FC, useContext } from "react"
15-
import { useTranslation } from "react-i18next"
1615
import { Link as RouterLink, Navigate, NavLink, Outlet, useParams } from "react-router-dom"
1716
import { combineClasses } from "util/combineClasses"
1817
import { firstLetter } from "util/firstLetter"
@@ -42,7 +41,6 @@ export const TemplateLayout: FC = () => {
4241
const styles = useStyles()
4342
const organizationId = useOrganizationId()
4443
const templateName = useTemplateName()
45-
const { t } = useTranslation("templatePage")
4644
const [templateState, templateSend] = useMachine(templateMachine, {
4745
context: {
4846
templateName,
@@ -143,7 +141,7 @@ export const TemplateLayout: FC = () => {
143141
Summary
144142
</NavLink>
145143
<NavLink
146-
to={`/templates/${template.name}/collaborators`}
144+
to={`/templates/${template.name}/permissions`}
147145
className={({ isActive }) =>
148146
combineClasses([styles.tabItem, isActive ? styles.tabItemActive : undefined])
149147
}
@@ -161,14 +159,14 @@ export const TemplateLayout: FC = () => {
161159
<DeleteDialog
162160
isOpen={templateState.matches("confirmingDelete")}
163161
confirmLoading={templateState.matches("deleting")}
164-
title={t("deleteDialog.title")}
165-
description={t("deleteDialog.description")}
166162
onConfirm={() => {
167163
templateSend("CONFIRM_DELETE")
168164
}}
169165
onCancel={() => {
170166
templateSend("CANCEL_DELETE")
171167
}}
168+
entity="template"
169+
name={template.name}
172170
/>
173171
</>
174172
)

site/src/pages/TemplatePage/TemplatePage.tsx

Lines changed: 0 additions & 112 deletions
This file was deleted.

site/src/pages/TemplatePage/TemplateCollaboratorsPage/TemplateCollaboratorsPage.tsx renamed to site/src/pages/TemplatePage/TemplatePermissionsPage/TemplatePermissionsPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { pageTitle } from "util/page"
77
import { Permissions } from "xServices/auth/authXService"
88
import { templateUsersMachine } from "xServices/template/templateUsersXService"
99
import { TemplateContext } from "xServices/template/templateXService"
10-
import { TemplateCollaboratorsPageView } from "./TemplateCollaboratorsPageView"
10+
import { TemplateCollaboratorsPageView } from "./TemplatePermissionsPageView"
1111

1212
export const TemplateCollaboratorsPage: FC<React.PropsWithChildren<unknown>> = () => {
1313
const { templateContext, permissions } = useOutletContext<{

0 commit comments

Comments
 (0)