Skip to content

Commit

Permalink
Merge branch 'main' into B-22106-AddIntegrationTesting
Browse files Browse the repository at this point in the history
  • Loading branch information
josiahzimmerman-caci authored Jan 2, 2025
2 parents 88108b0 + 25c09a8 commit 738a21e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/pages/Office/MoveQueue/MoveQueue.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ export const columns = (moveLockFlag, isQueueManagementEnabled, showBranchFilter
{row.assignedTo ? `${row.assignedTo?.lastName}, ${row.assignedTo?.firstName}` : ''}
</div>
) : (
<div data-label="assignedSelect" data-testid="assigned-col" className={styles.assignedToCol}>
<div data-label="assignedSelect" data-testid="assigned-col" className={styles.assignedToCol} key={row.id}>
<Dropdown
defaultValue={row.assignedTo?.officeUserId}
onChange={(e) => handleQueueAssignment(row.id, e.target.value, roleTypes.TOO)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export const columns = (moveLockFlag, isQueueManagementEnabled, showBranchFilter
{row.assignedTo ? `${row.assignedTo?.lastName}, ${row.assignedTo?.firstName}` : ''}
</div>
) : (
<div data-label="assignedSelect" data-testid="assigned-col" className={styles.assignedToCol}>
<div data-label="assignedSelect" data-testid="assigned-col" className={styles.assignedToCol} key={row.id}>
<Dropdown
defaultValue={row.assignedTo?.officeUserId}
onChange={(e) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ export const counselingColumns = (moveLockFlag, originLocationList, supervisor,
return !row?.assignable ? (
<div>{row.assignedTo ? `${row.assignedTo?.lastName}, ${row.assignedTo?.firstName}` : ''}</div>
) : (
<div data-label="assignedSelect" className={styles.assignedToCol}>
<div data-label="assignedSelect" className={styles.assignedToCol} key={row.id}>
<Dropdown
defaultValue={row.assignedTo?.officeUserId}
onChange={(e) => handleQueueAssignment(row.id, e.target.value, roleTypes.SERVICES_COUNSELOR)}
Expand Down Expand Up @@ -396,7 +396,7 @@ export const closeoutColumns = (
return !row?.assignable ? (
<div>{row.assignedTo ? `${row.assignedTo?.lastName}, ${row.assignedTo?.firstName}` : ''}</div>
) : (
<div data-label="assignedSelect" className={styles.assignedToCol}>
<div data-label="assignedSelect" className={styles.assignedToCol} key={row.id}>
<Dropdown
defaultValue={row.assignedTo?.officeUserId}
onChange={(e) => handleQueueAssignment(row.id, e.target.value, roleTypes.SERVICES_COUNSELOR)}
Expand Down

0 comments on commit 738a21e

Please sign in to comment.