Merge remote-tracking branch 'origin/main' into APL-1157

Author: svcAPLBot

src/pages/Dashboard.tsx

@@ -27,12 +27,12 @@ export default function (): React.ReactElement {
   } = useGetTeamsQuery(!isPlatformAdmin && skipToken)
   const { data: teamData } = useGetTeamQuery({ teamId: oboTeamId }, { skip: !oboTeamId || isPlatformAdmin })
 
-  const teamName = isPlatformView ? undefined : oboTeamId
+  const teamId = isPlatformView ? undefined : oboTeamId
   const {
     data: dashboard,
     isFetching: isFetchingDashboard,
     refetch: refetchDashboard,
-  } = useGetDashboardQuery({ teamName })
+  } = useGetDashboardQuery({ teamId })
 
   const isDirty = useAppSelector(({ global: { isDirty } }) => isDirty)
   useEffect(() => {
@@ -42,7 +42,7 @@ export default function (): React.ReactElement {
   }, [isDirty])
   const { t } = useTranslation()
   // END HOOKS
-  const team = !isLoadingTeams && (find(teams, { name: teamName }) || teamData)
+  const team = !isLoadingTeams && (find(teams, { name: teamId }) || teamData)
   const loading = isFetchingDashboard || isLoadingTeams
   const teamInventory = isPlatformView ? [{ name: 'teams', count: teams?.length }] : []
   const dashboardInventory = dashboard ?? ([] as any)

src/redux/otomiApi.ts

@@ -201,7 +201,7 @@ const injectedRtkApi = api.injectEndpoints({
       query: (queryArg) => ({ url: `/v2/teams/${queryArg.teamId}/netpols/${queryArg.netpolName}`, method: 'DELETE' }),
     }),
     getDashboard: build.query<GetDashboardApiResponse, GetDashboardApiArg>({
-      query: (queryArg) => ({ url: `/v1/dashboard`, params: { teamName: queryArg.teamName } }),
+      query: (queryArg) => ({ url: `/v1/dashboard`, params: { teamId: queryArg.teamId } }),
     }),
     getAllBuilds: build.query<GetAllBuildsApiResponse, GetAllBuildsApiArg>({
       query: () => ({ url: `/v1/builds` }),
@@ -2999,7 +2999,7 @@ export type DeleteAplNetpolApiArg = {
 export type GetDashboardApiResponse = /** status 200 Successfully obtained dashboard inventory data */ object
 export type GetDashboardApiArg = {
   /** Name of the team */
-  teamName?: string
+  teamId?: string
 }
 export type GetAllBuildsApiResponse = /** status 200 Successfully obtained all builds configuration */ {
   id?: string