feat(ratecard-assignee-selector): add assignedMembers prop to handle member assignment across job titles

This commit is contained in:
shancds
2025-05-28 12:38:19 +05:30
parent 5cb6548889
commit cae5524168
2 changed files with 40 additions and 28 deletions

View File

@@ -23,7 +23,8 @@ const RateCardAssigneeSelector = ({
onChange,
selectedMemberIds = [],
memberlist = [],
}: RateCardAssigneeSelectorProps) => {
assignedMembers = [], // New prop: List of all assigned member IDs across all job titles
}: RateCardAssigneeSelectorProps & { assignedMembers: string[] }) => {
const membersInputRef = useRef<InputRef>(null);
const [searchQuery, setSearchQuery] = useState('');
const [members, setMembers] = useState<IProjectMemberViewModel[]>(memberlist);
@@ -46,7 +47,12 @@ const RateCardAssigneeSelector = ({
/>
<List style={{ padding: 0, maxHeight: 200, overflow: 'auto' }}>
{filteredMembers.length ? (
filteredMembers.map((member) => (
filteredMembers.map((member) => {
const isAssignedToAnotherJobTitle =
assignedMembers.includes(member.id || '') &&
!selectedMemberIds.includes(member.id || ''); // Check if the member is assigned elsewhere
return (
<List.Item
key={member.id}
style={{
@@ -55,14 +61,14 @@ const RateCardAssigneeSelector = ({
alignItems: 'center',
padding: '4px 8px',
border: 'none',
opacity: member.pending_invitation ? 0.5 : 1,
opacity: member.pending_invitation || isAssignedToAnotherJobTitle ? 0.5 : 1,
justifyContent: 'flex-start',
textAlign: 'left',
}}
>
<Checkbox
checked={selectedMemberIds.includes(member.id || '')}
disabled={member.pending_invitation}
disabled={member.pending_invitation || isAssignedToAnotherJobTitle}
onChange={() => onChange?.(member.id || '')}
/>
<SingleAvatar
@@ -72,7 +78,8 @@ const RateCardAssigneeSelector = ({
/>
<span>{member.name}</span>
</List.Item>
))
);
})
) : (
<Empty description="No members found" />
)}

View File

@@ -191,6 +191,10 @@ const RatecardTable: React.FC = () => {
}
};
const assignedMembers = roles
.flatMap((role) => role.members || [])
.filter((memberId, index, self) => self.indexOf(memberId) === index);
// Columns
const columns: TableProps<JobRoleType>['columns'] = [
{
@@ -267,6 +271,7 @@ const RatecardTable: React.FC = () => {
selectedMemberIds={memberscol || []}
onChange={(memberId) => handleMemberChange(memberId, index, record)}
memberlist={members}
assignedMembers={assignedMembers} // Pass assigned members here
/>
</div>
</div>