Skip to content

fix: fix permissions for workspace creation #17241

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 7 commits into from
Apr 3, 2025
Merged

fix: fix permissions for workspace creation #17241

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
55ed653
fix: fix permissions for workspace creation
jaaydenh Apr 3, 2025
19fcd6f
fix: format
jaaydenh Apr 3, 2025
af721d2
fix: remove checkbox component
jaaydenh Apr 3, 2025
49951a6
fix: revert create createWorkspaceForUser permissions
jaaydenh Apr 3, 2025
0b13269
fix: get org id for permission check on template layout
jaaydenh Apr 3, 2025
d1f7eb0
Revert "fix: get org id for permission check on template layout"
jaaydenh Apr 3, 2025
5f4b733
Merge branch 'main' into jaaydenh/workspace-creation-fix
jaaydenh Apr 3, 2025
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
Prev Previous commit
Next Next commit
fix: get org id for permission check on template layout
  • Loading branch information
@jaaydenh
jaaydenh committed Apr 3, 2025
commit 0b13269669355c242a2289323aef2b73b5163d19
12 changes: 8 additions & 4 deletions site/src/pages/TemplatePage/TemplateLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Loader } from "components/Loader/Loader";
import { Margins } from "components/Margins/Margins";
import { TabLink, Tabs, TabsList } from "components/Tabs/Tabs";
import { useAuthenticated } from "contexts/auth/RequireAuth";
import { useDashboard } from "modules/dashboard/useDashboard";
import { workspacePermissionChecks } from "modules/permissions/workspaces";
import {
type FC,
Expand Down Expand Up @@ -77,15 +78,18 @@ export const TemplateLayout: FC<PropsWithChildren> = ({
const { user: me } = useAuthenticated();
const { organization: organizationName = "default", template: templateName } =
useParams() as { organization?: string; template: string };
const { organizations } = useDashboard();
const organization = organizations.find((o) => o.name === organizationName);
const { data, error, isLoading } = useQuery({
queryKey: ["template", templateName],
queryFn: () => fetchTemplate(organizationName, templateName),
});
const workspacePermissionsQuery = useQuery(
checkAuthorization({
checks: workspacePermissionChecks(organizationName, me.id),
const workspacePermissionsQuery = useQuery({
...checkAuthorization({
checks: workspacePermissionChecks(organization?.id ?? "", me.id),
}),
);
enabled: organization !== undefined,
});

const location = useLocation();
const paths = location.pathname.split("/");
Expand Down
Loading