Skip to content

Commit a5a1ba7

Browse files
authored
Hide role from access management page and invite user modal in cloud (#12993)
1 parent fce4dca commit a5a1ba7

File tree

2 files changed

+50
-42
lines changed

2 files changed

+50
-42
lines changed

airbyte-webapp/src/packages/cloud/views/users/InviteUsersModal/InviteUsersModal.tsx

+37-29
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,23 @@ const FormRow = styled(Row)`
4242
margin-bottom: 8px;
4343
`;
4444

45+
const ROLE_OPTIONS = [
46+
{
47+
value: "admin",
48+
label: "admin",
49+
},
50+
];
51+
4552
export const InviteUsersModal: React.FC<{
4653
onClose: () => void;
4754
}> = (props) => {
4855
const formatMessage = useIntl().formatMessage;
4956
const { workspaceId } = useCurrentWorkspace();
5057
const { inviteUserLogic } = useUserHook();
5158
const { mutateAsync: invite } = inviteUserLogic;
52-
const roleOptions = [
53-
{
54-
value: "admin",
55-
label: "admin",
56-
},
57-
];
59+
60+
const isRoleVisible = false; // Temporarily hiding roles because there's only 'Admin' in cloud.
61+
5862
return (
5963
<Modal title={<FormattedMessage id="modals.addUser.title" />} onClose={props.onClose}>
6064
<Formik
@@ -65,7 +69,7 @@ export const InviteUsersModal: React.FC<{
6569
users: [
6670
{
6771
email: "",
68-
role: roleOptions[0].value,
72+
role: ROLE_OPTIONS[0].value,
6973
},
7074
],
7175
}}
@@ -88,11 +92,13 @@ export const InviteUsersModal: React.FC<{
8892
<FormattedMessage id="modals.addUser.email.label" />
8993
</H5>
9094
</Cell>
91-
<Cell>
92-
<H5>
93-
<FormattedMessage id="modals.addUser.role.label" />
94-
</H5>
95-
</Cell>
95+
{isRoleVisible && (
96+
<Cell>
97+
<H5>
98+
<FormattedMessage id="modals.addUser.role.label" />
99+
</H5>
100+
</Cell>
101+
)}
96102
</FormHeader>
97103
<FieldArray
98104
name="users"
@@ -105,22 +111,24 @@ export const InviteUsersModal: React.FC<{
105111
{({ field }: FieldProps<string>) => <Input {...field} placeholder="[email protected]" />}
106112
</Field>
107113
</Cell>
108-
<Cell>
109-
<Field name={`users[${index}].role`}>
110-
{({ field }: FieldProps) => {
111-
return (
112-
<DropDown
113-
isDisabled
114-
value={field.value}
115-
placeholder={formatMessage({
116-
id: "modals.addUser.role.placeholder",
117-
})}
118-
options={roleOptions}
119-
/>
120-
);
121-
}}
122-
</Field>
123-
</Cell>
114+
{isRoleVisible && (
115+
<Cell>
116+
<Field name={`users[${index}].role`}>
117+
{({ field }: FieldProps) => {
118+
return (
119+
<DropDown
120+
isDisabled
121+
value={field.value}
122+
placeholder={formatMessage({
123+
id: "modals.addUser.role.placeholder",
124+
})}
125+
options={ROLE_OPTIONS}
126+
/>
127+
);
128+
}}
129+
</Field>
130+
</Cell>
131+
)}
124132
</FormRow>
125133
))}
126134
<Button
@@ -129,7 +137,7 @@ export const InviteUsersModal: React.FC<{
129137
onClick={() =>
130138
arrayHelpers.push({
131139
email: "",
132-
role: roleOptions[0].value,
140+
role: ROLE_OPTIONS[0].value,
133141
})
134142
}
135143
secondary

airbyte-webapp/src/packages/cloud/views/users/UsersSettingsView/UsersSettingsView.tsx

+13-13
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import { useAuthService } from "packages/cloud/services/auth/AuthService";
1313
import { useListUsers, useUserHook } from "packages/cloud/services/users/UseUserHook";
1414
import { InviteUsersModal } from "packages/cloud/views/users/InviteUsersModal";
1515

16-
import RoleToolTip from "./components/RoleToolTip";
17-
1816
const Header = styled.div`
1917
display: flex;
2018
justify-content: space-between;
@@ -54,17 +52,19 @@ export const UsersSettingsView: React.FC = () => {
5452
accessor: "email",
5553
Cell: ({ cell }: CellProps<User>) => cell.value,
5654
},
57-
{
58-
Header: (
59-
<>
60-
<FormattedMessage id="userSettings.table.column.role" />
61-
<RoleToolTip />
62-
</>
63-
),
64-
headerHighlighted: true,
65-
accessor: "userId",
66-
Cell: (_: CellProps<User>) => "admin",
67-
},
55+
// TEMP: Currently all cloud users are admins.
56+
// Remove when there is more than role
57+
// {
58+
// Header: (
59+
// <>
60+
// <FormattedMessage id="userSettings.table.column.role" />
61+
// <RoleToolTip />
62+
// </>
63+
// ),
64+
// headerHighlighted: true,
65+
// accessor: "userId",
66+
// Cell: (_: CellProps<User>) => "Admin",
67+
// },
6868
{
6969
Header: <FormattedMessage id="userSettings.table.column.action" />,
7070
headerHighlighted: true,

0 commit comments

Comments
 (0)