Skip to content

Commit 99f2656

Browse files
committed
fix: remove permissions dependency
1 parent 12ac56f commit 99f2656

File tree

2 files changed

+29
-37
lines changed

2 files changed

+29
-37
lines changed

site/src/pages/WorkspacesPage/WorkspacesButton.tsx

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { type ReactNode, useState, ReactElement } from "react";
2-
import { useOrganizationId, usePermissions } from "hooks";
2+
import { useOrganizationId } from "hooks";
3+
import { Language } from "./WorkspacesPageView";
34

45
import { useQuery } from "@tanstack/react-query";
56
import { type Template } from "api/typesGenerated";
@@ -115,15 +116,10 @@ function WorkspaceResultsRow({ template }: { template: Template }) {
115116

116117
type WorkspacesButtonProps = {
117118
children: string | ReactElement;
118-
seeMoreTemplatesText: string | ReactElement;
119119
};
120120

121-
export function WorkspacesButton({
122-
children,
123-
seeMoreTemplatesText,
124-
}: WorkspacesButtonProps) {
121+
export function WorkspacesButton({ children }: WorkspacesButtonProps) {
125122
const organizationId = useOrganizationId();
126-
const permissions = usePermissions();
127123
const templatesQuery = useQuery(templates(organizationId));
128124
const theme = useTheme();
129125

@@ -193,36 +189,34 @@ export function WorkspacesButton({
193189
)}
194190
</OverflowY>
195191

196-
{permissions.createTemplates && (
197-
<Link
198-
component={RouterLink}
199-
to="/templates"
192+
<Link
193+
component={RouterLink}
194+
to="/templates"
195+
sx={{
196+
outline: "none",
197+
"&:focus": {
198+
backgroundColor: theme.palette.action.focus,
199+
},
200+
}}
201+
>
202+
<Box
200203
sx={{
201-
outline: "none",
202-
"&:focus": {
203-
backgroundColor: theme.palette.action.focus,
204-
},
204+
padding: 2,
205+
display: "flex",
206+
flexFlow: "row nowrap",
207+
alignItems: "center",
208+
columnGap: COLUMN_GAP,
209+
borderTop: `1px solid ${theme.palette.divider}`,
205210
}}
206211
>
207-
<Box
208-
sx={{
209-
padding: 2,
210-
display: "flex",
211-
flexFlow: "row nowrap",
212-
alignItems: "center",
213-
columnGap: COLUMN_GAP,
214-
borderTop: `1px solid ${theme.palette.divider}`,
215-
}}
216-
>
217-
<Box component="span" sx={{ width: `${ICON_SIZE}px` }}>
218-
<OpenIcon
219-
sx={{ fontSize: "16px", marginX: "auto", display: "block" }}
220-
/>
221-
</Box>
222-
<span>{seeMoreTemplatesText}</span>
212+
<Box component="span" sx={{ width: `${ICON_SIZE}px` }}>
213+
<OpenIcon
214+
sx={{ fontSize: "16px", marginX: "auto", display: "block" }}
215+
/>
223216
</Box>
224-
</Link>
225-
)}
217+
<span>{Language.seeAllTemplates}</span>
218+
</Box>
219+
</Link>
226220
</PopoverContainer>
227221
);
228222
}

site/src/pages/WorkspacesPage/WorkspacesPageView.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const Language = {
2626
allWorkspacesButton: "All workspaces",
2727
runningWorkspacesButton: "Running workspaces",
2828
createWorkspace: <>Create Workspace&hellip;</>,
29-
moreTemplates: "See all templates",
29+
seeAllTemplates: "See all templates",
3030
template: "Template",
3131
};
3232

@@ -76,9 +76,7 @@ export const WorkspacesPageView: FC<
7676
<Margins>
7777
<PageHeader
7878
actions={
79-
<WorkspacesButton seeMoreTemplatesText={Language.moreTemplates}>
80-
{Language.createWorkspace}
81-
</WorkspacesButton>
79+
<WorkspacesButton>{Language.createWorkspace}</WorkspacesButton>
8280
}
8381
>
8482
<PageHeaderTitle>

0 commit comments

Comments
 (0)