Skip to content

ORV2-2293 - Hide 'Remove User' button for credit account users in UserTable #1487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 44 commits into from
Jul 16, 2024
Merged

ORV2-2293 - Hide 'Remove User' button for credit account users in UserTable #1487

Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
9ae9390
add credit account select menu
glen-aot May 16, 2024
7ef08c7
created mock create credit account handler
glen-aot May 16, 2024
ea30e25
add credit account user and credit account details
glen-aot May 22, 2024
4ca129f
credit account users table
glen-aot May 28, 2024
515f57d
update snackbar styling
glen-aot May 30, 2024
f7407f2
add credit account editing permissions
glen-aot May 31, 2024
620073f
update response object in credit account
glen-aot Jun 17, 2024
874f304
merged backend branch
glen-aot Jun 17, 2024
6c128e3
updated .env with ORBC vars
glen-aot Jun 17, 2024
9a0e479
removed backend merge
glen-aot Jun 19, 2024
eae17d8
merge backend for credit accounts
glen-aot Jun 19, 2024
9ec11c0
create credit account connected to backend
glen-aot Jun 24, 2024
ef71e0c
Merge remote-tracking branch 'origin/main' into ORV2-2293
praju-aot Jun 25, 2024
e64144e
Merge remote-tracking branch 'origin/main' into ORV2-2293
glen-aot Jun 26, 2024
87d0044
added existing credit account user handling to addUserModal
glen-aot Jun 26, 2024
392f227
Merge remote-tracking branch 'origin/main' into ORV2-2293
glen-aot Jun 26, 2024
8a72183
create prepaid credit account
glen-aot Jun 27, 2024
4bdc158
initial credit account permissions
glen-aot Jun 28, 2024
c3fe57c
Merge branch 'main' into ORV2-2293
praju-aot Jun 28, 2024
dc8b0f0
optimistic update for addCreditAccountUser
glen-aot Jul 2, 2024
824873a
update credit account status
glen-aot Jul 3, 2024
4a1dd1b
credit account activity history
glen-aot Jul 4, 2024
ca8e694
Merge remote-tracking branch 'origin/main' into ORV2-2293
glen-aot Jul 4, 2024
bccd735
Merge remote-tracking branch 'origin/main' into ORV2-2293
glen-aot Jul 5, 2024
fee83ae
get associated credit account when adding new user
glen-aot Jul 5, 2024
5f42c9f
credit account optimisations
glen-aot Jul 11, 2024
aba686e
hide credit accounts tab based on feature flags and get account holde…
glen-aot Jul 11, 2024
d390c06
Merge remote-tracking branch 'origin/main' into ORV2-2293
glen-aot Jul 11, 2024
cfcd5de
remove optimistic update from removeCreditAccountUsersMutation hook
glen-aot Jul 11, 2024
4f10c81
Merge remote-tracking branch 'origin/main' into ORV2-2293
glen-aot Jul 11, 2024
bd08003
hide activityTable from account users and update table styling
glen-aot Jul 12, 2024
e7aa25a
styling changes to modals
glen-aot Jul 12, 2024
d0bd13a
Merge remote-tracking branch 'origin/main' into ORV2-2293
glen-aot Jul 12, 2024
4108acc
set isRemoveModalOpen to false
glen-aot Jul 12, 2024
2485792
PR review changes, primarily remove usage of getCompanyIdFromSession(…
glen-aot Jul 15, 2024
7f8a3a3
organize types/creditAccount.ts file
glen-aot Jul 15, 2024
da3d1f9
create abstraction for onSuccess logic for useUpdateCreditAccountStat…
glen-aot Jul 15, 2024
e20f9d9
miscellaneous review fixes including implementing checks against enum…
glen-aot Jul 15, 2024
63ce09d
Merge remote-tracking branch 'origin/main' into ORV2-2293
glen-aot Jul 15, 2024
281e652
reuse companyId variable in ManageProfilesDashboard, add error loggin…
glen-aot Jul 15, 2024
444a53a
add error messages to mutation hook calls
glen-aot Jul 15, 2024
782fe84
add error message to AccountDetails.tsx
glen-aot Jul 15, 2024
e0791b4
Merge remote-tracking branch 'origin/main' into ORV2-2293
glen-aot Jul 16, 2024
7c58863
Hide remove user button for account users in UserTable.tsx
glen-aot Jul 16, 2024
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
3 changes: 2 additions & 1 deletion frontend/src/features/settings/components/creditAccount/UserTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ export const UserTable = () => {
const isAccountHolder = companyId === accountHolder?.companyId;

const showCheckboxes = canUpdateCreditAccount(userRoles) && isAccountHolder;
const showRemoveUserButton = canUpdateCreditAccount(userRoles);
const showRemoveUserButton =
canUpdateCreditAccount(userRoles) && isAccountHolder;

const [isRemoveModalOpen, setIsRemoveModalOpen] = useState(false);
const [userIds, setUserIds] = useState<number[]>([]);
Expand Down