Skip to content

fix: template permissions page never loads #5014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 14, 2022
Merged

fix: template permissions page never loads #5014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23502c4
removed redundant permissions loader
Kira-Pilot Nov 10, 2022
90724e3
fixed tests
Kira-Pilot Nov 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 56 additions & 74 deletions site/src/components/TemplateLayout/TemplateLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,35 +106,23 @@ export const TemplateLayout: FC<PropsWithChildren> = ({ children }) => {
organizationId,
},
})
const {
template,
activeTemplateVersion,
templateResources,
templateDAUs,
permissions: templatePermissions,
} = templateState.context
const { template, permissions: templatePermissions } = templateState.context
const xServices = useContext(XServiceContext)
const permissions = useSelector(xServices.authXService, selectPermissions)
const isLoading =
!template ||
!activeTemplateVersion ||
!templateResources ||
!permissions ||
!templateDAUs ||
!templatePermissions

const hasIcon = template && template.icon && template.icon !== ""

if (!template) {
return <Loader />
}

const generatePageHeaderActions = (): JSX.Element[] => {
const pageActions: JSX.Element[] = []

if (!isLoading && templatePermissions.canUpdateTemplate) {
pageActions.push(<TemplateSettingsButton templateName={templateName} />)
if (templatePermissions?.canUpdateTemplate) {
pageActions.push(<TemplateSettingsButton templateName={template.name} />)
}

if (!isLoading) {
pageActions.push(<CreateWorkspaceButton templateName={templateName} />)
}
pageActions.push(<CreateWorkspaceButton templateName={template.name} />)

return pageActions
}
Expand All @@ -152,65 +140,59 @@ export const TemplateLayout: FC<PropsWithChildren> = ({ children }) => {
}
>
<Stack direction="row" spacing={3} className={styles.pageTitle}>
{!isLoading && (
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why we were wrapping all these blocks in isLoading - seems like we just need to make sure the template is there (and we do on line 114).

<div>
{hasIcon ? (
<div className={styles.iconWrapper}>
<img src={template.icon} alt="" />
</div>
) : (
<Avatar className={styles.avatar}>
{firstLetter(templateName)}
</Avatar>
)}
</div>
)}
<div>
{hasIcon ? (
<div className={styles.iconWrapper}>
<img src={template.icon} alt="" />
</div>
) : (
<Avatar className={styles.avatar}>
{firstLetter(template.name)}
</Avatar>
)}
</div>

{!isLoading && (
<div>
<PageHeaderTitle>{templateName}</PageHeaderTitle>
<PageHeaderSubtitle condensed>
{template.description === ""
? Language.noDescription
: template.description}
</PageHeaderSubtitle>
</div>
)}
<div>
<PageHeaderTitle>{template.name}</PageHeaderTitle>
<PageHeaderSubtitle condensed>
{template.description === ""
? Language.noDescription
: template.description}
</PageHeaderSubtitle>
</div>
</Stack>
</PageHeader>
</Margins>

{!isLoading && (
<div className={styles.tabs}>
<Margins>
<Stack direction="row" spacing={0.25}>
<NavLink
end
to={`/templates/${template.name}`}
className={({ isActive }) =>
combineClasses([
styles.tabItem,
isActive ? styles.tabItemActive : undefined,
])
}
>
Summary
</NavLink>
<NavLink
to={`/templates/${template.name}/permissions`}
className={({ isActive }) =>
combineClasses([
styles.tabItem,
isActive ? styles.tabItemActive : undefined,
])
}
>
Permissions
</NavLink>
</Stack>
</Margins>
</div>
)}
<div className={styles.tabs}>
<Margins>
<Stack direction="row" spacing={0.25}>
<NavLink
end
to={`/templates/${template.name}`}
className={({ isActive }) =>
combineClasses([
styles.tabItem,
isActive ? styles.tabItemActive : undefined,
])
}
>
Summary
</NavLink>
<NavLink
to={`/templates/${template.name}/permissions`}
className={({ isActive }) =>
combineClasses([
styles.tabItem,
isActive ? styles.tabItemActive : undefined,
])
}
>
Permissions
</NavLink>
</Stack>
</Margins>
</div>

<Margins>
<TemplateLayoutContext.Provider
Expand Down
8 changes: 2 additions & 6 deletions site/src/pages/TemplatePage/TemplatePermissionsPage/TemplatePermissionsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { Helmet } from "react-helmet-async"
import { pageTitle } from "util/page"
import { templateACLMachine } from "xServices/template/templateACLXService"
import { TemplatePermissionsPageView } from "./TemplatePermissionsPageView"
import { Loader } from "components/Loader/Loader"

export const TemplatePermissionsPage: FC<
React.PropsWithChildren<unknown>
Expand All @@ -26,14 +25,11 @@ export const TemplatePermissionsPage: FC<
context: { templateId: template?.id },
})
const { templateACL, userToBeUpdated, groupToBeUpdated } = state.context
if (!template || !permissions) {
return <Loader />
}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't need another loader here, right? We already have the Suspense in the parent component with a fallback loader. Also, at this point, we can be certain template is loaded.


return (
<>
<Helmet>
<title>{pageTitle(`${template.name} · Permissions`)}</title>
<title>{pageTitle(`${template?.name} · Permissions`)}</title>
</Helmet>
<ChooseOne>
<Cond condition={!isTemplateRBACEnabled}>
Expand Down Expand Up @@ -68,7 +64,7 @@ export const TemplatePermissionsPage: FC<
<TemplatePermissionsPageView
organizationId={organizationId}
templateACL={templateACL}
canUpdatePermissions={permissions.canUpdateTemplate}
canUpdatePermissions={Boolean(permissions?.canUpdateTemplate)}
onAddUser={(user, role, reset) => {
send("ADD_USER", { user, role, onDone: reset })
}}
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe("TemplateSummaryPage", () => {

renderPage()
await screen.findByText(MockTemplate.name)
screen.getByTestId("markdown")
await screen.findByTestId("markdown")
screen.getByText(MockWorkspaceResource.name)
screen.queryAllByText(`${MockTemplateVersion.name}`).length
})
Expand Down