Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6f70bb1

Browse files
committed
fix: only check flag for organization settings
I added checks against the license but actually what we want is forthese views to become the default even when not licensed (once theexperimental flag is removed).
1 parent9a47ea1 commit6f70bb1

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

‎site/src/modules/dashboard/Navbar/Navbar.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ export const Navbar: FC = () => {
2020
constcanViewDeployment=Boolean(permissions.viewDeploymentValues);
2121
constcanViewOrganizations=
2222
Boolean(permissions.editAnyOrganization)&&
23-
featureVisibility.multiple_organizations&&
2423
experiments.includes("multi-organization");
2524
constcanViewAllUsers=Boolean(permissions.viewAllUsers);
2625
constproxyContextValue=useProxy();

‎site/src/pages/DeploySettingsPage/DeploySettingsLayout.tsx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { Stack } from "components/Stack/Stack";
99
import{useAuthenticated}from"contexts/auth/RequireAuth";
1010
import{RequirePermission}from"contexts/auth/RequirePermission";
1111
import{useDashboard}from"modules/dashboard/useDashboard";
12-
import{useFeatureVisibility}from"modules/dashboard/useFeatureVisibility";
1312
import{ManagementSettingsLayout}from"pages/ManagementSettingsPage/ManagementSettingsLayout";
1413
import{Sidebar}from"./Sidebar";
1514

@@ -34,9 +33,7 @@ export const useDeploySettings = (): DeploySettingsContextValue => {
3433
exportconstDeploySettingsLayout:FC=()=>{
3534
const{ experiments}=useDashboard();
3635

37-
constfeats=useFeatureVisibility();
38-
constcanViewOrganizations=
39-
feats.multiple_organizations&&experiments.includes("multi-organization");
36+
constcanViewOrganizations=experiments.includes("multi-organization");
4037

4138
returncanViewOrganizations ?(
4239
<ManagementSettingsLayout/>

‎site/src/pages/UsersPage/UsersLayout.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ export const UsersLayout: FC = () => {
2525
constlocation=useLocation();
2626
constactiveTab=location.pathname.endsWith("groups") ?"groups" :"users";
2727

28-
constcanViewOrganizations=
29-
feats.multiple_organizations&&experiments.includes("multi-organization");
28+
constcanViewOrganizations=experiments.includes("multi-organization");
3029

3130
return(
3231
<>

‎site/src/pages/UsersPage/UsersPage.tsx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import { isNonInitialPage } from "components/PaginationWidget/utils";
2929
import{useAuthenticated}from"contexts/auth/RequireAuth";
3030
import{usePaginatedQuery}from"hooks/usePaginatedQuery";
3131
import{useDashboard}from"modules/dashboard/useDashboard";
32-
import{useFeatureVisibility}from"modules/dashboard/useFeatureVisibility";
3332
import{pageTitle}from"utils/page";
3433
import{generateRandomString}from"utils/random";
3534
import{ResetPasswordDialog}from"./ResetPasswordDialog";
@@ -43,7 +42,6 @@ const UsersPage: FC = () => {
4342
constsearchParamsResult=useSearchParams();
4443
const{ entitlements, experiments}=useDashboard();
4544
const[searchParams]=searchParamsResult;
46-
constfeats=useFeatureVisibility();
4745

4846
constgroupsByUserIdQuery=useQuery(groupsByUserId("default"));
4947
constauthMethodsQuery=useQuery(authMethods());
@@ -104,8 +102,7 @@ const UsersPage: FC = () => {
104102
authMethodsQuery.isLoading||
105103
groupsByUserIdQuery.isLoading;
106104

107-
constcanViewOrganizations=
108-
feats.multiple_organizations&&experiments.includes("multi-organization");
105+
constcanViewOrganizations=experiments.includes("multi-organization");
109106
if(canViewOrganizations&&location.pathname!=="/deployment/users"){
110107
return<Navigateto={`/deployment/users${location.search}`}replace/>;
111108
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp