8000 fix: fix loading states and permissions checks in organization settings by aslilac · Pull Request #16465 · coder/coder · GitHub
[go: up one dir, main page]

Skip to content

fix: fix loading states and permissions checks in organization settings #16465

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.

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 25 commits into from
Feb 19, 2025
Merged
Changes from 1 commit
Commits
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
ok lets do this separately
  • Loading branch information
aslilac committed Feb 18, 2025
commit 71b317074004155ce4238c7b6a926e2fb9bca144
12 changes: 1 addition & 11 deletions site/src/modules/management/OrganizationSettingsLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@ import {
BreadcrumbSeparator,
} from "components/Breadcrumb/Breadcrumb";
import { Loader } from "components/Loader/Loader";
import { Paywall } from "components/Paywall/Paywall";
import { useDashboard } from "modules/dashboard/useDashboard";
import NotFoundPage from "pages/404Page/404Page";
import { type FC, Suspense, createContext, useContext } from "react";
import { useQuery } from "react-query";
import { Outlet, useParams } from "react-router-dom";
import { docs } from "utils/docs";
import {
type OrganizationPermissions,
canViewOrganization,
Expand Down Expand Up @@ -125,15 +123,7 @@ const OrganizationSettingsLayout: FC = () => {
<hr className="h-px border-none bg-border" />
<div className="px-10 max-w-screen-2xl">
<Suspense fallback={<Loader />}>
{showOrganizations ? (
<Outlet />
) : (
<Paywall
message="Organizations"
description="Organizations can be used to segment and isolate resources inside a Coder deployment. You need a Premium license to use this feature."
documentationLink={docs("/admin/users/organizations")}
/>
)}
<Outlet />
</Suspense>
</div>
</div>
Expand Down
Loading
0