Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ const tableColumns: TableColumn<CopilotApplication>[] = [
propertyName: 'activeProjects',
type: 'text',
},
{
label: 'Past Projects',
propertyName: 'pastProjects',
type: 'text',
},
{
label: 'Status',
propertyName: 'status',
Expand Down Expand Up @@ -81,6 +86,7 @@ const CopilotApplications: FC<{
fulfilment: member?.copilotFulfillment || 0,
handle: member?.handle,
opportunityStatus: props.opportunity.status,
pastProjects: member?.pastProjects || 0,
}
})
.sort((a, b) => (b.fulfilment || 0) - (a.fulfilment || 0)) : [])
Expand Down
17 changes: 12 additions & 5 deletions src/apps/copilots/src/services/members.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ interface Member {
COPILOT: {
activeProjects: number,
fulfillment: number,
projects: number;
}
}[]
}

export interface FormattedMembers extends Member {
copilotFulfillment: number,
activeProjects: number,
pastProjects: number;
}

export type MembersResponse = SWRResponse<FormattedMembers[], FormattedMembers[]>
Expand All @@ -40,11 +42,16 @@ export const getMembersByUserIds = async (
)
}

const membersFactory = (members: Member[]): FormattedMembers[] => members.map(member => ({
...member,
activeProjects: member.stats?.find(item => item.COPILOT?.activeProjects)?.COPILOT?.activeProjects || 0,
copilotFulfillment: member.stats?.find(item => item.COPILOT?.fulfillment)?.COPILOT?.fulfillment || 0,
}))
const membersFactory = (members: Member[]): FormattedMembers[] => members.map(member => {
const copilotStats = member.stats?.find(item => item.COPILOT)?.COPILOT ?? {} as Member['stats'][0]['COPILOT']

return {
...member,
activeProjects: copilotStats.activeProjects || 0,
copilotFulfillment: copilotStats.fulfillment || 0,
pastProjects: copilotStats.projects || 0,
}
})

/**
* Custom hook to fetch members by list of user ids
Expand Down