Skip to content

Dashboard team filters fix, include non-team members if copilot seat allocated to non team members #66

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

Open
Sandeep Gupta (sandeep0402) wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Dashboard team filters fix, include non-team members if copilot seat allocated to non team members #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
299a965
Dashboard team filters fix, include non-team members if copilot seat …
sandeep-birdeye Jul 19, 2025
8cefedc
Seats tab, add capability to fetch names
sandeep-birdeye Jul 19, 2025
a3dfb94
Clear detailed logging
sandeep-birdeye Jul 19, 2025
53cd2d8
Revert "Clear detailed logging"
sandeep-birdeye Jul 19, 2025
e6ed9d0
Revert "Revert "Clear detailed logging""
sandeep-birdeye Jul 19, 2025
7ae2829
Clear more logs and blank spaces
sandeep-birdeye Jul 19, 2025
5c00e60
Update src/dashboard/services/copilot-seat-service.ts
congiuluc Jul 22, 2025
06c5280
Refactor getTeamMembers function to specify types for teamMembersUrl …
Frank802 Jul 22, 2025
f1ea233
Remove logging for invalid seats data in computeActiveUsersFromSeats …
Frank802 Jul 22, 2025
07a5bc6
Remove computeActiveUsersFromSeats function and update Stats componen…
Frank802 Jul 23, 2025
2f07a14
Make the code more generalized and avoid hard coded names
sandeep-birdeye Jul 27, 2025
567fa20
Refactor getCopilotSeats function to streamline database and API call…
Frank802 Jul 29, 2025
fa51e4b
Rollback changes for user name resolver feature in the SeatsList comp…
Frank802 Jul 29, 2025
70f0576
Remove comment for conditional rendering of Teams filter in Filters c…
Frank802 Jul 29, 2025
4ee51a2
Merge branch 'microsoft:main' into fix-teams-filters
sandeep0402 Jul 30, 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
4 changes: 3 additions & 1 deletion src/dashboard/features/dashboard/filter/dropdown-filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ export function DropdownFilter(props: DropdownFilterProps) {
return (
<CommandItem
key={option.value}
onSelect={onSelect}
onSelect={() => {
onSelect(option.value);
}}
value={option.value}
>
<div
Expand Down
14 changes: 8 additions & 6 deletions src/dashboard/features/dashboard/filter/header-filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ export function Filters() {
allItems={allEditors}
onSelect={(e) => dashboardStore.filterEditor(e)}
/>{" "}
<DropdownFilter
name={"Team"}
allItems={allTeams}
onSelect={(e) => dashboardStore.filterTeam(e)}
onClose={() => dashboardStore.refreshTeamDataIfNeeded()}
/>
{allTeams.length > 0 && (
<DropdownFilter
name={"Team"}
allItems={allTeams}
onSelect={(e) => dashboardStore.filterTeam(e)}
onClose={() => dashboardStore.refreshTeamDataIfNeeded()}
/>
)}
<Button
variant={"secondary"}
size={"icon"}
Expand Down
11 changes: 6 additions & 5 deletions src/dashboard/services/copilot-metrics-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export interface IFilter {

export const getCopilotMetrics = async (
filter: IFilter
): Promise<ServerActionResponse<CopilotUsageOutput[]>> => {
): Promise<ServerActionResponse<CopilotUsageOutput[]>> => {
const env = ensureGitHubEnvConfig();
const isCosmosConfig = cosmosConfiguration();

Expand All @@ -40,16 +40,17 @@ export const getCopilotMetrics = async (
filter.organization = organization;
}
break;
} if (isCosmosConfig) {
return getCopilotMetricsFromDatabase(filter);
}
if (isCosmosConfig) {
return await getCopilotMetricsFromDatabase(filter);
}

// If teams are specified, use the teams-specific API function
if (filter.team && filter.team.length > 0) {
return getCopilotTeamsMetricsFromApi(filter);
return await getCopilotTeamsMetricsFromApi(filter);
}

return getCopilotMetricsFromApi(filter);
return await getCopilotMetricsFromApi(filter);
} catch (e) {
return unknownResponseError(e);
}
Expand Down
18 changes: 9 additions & 9 deletions src/dashboard/services/copilot-seat-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export interface IFilter {

export const getCopilotSeats = async (
filter: IFilter
): Promise<ServerActionResponse<CopilotSeatsData>> => {
): Promise<ServerActionResponse<CopilotSeatsData>> => {
const env = ensureGitHubEnvConfig();
const isCosmosConfig = cosmosConfiguration();

Expand All @@ -40,10 +40,10 @@ export const getCopilotSeats = async (
}
break;
}
if (isCosmosConfig) {
return getCopilotSeatsFromDatabase(filter);
if (isCosmosConfig) {
return await getCopilotSeatsFromDatabase(filter);
}
return getCopilotSeatsFromApi(filter);
return await getCopilotSeatsFromApi(filter);
} catch (e) {
return unknownResponseError(e);
}
Expand Down Expand Up @@ -150,11 +150,11 @@ const getCopilotSeatsFromDatabase = async (
};
}

const seatsData = aggregateSeatsData(data.response, filter.team);
const seatsData = await aggregateSeatsData(data.response, filter.team);

return {
status: "OK",
response: seatsData as CopilotSeatsData,
response: seatsData,
};
} catch (e) {
return unknownResponseError(e);
Expand Down Expand Up @@ -309,11 +309,11 @@ const getCopilotSeatsFromApi = async (
};
}

const seatsData = aggregateSeatsData(data.response, filter.team);
const seatsData = await aggregateSeatsData(data.response, filter.team);

return {
status: "OK",
response: seatsData as CopilotSeatsData,
response: seatsData,
};
} catch (e) {
return unknownResponseError(e);
Expand All @@ -322,7 +322,7 @@ const getCopilotSeatsFromApi = async (

export const getCopilotSeatsManagement = async (
filter: IFilter
): Promise<ServerActionResponse<CopilotSeatsData>> => {
): Promise<ServerActionResponse<CopilotSeatsData>> => {
const env = ensureGitHubEnvConfig();
const isCosmosConfig = cosmosConfiguration();

Expand Down