Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a70c82e
Update new gx logo
DucNgoQuang Oct 13, 2025
523bd88
Fix visibility for invite token related function
DucNgoQuang Oct 21, 2025
af82381
Merge branch 'datahub-project:master' into fix/invite-token-visibility
DucNgoQuang Oct 21, 2025
938b232
Merge branch 'master' into fix/invite-token-visibility
DucNgoQuang Oct 23, 2025
7ff97a9
Merge branch 'master' into fix/invite-token-visibility
DucNgoQuang Oct 27, 2025
d387b99
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Oct 28, 2025
ba14e5d
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Oct 28, 2025
a516c7d
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Oct 28, 2025
0f21225
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Oct 29, 2025
8579b4c
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Oct 29, 2025
cb2e04f
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Oct 30, 2025
e19a1e3
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Oct 31, 2025
ccf0546
Merge branch 'master' into fix/invite-token-visibility
DucNgoQuang Nov 1, 2025
3d8284e
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Nov 3, 2025
0f73ed1
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Nov 4, 2025
9f82c91
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Nov 5, 2025
f020b8a
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Nov 5, 2025
2ef11e3
Merge branch 'master' into fix/invite-token-visibility
DucNgoQuang Nov 6, 2025
d362678
Merge branch 'master' into fix/invite-token-visibility
deepgarg760 Nov 7, 2025
012b424
reduce mem
chakru-r Nov 7, 2025
743bcc7
test workflow
chakru-r Nov 8, 2025
c4fa6ec
add label trigger
chakru-r Nov 8, 2025
147c0ab
skip depot docker builder
chakru-r Nov 8, 2025
667dd00
Merge branch 'master' into cr-oss-fork-test
deepgarg760 Nov 10, 2025
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
10 changes: 5 additions & 5 deletions datahub-web-react/src/app/identity/user/UserList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const UserList = () => {
const [isViewingInviteToken, setIsViewingInviteToken] = useState(false);

const authenticatedUser = useUserContext();
const canManagePolicies = authenticatedUser?.platformPrivileges?.managePolicies || false;
const canManageUserCredentials = authenticatedUser?.platformPrivileges?.manageUserCredentials || false;

const pageSize = DEFAULT_USER_LIST_PAGE_SIZE;
const start = (page - 1) * pageSize;
Expand Down Expand Up @@ -115,7 +115,7 @@ export const UserList = () => {
const error = usersError || rolesError;
const selectRoleOptions = rolesData?.listRoles?.roles?.map((role) => role as DataHubRole) || [];

useToggleEducationStepIdsAllowList(canManagePolicies, USERS_INVITE_LINK_ID);
useToggleEducationStepIdsAllowList(canManageUserCredentials, USERS_INVITE_LINK_ID);

return (
<>
Expand All @@ -127,7 +127,7 @@ export const UserList = () => {
<div>
<Button
id={USERS_INVITE_LINK_ID}
disabled={!canManagePolicies}
disabled={!canManageUserCredentials}
type="text"
onClick={() => setIsViewingInviteToken(true)}
>
Expand Down Expand Up @@ -166,7 +166,7 @@ export const UserList = () => {
<UserListItem
onDelete={() => handleDelete(item.urn as string)}
user={item as CorpUser}
canManageUserCredentials={canManagePolicies}
canManageUserCredentials={canManageUserCredentials}
selectRoleOptions={selectRoleOptions}
refetch={usersRefetch}
/>
Expand All @@ -183,7 +183,7 @@ export const UserList = () => {
showSizeChanger={false}
/>
</UserPaginationContainer>
{canManagePolicies && (
{canManageUserCredentials && (
<ViewInviteTokenModal open={isViewingInviteToken} onClose={() => setIsViewingInviteToken(false)} />
)}
</UserContainer>
Expand Down
4 changes: 2 additions & 2 deletions smoke-test/tests/cypress/integration_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ def test_run_cypress(auth_session):
test_spec_arg = f" --spec '{specs_str}' "

print("Running Cypress tests with command")
node_options = "--max-old-space-size=6000"
command = f'NO_COLOR=1 NODE_OPTIONS="{node_options}" npx cypress run {record_arg} {test_spec_arg} {tag_arg} --config numTestsKeptInMemory=2'
node_options = "--max-old-space-size=5000"
command = f'NO_COLOR=1 NODE_OPTIONS="{node_options}" npx cypress run {record_arg} {test_spec_arg} {tag_arg} --config numTestsKeptInMemory=0'
print(command)
# Add --headed --spec '**/mutations/mutations.js' (change spec name)
# in case you want to see the browser for debugging
Expand Down
Loading