🔥

coder · aslilac · Feb 19, 2025 · Feb 5, 2025 · Feb 5, 2025 · Feb 7, 2025
commit 45b2ba62b34727f250da573d8d3aa69cfb6eb913
diff --git a/site/src/api/queries/organizations.ts b/site/src/api/queries/organizations.ts
@@ -5,15 +5,15 @@ import type {
 	RoleSyncSettings,
 	UpdateOrganizationRequest,
 } from "api/typesGenerated";
-import type { QueryClient } from "react-query";
-import { meKey } from "./users";
 import {
-	organizationPermissionChecks,
-	type OrganizationPermissions,
+	type AnyOrganizationPermissions,
 	type OrganizationPermissionName,
+	type OrganizationPermissions,
 	anyOrganizationPermissionChecks,
-	type AnyOrganizationPermissions,
+	organizationPermissionChecks,
 } from "modules/management/organizationPermissions";
+import type { QueryClient } from "react-query";
+import { meKey } from "./users";
 
 export const createOrganization = (queryClient: QueryClient) => {
 	return {

diff --git a/site/src/contexts/auth/AuthProvider.tsx b/site/src/contexts/auth/AuthProvider.tsx
@@ -101,8 +101,6 @@ export const AuthProvider: FC<PropsWithChildren> = ({ children }) => {
 		[updateProfileMutation],
 	);
 
-	console.log(permissionsQuery.data);
-
 	return (
 		<AuthContext.Provider
 			value={{

diff --git a/site/src/modules/dashboard/DashboardProvider.tsx b/site/src/modules/dashboard/DashboardProvider.tsx
@@ -14,10 +14,10 @@ import type {
 import { ErrorAlert } from "components/Alert/ErrorAlert";
 import { Loader } from "components/Loader/Loader";
 import { useEmbeddedMetadata } from "hooks/useEmbeddedMetadata";
+import { canViewAnyOrganization } from "modules/management/organizationPermissions";
 import { type FC, type PropsWithChildren, createContext } from "react";
 import { useQuery } from "react-query";
 import { selectFeatureVisibility } from "./entitlements";
-import { canViewAnyOrganization } from "modules/management/organizationPermissions";
 
 export interface DashboardValue {
 	entitlements: Entitlements;

diff --git a/site/src/modules/management/OrganizationSettingsLayout.tsx b/site/src/modules/management/OrganizationSettingsLayout.tsx
@@ -18,8 +18,8 @@ import { type FC, Suspense, createContext, useContext } from "react";
 import { useQuery } from "react-query";
 import { Outlet, useParams } from "react-router-dom";
 import {
-	canViewOrganization,
 	type OrganizationPermissions,
+	canViewOrganization,
 } from "./organizationPermissions";
 
 export const OrganizationSettingsContext = createContext<
@@ -83,8 +83,6 @@ const OrganizationSettingsLayout: FC = () => {
 		return <NotFoundPage />;
 	}
 
-	console.log(orgPermissionsQuery.data);
-
 	return (
 		<RequirePermission isFeatureVisible={canViewOrganizationSettings}>
 			<OrganizationSettingsContext.Provider

diff --git a/site/src/modules/management/OrganizationSidebar.tsx b/site/src/modules/management/OrganizationSidebar.tsx
@@ -1,8 +1,8 @@
+import { Sidebar as BaseSidebar } from "components/Sidebar/Sidebar";
 import { useAuthenticated } from "contexts/auth/RequireAuth";
 import { useOrganizationSettings } from "modules/management/OrganizationSettingsLayout";
 import type { FC } from "react";
 import { OrganizationSidebarView } from "./OrganizationSidebarView";
-import { Sidebar as BaseSidebar } from "components/Sidebar/Sidebar";
 
 /**
  * Sidebar for the OrganizationSettingsLayout

diff --git a/site/src/pages/GroupsPage/GroupsPage.tsx b/site/src/pages/GroupsPage/GroupsPage.tsx
@@ -2,6 +2,7 @@ import GroupAdd from "@mui/icons-material/GroupAddOutlined";
 import { getErrorMessage } from "api/errors";
 import { groupsByOrganization } from "api/queries/groups";
 import { organizationsPermissions } from "api/queries/organizations";
+import { ErrorAlert } from "components/Alert/ErrorAlert";
 import { Button } from "components/Button/Button";
 import { EmptyState } from "components/EmptyState/EmptyState";
 import { displayError } from "components/GlobalSnackbar/utils";
@@ -16,7 +17,6 @@ import { Link as RouterLink } from "react-router-dom";
 import { pageTitle } from "utils/page";
 import { useGroupsSettings } from "./GroupsPageProvider";
 import GroupsPageView from "./GroupsPageView";
-import { ErrorAlert } from "components/Alert/ErrorAlert";
 
 export const GroupsPage: FC = () => {
 	const { template_rbac: groupsEnabled } = useFeatureVisibility();

diff --git a/site/src/pages/OrganizationSettingsPage/DefaultOrganizationRedirect.tsx b/site/src/pages/OrganizationSettingsPage/DefaultOrganizationRedirect.tsx
@@ -1,8 +1,8 @@
-import type { FC } from "react";
 import { EmptyState } from "components/EmptyState/EmptyState";
 import { useOrganizationSettings } from "modules/management/OrganizationSettingsLayout";
-import { Navigate } from "react-router-dom";
 import { canEditOrganization } from "modules/management/organizationPermissions";
+import type { FC } from "react";
+import { Navigate } from "react-router-dom";
 
 const DefaultOrganizationRedirect: FC = () => {
 	const {

diff --git a/site/src/pages/OrganizationSettingsPage/OrganizationMembersPage.tsx b/site/src/pages/OrganizationSettingsPage/OrganizationMembersPage.tsx
@@ -18,9 +18,9 @@ import { useOrganizationSettings } from "modules/management/OrganizationSettings
 import { type FC, useState } from "react";
 import { Helmet } from "react-helmet-async";
 import { useMutation, useQuery, useQueryClient } from "react-query";
+import { useParams } from "react-router-dom";
 import { pageTitle } from "utils/page";
 import { OrganizationMembersPageView } from "./OrganizationMembersPageView";
-import { useParams } from "react-router-dom";
 
 const OrganizationMembersPage: FC = () => {
 	const queryClient = useQueryClient();

diff --git a/site/src/pages/OrganizationSettingsPage/OrganizationSettingsPage.tsx b/site/src/pages/OrganizationSettingsPage/OrganizationSettingsPage.tsx
@@ -3,6 +3,7 @@ import {
 	organizationsPermissions,
 	updateOrganization,
 } from "api/queries/organizations";
+import type { AuthorizationResponse } from "api/typesGenerated";
 import { ErrorAlert } from "components/Alert/ErrorAlert";
 import { EmptyState } from "components/EmptyState/EmptyState";
 import { displaySuccess } from "components/GlobalSnackbar/utils";
@@ -12,7 +13,6 @@ import type { FC } from "react";
 import { useMutation, useQuery, useQueryClient } from "react-query";
 import { Navigate, useNavigate, useParams } from "react-router-dom";
 import { OrganizationSettingsPageView } from "./OrganizationSettingsPageView";
-import type { AuthorizationResponse } from "api/typesGenerated";
 
 const OrganizationSettingsPage: FC = () => {
 	const { organization: organizationName } = useParams() as {