Skip to content

Commit 3824ae2

Browse files
committed
chore: clean up some permission logic (#13849)
1 parent 5849764 commit 3824ae2

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

airbyte-webapp/src/pages/SettingsPage/SettingsPage.tsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export const SettingsPage: React.FC = () => {
1919
const { countNewSourceVersion, countNewDestinationVersion } = useGetConnectorsOutOfDate();
2020
const multiWorkspaceUI = useFeature(FeatureItem.MultiWorkspaceUI);
2121
const apiTokenManagement = useFeature(FeatureItem.APITokenManagement);
22-
const isAccessManagementEnabled = useFeature(FeatureItem.RBAC);
2322
const displayOrganizationUsers = useFeature(FeatureItem.DisplayOrganizationUsers);
2423
const canViewWorkspaceSettings = useIntent("ViewWorkspaceSettings", { workspaceId });
2524
const canViewOrganizationSettings = useIntent("ViewOrganizationSettings", { organizationId });
@@ -86,14 +85,14 @@ export const SettingsPage: React.FC = () => {
8685
)}
8786
{multiWorkspaceUI && (canViewOrganizationSettings || canViewWorkspaceSettings) && (
8887
<SettingsNavigationBlock title={formatMessage({ id: "settings.organizationSettings" })}>
89-
{multiWorkspaceUI && canViewOrganizationSettings && (
88+
{canViewOrganizationSettings && (
9089
<>
9190
<SettingsLink
9291
iconType="gear"
9392
name={formatMessage({ id: "settings.general" })}
9493
to={SettingsRoutePaths.Organization}
9594
/>
96-
{isAccessManagementEnabled && displayOrganizationUsers && (
95+
{displayOrganizationUsers && (
9796
<SettingsLink
9897
iconType="community"
9998
name={formatMessage({ id: "settings.members" })}
@@ -102,7 +101,7 @@ export const SettingsPage: React.FC = () => {
102101
)}
103102
</>
104103
)}
105-
{multiWorkspaceUI && canViewWorkspaceSettings && (
104+
{canViewWorkspaceSettings && (
106105
<>
107106
<SettingsLink
108107
iconType="source"

0 commit comments

Comments
 (0)