Revert "🪟 🎉 (flagged) Restrict Permission Update UI to users with ade…

…quate permissions" (#8676)
duffelhq · Sep 2, 2023 · 62ea099 · 62ea099
1 parent 87d62eb
commit 62ea099
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/airbyte-webapp/src/core/utils/rbac/intent.ts b/airbyte-webapp/src/core/utils/rbac/intent.ts
@@ -6,18 +6,14 @@ export enum Intent {
 
   // organization
   "ListOrganizationMembers" = "ListOrganizationMembers",
-  "UpdateOrganizationPermissions" = "UpdateOrganizationPermissions",
 
   // workspace
   "ListWorkspaceMembers" = "ListWorkspaceMembers",
-  "UpdateWorkspacePermissions" = "UpdateWorkspacePermissions",
 }
 
 const intentToRbacQuery = {
   [Intent.ListOrganizationMembers]: { resourceType: "ORGANIZATION", role: "READER" },
-  [Intent.UpdateOrganizationPermissions]: { resourceType: "ORGANIZATION", role: "ADMIN" },
 
-  [Intent.UpdateWorkspacePermissions]: { resourceType: "WORKSPACE", role: "ADMIN" },
   [Intent.ListWorkspaceMembers]: { resourceType: "WORKSPACE", role: "READER" },
 } as const;
 

diff --git a/airbyte-webapp/src/pages/SettingsPage/SettingsPage.tsx b/airbyte-webapp/src/pages/SettingsPage/SettingsPage.tsx
@@ -11,7 +11,6 @@ import { PageHeader } from "components/ui/PageHeader";
 import { SideMenu, CategoryItem, SideMenuItem } from "components/ui/SideMenu";
 
 import { useCurrentWorkspace } from "core/api";
-import { Intent, useIntent } from "core/utils/rbac/intent";
 import { useExperiment } from "hooks/services/Experiment";
 import { useGetConnectorsOutOfDate } from "hooks/services/useConnector";
 
@@ -53,8 +52,6 @@ const SettingsPage: React.FC<SettingsPageProps> = ({ pageConfig }) => {
   const { countNewSourceVersion, countNewDestinationVersion } = useGetConnectorsOutOfDate();
   const newWorkspacesUI = useExperiment("workspaces.newWorkspacesUI", false);
   const isAccessManagementEnabled = useExperiment("settings.accessManagement", false);
-  const canListWorkspaceUsers = useIntent(Intent.ListWorkspaceMembers);
-  const canListOrganizationUsers = useIntent(Intent.ListOrganizationMembers);
 
   const menuItems: CategoryItem[] = pageConfig?.menuConfig || [
     {
@@ -106,7 +103,7 @@ const SettingsPage: React.FC<SettingsPageProps> = ({ pageConfig }) => {
           name: <FormattedMessage id="settings.metrics" />,
           component: MetricsPage,
         },
-        ...(isAccessManagementEnabled && !pageConfig && canListWorkspaceUsers
+        ...(isAccessManagementEnabled && !pageConfig
           ? [
               {
                 path: `${SettingsRoute.Workspace}/${SettingsRoute.AccessManagement}`,
@@ -127,7 +124,7 @@ const SettingsPage: React.FC<SettingsPageProps> = ({ pageConfig }) => {
                 name: <FormattedMessage id="settings.generalSettings" />,
                 component: GeneralOrganizationSettingsPage,
               },
-              ...(isAccessManagementEnabled && !pageConfig && canListOrganizationUsers
+              ...(isAccessManagementEnabled && !pageConfig
                 ? [
                     {
                       path: `${SettingsRoute.Organization}/${SettingsRoute.AccessManagement}`,

diff --git a/...pp/src/pages/SettingsPage/pages/AccessManagementPage/components/RoleManagementControl.tsx b/...pp/src/pages/SettingsPage/pages/AccessManagementPage/components/RoleManagementControl.tsx
@@ -10,7 +10,6 @@ import { Text } from "components/ui/Text";
 
 import { useDeletePermissions, useUpdatePermissions } from "core/api";
 import { PermissionType, PermissionUpdate } from "core/request/AirbyteClient";
-import { Intent, useIntent } from "core/utils/rbac/intent";
 import { useConfirmationModalService } from "hooks/services/ConfirmationModal";
 
 import styles from "./RoleManagementControl.module.scss";
@@ -52,16 +51,11 @@ export const RoleManagementControl: React.FC<RoleManagementControlProps> = ({
   const { formatMessage } = useIntl();
   const isEditMode = activeEditRow === permissionId;
 
-  const intentKey =
-    pageResourceType === "organization" ? Intent.UpdateOrganizationPermissions : Intent.UpdateWorkspacePermissions;
-
-  const canUpdateUserPermissions = useIntent(intentKey);
-
   if (!permissionType) {
     return null;
   }
 
-  if (pageResourceType !== tableResourceType || !canUpdateUserPermissions) {
+  if (pageResourceType !== tableResourceType) {
     return (
       <Box py="sm">
         <FormattedMessage id={`${permissionStringDictionary[permissionType]}`} />