Skip to content

feat: manage groups from deployment settings for single-org deployments #14016

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 8 commits into from
Jul 26, 2024
Merged

feat: manage groups from deployment settings for single-org deployments #14016

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4c840c7
feat: manage non-multi-org groups from deployment settings
aslilac Jul 25, 2024
5346d8e
🧹
aslilac Jul 25, 2024
29dffc5
of course
aslilac Jul 25, 2024
7999b92
require license, add key func
aslilac Jul 26, 2024
01371ec
add redirects and such
aslilac Jul 26, 2024
f29bae0
🧹
aslilac Jul 26, 2024
21ce367
:)
aslilac Jul 26, 2024
9ed77d4
ah, yes
aslilac Jul 26, 2024
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
ah, yes
  • Loading branch information
@aslilac
aslilac committed Jul 26, 2024
commit 9ed77d4cb3d684d8062903c7633169db4d20e33b
7 changes: 1 addition & 6 deletions site/src/pages/UsersPage/UsersPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import { isNonInitialPage } from "components/PaginationWidget/utils";
import { useAuthenticated } from "contexts/auth/RequireAuth";
import { usePaginatedQuery } from "hooks/usePaginatedQuery";
import { useDashboard } from "modules/dashboard/useDashboard";
import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
import { pageTitle } from "utils/page";
import { generateRandomString } from "utils/random";
import { ResetPasswordDialog } from "./ResetPasswordDialog";
Expand All @@ -43,10 +42,7 @@ const UsersPage: FC = () => {
const searchParamsResult = useSearchParams();
const { entitlements, experiments, organizationId } = useDashboard();
const [searchParams] = searchParamsResult;
const { multiple_organizations: organizationsEnabled } =
useFeatureVisibility();
const isMultiOrg =
organizationsEnabled && experiments.includes("multi-organization");
const isMultiOrg = experiments.includes("multi-organization");

const groupsByUserIdQuery = useQuery(groupsByUserId(organizationId));
const authMethodsQuery = useQuery(authMethods());
Expand Down Expand Up @@ -108,7 +104,6 @@ const UsersPage: FC = () => {
groupsByUserIdQuery.isLoading;

if (
organizationsEnabled &&
experiments.includes("multi-organization") &&
location.pathname !== "/deployment/users"
) {
Expand Down
Loading