esdras/sistema-de-chamados
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: avoid Convex skip sentinel in queries

Browse source
This commit is contained in:
Esdras Renan 2025-11-01 02:09:16 -03:00
parent 3880ff57bd
commit 3de7eccaa8
32 changed files with 131 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/charts/chart-open-priority.tsx
View file

@ -47,7 +47,7 @@ export function ChartOpenByPriority() {
const enabled = Boolean(isStaff && convexUserId)
const report = useQuery(
api.reports.backlogOverview,
enabled ? api.reports.backlogOverview : undefined,
enabled
? ({
tenantId,
@ -55,12 +55,12 @@ export function ChartOpenByPriority() {
range: timeRange,
companyId: companyId === "all" ? undefined : (companyId as Id<"companies">),
})
: "skip"
: undefined
) as { priorityCounts: Record<string, number> } | undefined
const companies = useQuery(
api.companies.list,
enabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip"
enabled ? api.companies.list : undefined,
enabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
) as Array<{ id: Id<"companies">; name: string }> | undefined
if (!report) {

8
src/components/charts/chart-opened-resolved.tsx
View file

@ -31,7 +31,7 @@ export function ChartOpenedResolved() {
const reportsEnabled = Boolean(isStaff && convexUserId)
const data = useQuery(
api.reports.openedResolvedByDay,
reportsEnabled ? api.reports.openedResolvedByDay : undefined,
reportsEnabled
? ({
tenantId,
@ -39,12 +39,12 @@ export function ChartOpenedResolved() {
range: timeRange,
companyId: companyId === "all" ? undefined : (companyId as Id<"companies">),
})
: "skip"
: undefined
) as { rangeDays: number; series: SeriesPoint[] } | undefined
const companies = useQuery(
api.companies.list,
reportsEnabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip"
reportsEnabled ? api.companies.list : undefined,
reportsEnabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
) as Array<{ id: Id<"companies">; name: string }> | undefined
if (!data) {

18
src/components/charts/views-charts.tsx
View file

@ -29,12 +29,15 @@ function BacklogPriorityPie() {
const { session, convexUserId, isStaff } = useAuth()
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
const data = useQuery(
api.reports.backlogOverview,
isStaff && convexUserId ? api.reports.backlogOverview : undefined,
isStaff && convexUserId
? ({ tenantId, viewerId: convexUserId as Id<"users">, range: timeRange, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) })
: "skip"
: undefined
) as { priorityCounts: Record<string, number> } | undefined
const companies = useQuery(api.companies.list, isStaff && convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip") as Array<{ id: Id<"companies">; name: string }> | undefined
const companies = useQuery(
isStaff && convexUserId ? api.companies.list : undefined,
isStaff && convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
) as Array<{ id: Id<"companies">; name: string }> | undefined
if (!data) return <Skeleton className="h-[300px] w-full" />
const PRIORITY_LABELS: Record<string, string> = { LOW: "Baixa", MEDIUM: "Média", HIGH: "Alta", URGENT: "Crítica" }
@ -109,12 +112,15 @@ function QueuesOpenBar() {
const { session, convexUserId, isStaff } = useAuth()
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
const data = useQuery(
api.reports.slaOverview,
isStaff && convexUserId ? api.reports.slaOverview : undefined,
isStaff && convexUserId
? ({ tenantId, viewerId: convexUserId as Id<"users">, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) })
: "skip"
: undefined
) as { queueBreakdown: { id: string; name: string; open: number }[] } | undefined
const companies = useQuery(api.companies.list, isStaff && convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip") as Array<{ id: Id<"companies">; name: string }> | undefined
const companies = useQuery(
isStaff && convexUserId ? api.companies.list : undefined,
isStaff && convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
) as Array<{ id: Id<"companies">; name: string }> | undefined
if (!data) return <Skeleton className="h-[300px] w-full" />
const chartData = (data.queueBreakdown ?? []).map((q) => ({ queue: q.name, open: q.open }))