fix: avoid Convex skip sentinel in queries
This commit is contained in:
parent
3880ff57bd
commit
3de7eccaa8
32 changed files with 131 additions and 125 deletions
|
|
@ -49,7 +49,7 @@ export default function NewTicketPage() {
|
||||||
const queueArgs = queuesEnabled
|
const queueArgs = queuesEnabled
|
||||||
? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> }
|
? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> }
|
||||||
: undefined
|
: undefined
|
||||||
const queuesRemote = useQuery(queuesEnabled ? api.queues.summary : "skip", queueArgs)
|
const queuesRemote = useQuery(queuesEnabled ? api.queues.summary : undefined, queueArgs)
|
||||||
const queues = useMemo(
|
const queues = useMemo(
|
||||||
() => (Array.isArray(queuesRemote) ? (queuesRemote as TicketQueueSummary[]) : []),
|
() => (Array.isArray(queuesRemote) ? (queuesRemote as TicketQueueSummary[]) : []),
|
||||||
[queuesRemote]
|
[queuesRemote]
|
||||||
|
|
@ -66,10 +66,7 @@ export default function NewTicketPage() {
|
||||||
const companiesArgs = directoryQueryEnabled
|
const companiesArgs = directoryQueryEnabled
|
||||||
? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> }
|
? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> }
|
||||||
: undefined
|
: undefined
|
||||||
const companiesRemote = useQuery(
|
const companiesRemote = useQuery(directoryQueryEnabled ? api.companies.list : undefined, companiesArgs)
|
||||||
directoryQueryEnabled ? api.companies.list : "skip",
|
|
||||||
companiesArgs
|
|
||||||
)
|
|
||||||
const companies = useMemo(
|
const companies = useMemo(
|
||||||
() =>
|
() =>
|
||||||
(Array.isArray(companiesRemote) ? companiesRemote : []).map((company) => ({
|
(Array.isArray(companiesRemote) ? companiesRemote : []).map((company) => ({
|
||||||
|
|
@ -83,10 +80,7 @@ export default function NewTicketPage() {
|
||||||
const customersArgs = directoryQueryEnabled
|
const customersArgs = directoryQueryEnabled
|
||||||
? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> }
|
? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> }
|
||||||
: undefined
|
: undefined
|
||||||
const customersRemote = useQuery(
|
const customersRemote = useQuery(directoryQueryEnabled ? api.users.listCustomers : undefined, customersArgs)
|
||||||
directoryQueryEnabled ? api.users.listCustomers : "skip",
|
|
||||||
customersArgs
|
|
||||||
)
|
|
||||||
const customers = useMemo(
|
const customers = useMemo(
|
||||||
() => (Array.isArray(customersRemote) ? (customersRemote as CustomerOption[]) : []),
|
() => (Array.isArray(customersRemote) ? (customersRemote as CustomerOption[]) : []),
|
||||||
[customersRemote]
|
[customersRemote]
|
||||||
|
|
|
||||||
|
|
@ -375,8 +375,8 @@ export function AdminUsersManager({
|
||||||
linkedUsers?: Array<{ id: string; email: string; name: string }>
|
linkedUsers?: Array<{ id: string; email: string; name: string }>
|
||||||
}
|
}
|
||||||
const machinesList = useQuery(
|
const machinesList = useQuery(
|
||||||
convexUserId ? api.machines.listByTenant : "skip",
|
convexUserId ? api.machines.listByTenant : undefined,
|
||||||
convexUserId ? { tenantId: defaultTenantId, includeMetadata: true } : ("skip" as const)
|
convexUserId ? { tenantId: defaultTenantId, includeMetadata: true } : undefined
|
||||||
) as MachinesListItem[] | undefined
|
) as MachinesListItem[] | undefined
|
||||||
|
|
||||||
const machinesByUserEmail = useMemo(() => {
|
const machinesByUserEmail = useMemo(() => {
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ export function AdminAlertsManager() {
|
||||||
}, [range])
|
}, [range])
|
||||||
|
|
||||||
const alertsRaw = useQuery(
|
const alertsRaw = useQuery(
|
||||||
api.alerts.list,
|
convexUserId ? api.alerts.list : undefined,
|
||||||
convexUserId
|
convexUserId
|
||||||
? ({
|
? ({
|
||||||
tenantId,
|
tenantId,
|
||||||
|
|
@ -34,7 +34,7 @@ export function AdminAlertsManager() {
|
||||||
end,
|
end,
|
||||||
companyId: companyId === "all" ? undefined : (companyId as Id<"companies">),
|
companyId: companyId === "all" ? undefined : (companyId as Id<"companies">),
|
||||||
})
|
})
|
||||||
: "skip"
|
: undefined
|
||||||
) as Doc<"alerts">[] | undefined
|
) as Doc<"alerts">[] | undefined
|
||||||
|
|
||||||
const alerts = useMemo(() => {
|
const alerts = useMemo(() => {
|
||||||
|
|
@ -43,8 +43,8 @@ export function AdminAlertsManager() {
|
||||||
}, [alertsRaw])
|
}, [alertsRaw])
|
||||||
|
|
||||||
const companies = useQuery(
|
const companies = useQuery(
|
||||||
api.companies.list,
|
convexUserId ? api.companies.list : undefined,
|
||||||
convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip"
|
convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
) as Array<{ id: Id<"companies">; name: string }> | undefined
|
) as Array<{ id: Id<"companies">; name: string }> | undefined
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|
|
||||||
|
|
@ -44,8 +44,8 @@ export function FieldsManager() {
|
||||||
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
|
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
|
||||||
|
|
||||||
const fields = useQuery(
|
const fields = useQuery(
|
||||||
api.fields.list,
|
convexUserId ? api.fields.list : undefined,
|
||||||
convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip"
|
convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
) as Field[] | undefined
|
) as Field[] | undefined
|
||||||
|
|
||||||
const createField = useMutation(api.fields.create)
|
const createField = useMutation(api.fields.create)
|
||||||
|
|
|
||||||
|
|
@ -21,11 +21,12 @@ export function AdminMachineDetailsClient({ tenantId: _tenantId, machineId }: {
|
||||||
const routeMachineId = Array.isArray(params?.id) ? params?.id[0] : params?.id
|
const routeMachineId = Array.isArray(params?.id) ? params?.id[0] : params?.id
|
||||||
const effectiveMachineId = machineId ?? routeMachineId ?? ""
|
const effectiveMachineId = machineId ?? routeMachineId ?? ""
|
||||||
|
|
||||||
const queryArgs = effectiveMachineId
|
const canLoadMachine = Boolean(effectiveMachineId)
|
||||||
|
const queryArgs = canLoadMachine
|
||||||
? ({ id: effectiveMachineId as Id<"machines">, includeMetadata: true } as const)
|
? ({ id: effectiveMachineId as Id<"machines">, includeMetadata: true } as const)
|
||||||
: "skip"
|
: undefined
|
||||||
|
|
||||||
const single = useQuery(api.machines.getById, queryArgs)
|
const single = useQuery(canLoadMachine ? api.machines.getById : undefined, queryArgs)
|
||||||
|
|
||||||
// Fallback via HTTP in caso de o Convex React demorar/ficar preso em loading
|
// Fallback via HTTP in caso de o Convex React demorar/ficar preso em loading
|
||||||
const [fallback, setFallback] = useState<Record<string, unknown> | null | undefined>(undefined)
|
const [fallback, setFallback] = useState<Record<string, unknown> | null | undefined>(undefined)
|
||||||
|
|
|
||||||
|
|
@ -1206,8 +1206,8 @@ export function AdminMachinesOverview({ tenantId, initialCompanyFilterSlug = "al
|
||||||
const [exportError, setExportError] = useState<string | null>(null)
|
const [exportError, setExportError] = useState<string | null>(null)
|
||||||
const { convexUserId } = useAuth()
|
const { convexUserId } = useAuth()
|
||||||
const companies = useQuery(
|
const companies = useQuery(
|
||||||
convexUserId ? api.companies.list : "skip",
|
convexUserId ? api.companies.list : undefined,
|
||||||
convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : ("skip" as const)
|
convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
) as Array<{ id: string; name: string; slug?: string }> | undefined
|
) as Array<{ id: string; name: string; slug?: string }> | undefined
|
||||||
const companyNameBySlug = useMemo(() => {
|
const companyNameBySlug = useMemo(() => {
|
||||||
const map = new Map<string, string>()
|
const map = new Map<string, string>()
|
||||||
|
|
@ -1698,13 +1698,13 @@ export function MachineDetails({ machine }: MachineDetailsProps) {
|
||||||
const [isActiveLocal, setIsActiveLocal] = useState<boolean>(machine?.isActive ?? true)
|
const [isActiveLocal, setIsActiveLocal] = useState<boolean>(machine?.isActive ?? true)
|
||||||
const isDeactivated = !isActiveLocal || effectiveStatus === "deactivated"
|
const isDeactivated = !isActiveLocal || effectiveStatus === "deactivated"
|
||||||
const alertsHistory = useQuery(
|
const alertsHistory = useQuery(
|
||||||
machine ? api.machines.listAlerts : "skip",
|
machine ? api.machines.listAlerts : undefined,
|
||||||
machine ? { machineId: machine.id as Id<"machines">, limit: 50 } : ("skip" as const)
|
machine ? { machineId: machine.id as Id<"machines">, limit: 50 } : undefined
|
||||||
) as MachineAlertEntry[] | undefined
|
) as MachineAlertEntry[] | undefined
|
||||||
const machineAlertsHistory = alertsHistory ?? []
|
const machineAlertsHistory = alertsHistory ?? []
|
||||||
const openTickets = useQuery(
|
const openTickets = useQuery(
|
||||||
machine ? api.machines.listOpenTickets : "skip",
|
machine ? api.machines.listOpenTickets : undefined,
|
||||||
machine ? { machineId: machine.id as Id<"machines">, limit: 6 } : ("skip" as const)
|
machine ? { machineId: machine.id as Id<"machines">, limit: 6 } : undefined
|
||||||
) as MachineOpenTicketsSummary | undefined
|
) as MachineOpenTicketsSummary | undefined
|
||||||
const machineTickets = openTickets?.tickets ?? []
|
const machineTickets = openTickets?.tickets ?? []
|
||||||
const totalOpenTickets = openTickets?.totalOpen ?? machineTickets.length
|
const totalOpenTickets = openTickets?.totalOpen ?? machineTickets.length
|
||||||
|
|
|
||||||
|
|
@ -21,11 +21,12 @@ type MachineBreadcrumbsProps = {
|
||||||
|
|
||||||
export function MachineBreadcrumbs({ tenantId: _tenantId, machineId, machineHref, extra }: MachineBreadcrumbsProps) {
|
export function MachineBreadcrumbs({ tenantId: _tenantId, machineId, machineHref, extra }: MachineBreadcrumbsProps) {
|
||||||
const { convexUserId } = useAuth()
|
const { convexUserId } = useAuth()
|
||||||
const queryArgs = machineId && convexUserId
|
const canLoadMachine = Boolean(machineId && convexUserId)
|
||||||
|
const queryArgs = canLoadMachine
|
||||||
? ({ id: machineId as Id<"machines">, includeMetadata: false } as const)
|
? ({ id: machineId as Id<"machines">, includeMetadata: false } as const)
|
||||||
: "skip"
|
: undefined
|
||||||
|
|
||||||
const item = useQuery(api.machines.getById, queryArgs)
|
const item = useQuery(canLoadMachine ? api.machines.getById : undefined, queryArgs)
|
||||||
const hostname = useMemo(() => item?.hostname ?? "Detalhe", [item])
|
const hostname = useMemo(() => item?.hostname ?? "Detalhe", [item])
|
||||||
const segments = useMemo(() => {
|
const segments = useMemo(() => {
|
||||||
const trail: BreadcrumbSegment[] = [
|
const trail: BreadcrumbSegment[] = [
|
||||||
|
|
|
||||||
|
|
@ -38,12 +38,12 @@ export function QueuesManager() {
|
||||||
const NO_TEAM_VALUE = "__none__"
|
const NO_TEAM_VALUE = "__none__"
|
||||||
|
|
||||||
const queues = useQuery(
|
const queues = useQuery(
|
||||||
api.queues.list,
|
convexUserId ? api.queues.list : undefined,
|
||||||
convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip"
|
convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
) as Queue[] | undefined
|
) as Queue[] | undefined
|
||||||
const teams = useQuery(
|
const teams = useQuery(
|
||||||
api.teams.list,
|
convexUserId ? api.teams.list : undefined,
|
||||||
convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip"
|
convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
) as TeamOption[] | undefined
|
) as TeamOption[] | undefined
|
||||||
|
|
||||||
const createQueue = useMutation(api.queues.create)
|
const createQueue = useMutation(api.queues.create)
|
||||||
|
|
|
||||||
|
|
@ -37,8 +37,8 @@ export function SlasManager() {
|
||||||
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
|
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
|
||||||
|
|
||||||
const slas = useQuery(
|
const slas = useQuery(
|
||||||
api.slas.list,
|
convexUserId ? api.slas.list : undefined,
|
||||||
convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip"
|
convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
) as SlaPolicy[] | undefined
|
) as SlaPolicy[] | undefined
|
||||||
|
|
||||||
const createSla = useMutation(api.slas.create)
|
const createSla = useMutation(api.slas.create)
|
||||||
|
|
|
||||||
|
|
@ -39,12 +39,12 @@ export function TeamsManager() {
|
||||||
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
|
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
|
||||||
|
|
||||||
const teams = useQuery(
|
const teams = useQuery(
|
||||||
api.teams.list,
|
convexUserId ? api.teams.list : undefined,
|
||||||
convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip"
|
convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
) as Team[] | undefined
|
) as Team[] | undefined
|
||||||
const directory = useQuery(
|
const directory = useQuery(
|
||||||
api.teams.directory,
|
convexUserId ? api.teams.directory : undefined,
|
||||||
convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip"
|
convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
) as DirectoryUser[] | undefined
|
) as DirectoryUser[] | undefined
|
||||||
|
|
||||||
const createTeam = useMutation(api.teams.create)
|
const createTeam = useMutation(api.teams.create)
|
||||||
|
|
|
||||||
|
|
@ -64,12 +64,15 @@ export function ChartAreaInteractive() {
|
||||||
|
|
||||||
const reportsEnabled = Boolean(isStaff && convexUserId)
|
const reportsEnabled = Boolean(isStaff && convexUserId)
|
||||||
const report = useQuery(
|
const report = useQuery(
|
||||||
api.reports.ticketsByChannel,
|
reportsEnabled ? api.reports.ticketsByChannel : undefined,
|
||||||
reportsEnabled
|
reportsEnabled
|
||||||
? ({ tenantId, viewerId: convexUserId as Id<"users">, range: timeRange, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) })
|
? ({ tenantId, viewerId: convexUserId as Id<"users">, range: timeRange, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) })
|
||||||
: "skip"
|
: undefined
|
||||||
)
|
)
|
||||||
const companies = useQuery(api.companies.list, reportsEnabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip") as Array<{ id: Id<"companies">; name: string }> | undefined
|
const companies = useQuery(
|
||||||
|
reportsEnabled ? api.companies.list : undefined,
|
||||||
|
reportsEnabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
|
) as Array<{ id: Id<"companies">; name: string }> | undefined
|
||||||
const filteredCompanies = React.useMemo(() => {
|
const filteredCompanies = React.useMemo(() => {
|
||||||
const q = companyQuery.trim().toLowerCase()
|
const q = companyQuery.trim().toLowerCase()
|
||||||
if (!q) return companies ?? []
|
if (!q) return companies ?? []
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ export function ChartOpenByPriority() {
|
||||||
const enabled = Boolean(isStaff && convexUserId)
|
const enabled = Boolean(isStaff && convexUserId)
|
||||||
|
|
||||||
const report = useQuery(
|
const report = useQuery(
|
||||||
api.reports.backlogOverview,
|
enabled ? api.reports.backlogOverview : undefined,
|
||||||
enabled
|
enabled
|
||||||
? ({
|
? ({
|
||||||
tenantId,
|
tenantId,
|
||||||
|
|
@ -55,12 +55,12 @@ export function ChartOpenByPriority() {
|
||||||
range: timeRange,
|
range: timeRange,
|
||||||
companyId: companyId === "all" ? undefined : (companyId as Id<"companies">),
|
companyId: companyId === "all" ? undefined : (companyId as Id<"companies">),
|
||||||
})
|
})
|
||||||
: "skip"
|
: undefined
|
||||||
) as { priorityCounts: Record<string, number> } | undefined
|
) as { priorityCounts: Record<string, number> } | undefined
|
||||||
|
|
||||||
const companies = useQuery(
|
const companies = useQuery(
|
||||||
api.companies.list,
|
enabled ? api.companies.list : undefined,
|
||||||
enabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip"
|
enabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
) as Array<{ id: Id<"companies">; name: string }> | undefined
|
) as Array<{ id: Id<"companies">; name: string }> | undefined
|
||||||
|
|
||||||
if (!report) {
|
if (!report) {
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ export function ChartOpenedResolved() {
|
||||||
|
|
||||||
const reportsEnabled = Boolean(isStaff && convexUserId)
|
const reportsEnabled = Boolean(isStaff && convexUserId)
|
||||||
const data = useQuery(
|
const data = useQuery(
|
||||||
api.reports.openedResolvedByDay,
|
reportsEnabled ? api.reports.openedResolvedByDay : undefined,
|
||||||
reportsEnabled
|
reportsEnabled
|
||||||
? ({
|
? ({
|
||||||
tenantId,
|
tenantId,
|
||||||
|
|
@ -39,12 +39,12 @@ export function ChartOpenedResolved() {
|
||||||
range: timeRange,
|
range: timeRange,
|
||||||
companyId: companyId === "all" ? undefined : (companyId as Id<"companies">),
|
companyId: companyId === "all" ? undefined : (companyId as Id<"companies">),
|
||||||
})
|
})
|
||||||
: "skip"
|
: undefined
|
||||||
) as { rangeDays: number; series: SeriesPoint[] } | undefined
|
) as { rangeDays: number; series: SeriesPoint[] } | undefined
|
||||||
|
|
||||||
const companies = useQuery(
|
const companies = useQuery(
|
||||||
api.companies.list,
|
reportsEnabled ? api.companies.list : undefined,
|
||||||
reportsEnabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip"
|
reportsEnabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
) as Array<{ id: Id<"companies">; name: string }> | undefined
|
) as Array<{ id: Id<"companies">; name: string }> | undefined
|
||||||
|
|
||||||
if (!data) {
|
if (!data) {
|
||||||
|
|
|
||||||
|
|
@ -29,12 +29,15 @@ function BacklogPriorityPie() {
|
||||||
const { session, convexUserId, isStaff } = useAuth()
|
const { session, convexUserId, isStaff } = useAuth()
|
||||||
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
|
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
|
||||||
const data = useQuery(
|
const data = useQuery(
|
||||||
api.reports.backlogOverview,
|
isStaff && convexUserId ? api.reports.backlogOverview : undefined,
|
||||||
isStaff && convexUserId
|
isStaff && convexUserId
|
||||||
? ({ tenantId, viewerId: convexUserId as Id<"users">, range: timeRange, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) })
|
? ({ tenantId, viewerId: convexUserId as Id<"users">, range: timeRange, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) })
|
||||||
: "skip"
|
: undefined
|
||||||
) as { priorityCounts: Record<string, number> } | 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" />
|
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" }
|
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 { session, convexUserId, isStaff } = useAuth()
|
||||||
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
|
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
|
||||||
const data = useQuery(
|
const data = useQuery(
|
||||||
api.reports.slaOverview,
|
isStaff && convexUserId ? api.reports.slaOverview : undefined,
|
||||||
isStaff && convexUserId
|
isStaff && convexUserId
|
||||||
? ({ tenantId, viewerId: convexUserId as Id<"users">, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) })
|
? ({ 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
|
) 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" />
|
if (!data) return <Skeleton className="h-[300px] w-full" />
|
||||||
const chartData = (data.queueBreakdown ?? []).map((q) => ({ queue: q.name, open: q.open }))
|
const chartData = (data.queueBreakdown ?? []).map((q) => ({ queue: q.name, open: q.open }))
|
||||||
|
|
|
||||||
|
|
@ -73,14 +73,14 @@ export function PortalTicketDetail({ ticketId }: PortalTicketDetailProps) {
|
||||||
const machineInactive = machineContext?.isActive === false
|
const machineInactive = machineContext?.isActive === false
|
||||||
|
|
||||||
const ticketRaw = useQuery(
|
const ticketRaw = useQuery(
|
||||||
api.tickets.getById,
|
convexUserId ? api.tickets.getById : undefined,
|
||||||
convexUserId
|
convexUserId
|
||||||
? {
|
? {
|
||||||
tenantId: session?.user.tenantId ?? DEFAULT_TENANT_ID,
|
tenantId: session?.user.tenantId ?? DEFAULT_TENANT_ID,
|
||||||
id: ticketId as Id<"tickets">,
|
id: ticketId as Id<"tickets">,
|
||||||
viewerId: convexUserId as Id<"users">,
|
viewerId: convexUserId as Id<"users">,
|
||||||
}
|
}
|
||||||
: "skip"
|
: undefined
|
||||||
)
|
)
|
||||||
|
|
||||||
const ticket = useMemo(() => {
|
const ticket = useMemo(() => {
|
||||||
|
|
|
||||||
|
|
@ -21,14 +21,14 @@ export function PortalTicketList() {
|
||||||
const viewerId = (convexUserId ?? machineContext?.assignedUserId ?? null) as Id<"users"> | null
|
const viewerId = (convexUserId ?? machineContext?.assignedUserId ?? null) as Id<"users"> | null
|
||||||
|
|
||||||
const ticketsRaw = useQuery(
|
const ticketsRaw = useQuery(
|
||||||
api.tickets.list,
|
viewerId ? api.tickets.list : undefined,
|
||||||
viewerId
|
viewerId
|
||||||
? {
|
? {
|
||||||
tenantId: session?.user.tenantId ?? DEFAULT_TENANT_ID,
|
tenantId: session?.user.tenantId ?? DEFAULT_TENANT_ID,
|
||||||
viewerId,
|
viewerId,
|
||||||
limit: 100,
|
limit: 100,
|
||||||
}
|
}
|
||||||
: "skip"
|
: undefined
|
||||||
)
|
)
|
||||||
|
|
||||||
const tickets = useMemo(() => {
|
const tickets = useMemo(() => {
|
||||||
|
|
|
||||||
|
|
@ -44,10 +44,13 @@ export function BacklogReport() {
|
||||||
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
|
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
|
||||||
const enabled = Boolean(isStaff && convexUserId)
|
const enabled = Boolean(isStaff && convexUserId)
|
||||||
const data = useQuery(
|
const data = useQuery(
|
||||||
api.reports.backlogOverview,
|
enabled ? api.reports.backlogOverview : undefined,
|
||||||
enabled ? { tenantId, viewerId: convexUserId as Id<"users">, range: timeRange, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) } : "skip"
|
enabled ? { tenantId, viewerId: convexUserId as Id<"users">, range: timeRange, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) } : undefined
|
||||||
)
|
)
|
||||||
const companies = useQuery(api.companies.list, enabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip") as Array<{ id: Id<"companies">; name: string }> | undefined
|
const companies = useQuery(
|
||||||
|
enabled ? api.companies.list : undefined,
|
||||||
|
enabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
|
) as Array<{ id: Id<"companies">; name: string }> | undefined
|
||||||
|
|
||||||
const mostCriticalPriority = useMemo(() => {
|
const mostCriticalPriority = useMemo(() => {
|
||||||
if (!data) return null
|
if (!data) return null
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,10 @@ export function CompanyReport() {
|
||||||
const [selectedCompany, setSelectedCompany] = useState<string>("")
|
const [selectedCompany, setSelectedCompany] = useState<string>("")
|
||||||
const [timeRange, setTimeRange] = useState<"7d" | "30d" | "90d">("30d")
|
const [timeRange, setTimeRange] = useState<"7d" | "30d" | "90d">("30d")
|
||||||
|
|
||||||
const companies = useQuery(api.companies.list, isStaff && convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip") as CompanyRecord[] | undefined
|
const companies = useQuery(
|
||||||
|
isStaff && convexUserId ? api.companies.list : undefined,
|
||||||
|
isStaff && convexUserId ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
|
) as CompanyRecord[] | undefined
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!selectedCompany && companies && companies.length > 0) {
|
if (!selectedCompany && companies && companies.length > 0) {
|
||||||
|
|
@ -71,7 +74,7 @@ export function CompanyReport() {
|
||||||
}, [companies, selectedCompany])
|
}, [companies, selectedCompany])
|
||||||
|
|
||||||
const report = useQuery(
|
const report = useQuery(
|
||||||
api.reports.companyOverview,
|
selectedCompany && convexUserId && isStaff ? api.reports.companyOverview : undefined,
|
||||||
selectedCompany && convexUserId && isStaff
|
selectedCompany && convexUserId && isStaff
|
||||||
? {
|
? {
|
||||||
tenantId,
|
tenantId,
|
||||||
|
|
@ -79,7 +82,7 @@ export function CompanyReport() {
|
||||||
companyId: selectedCompany as Id<"companies">,
|
companyId: selectedCompany as Id<"companies">,
|
||||||
range: timeRange,
|
range: timeRange,
|
||||||
}
|
}
|
||||||
: "skip"
|
: undefined
|
||||||
)
|
)
|
||||||
|
|
||||||
const isLoading = selectedCompany !== "" && report === undefined
|
const isLoading = selectedCompany !== "" && report === undefined
|
||||||
|
|
|
||||||
|
|
@ -29,12 +29,15 @@ export function CsatReport() {
|
||||||
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
|
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
|
||||||
const enabled = Boolean(isStaff && convexUserId)
|
const enabled = Boolean(isStaff && convexUserId)
|
||||||
const data = useQuery(
|
const data = useQuery(
|
||||||
api.reports.csatOverview,
|
enabled ? api.reports.csatOverview : undefined,
|
||||||
enabled
|
enabled
|
||||||
? ({ tenantId, viewerId: convexUserId as Id<"users">, range: timeRange, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) })
|
? ({ tenantId, viewerId: convexUserId as Id<"users">, range: timeRange, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) })
|
||||||
: "skip"
|
: undefined
|
||||||
)
|
)
|
||||||
const companies = useQuery(api.companies.list, enabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip") as Array<{ id: Id<"companies">; name: string }> | undefined
|
const companies = useQuery(
|
||||||
|
enabled ? api.companies.list : undefined,
|
||||||
|
enabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
|
) as Array<{ id: Id<"companies">; name: string }> | undefined
|
||||||
|
|
||||||
if (!data) {
|
if (!data) {
|
||||||
return (
|
return (
|
||||||
|
|
|
||||||
|
|
@ -50,11 +50,14 @@ export function HoursReport() {
|
||||||
|
|
||||||
const enabled = Boolean(isStaff && convexUserId)
|
const enabled = Boolean(isStaff && convexUserId)
|
||||||
const data = useQuery(
|
const data = useQuery(
|
||||||
api.reports.hoursByClient,
|
enabled ? api.reports.hoursByClient : undefined,
|
||||||
enabled ? { tenantId, viewerId: convexUserId as Id<"users">, range: timeRange } : "skip"
|
enabled ? { tenantId, viewerId: convexUserId as Id<"users">, range: timeRange } : undefined
|
||||||
) as { rangeDays: number; items: HoursItem[] } | undefined
|
) as { rangeDays: number; items: HoursItem[] } | undefined
|
||||||
|
|
||||||
const companies = useQuery(api.companies.list, enabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip") as Array<{ id: Id<"companies">; name: string }> | undefined
|
const companies = useQuery(
|
||||||
|
enabled ? api.companies.list : undefined,
|
||||||
|
enabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
|
) as Array<{ id: Id<"companies">; name: string }> | undefined
|
||||||
const filtered = useMemo(() => {
|
const filtered = useMemo(() => {
|
||||||
const items = data?.items ?? []
|
const items = data?.items ?? []
|
||||||
const q = query.trim().toLowerCase()
|
const q = query.trim().toLowerCase()
|
||||||
|
|
|
||||||
|
|
@ -41,32 +41,35 @@ export function SlaReport() {
|
||||||
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
|
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
|
||||||
const enabled = Boolean(isStaff && convexUserId)
|
const enabled = Boolean(isStaff && convexUserId)
|
||||||
const data = useQuery(
|
const data = useQuery(
|
||||||
api.reports.slaOverview,
|
enabled ? api.reports.slaOverview : undefined,
|
||||||
enabled
|
enabled
|
||||||
? ({ tenantId, viewerId: convexUserId as Id<"users">, range: timeRange, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) })
|
? ({ tenantId, viewerId: convexUserId as Id<"users">, range: timeRange, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) })
|
||||||
: "skip"
|
: undefined
|
||||||
)
|
)
|
||||||
const agents = useQuery(
|
const agents = useQuery(
|
||||||
api.reports.agentProductivity,
|
enabled ? api.reports.agentProductivity : undefined,
|
||||||
enabled
|
enabled
|
||||||
? ({ tenantId, viewerId: convexUserId as Id<"users">, range: timeRange, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) })
|
? ({ tenantId, viewerId: convexUserId as Id<"users">, range: timeRange, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) })
|
||||||
: "skip"
|
: undefined
|
||||||
) as { rangeDays: number; items: Array<{ agentId: string; name: string | null; email: string | null; open: number; resolved: number; avgFirstResponseMinutes: number | null; avgResolutionMinutes: number | null; workedHours: number }> } | undefined
|
) as { rangeDays: number; items: Array<{ agentId: string; name: string | null; email: string | null; open: number; resolved: number; avgFirstResponseMinutes: number | null; avgResolutionMinutes: number | null; workedHours: number }> } | undefined
|
||||||
|
|
||||||
const openedResolved = useQuery(
|
const openedResolved = useQuery(
|
||||||
api.reports.openedResolvedByDay,
|
enabled ? api.reports.openedResolvedByDay : undefined,
|
||||||
enabled
|
enabled
|
||||||
? ({ tenantId, viewerId: convexUserId as Id<"users">, range: timeRange, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) })
|
? ({ tenantId, viewerId: convexUserId as Id<"users">, range: timeRange, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) })
|
||||||
: "skip"
|
: undefined
|
||||||
) as { rangeDays: number; series: Array<{ date: string; opened: number; resolved: number }> } | undefined
|
) as { rangeDays: number; series: Array<{ date: string; opened: number; resolved: number }> } | undefined
|
||||||
|
|
||||||
const channelsSeries = useQuery(
|
const channelsSeries = useQuery(
|
||||||
api.reports.ticketsByChannel,
|
enabled ? api.reports.ticketsByChannel : undefined,
|
||||||
enabled
|
enabled
|
||||||
? ({ tenantId, viewerId: convexUserId as Id<"users">, range: timeRange, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) })
|
? ({ tenantId, viewerId: convexUserId as Id<"users">, range: timeRange, companyId: companyId === "all" ? undefined : (companyId as Id<"companies">) })
|
||||||
: "skip"
|
: undefined
|
||||||
) as { rangeDays: number; channels: string[]; points: Array<{ date: string; values: Record<string, number> }> } | undefined
|
) as { rangeDays: number; channels: string[]; points: Array<{ date: string; values: Record<string, number> }> } | undefined
|
||||||
const companies = useQuery(api.companies.list, enabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip") as Array<{ id: Id<"companies">; name: string }> | undefined
|
const companies = useQuery(
|
||||||
|
enabled ? api.companies.list : undefined,
|
||||||
|
enabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
|
) as Array<{ id: Id<"companies">; name: string }> | undefined
|
||||||
|
|
||||||
const queueTotal = useMemo(
|
const queueTotal = useMemo(
|
||||||
() => data?.queueBreakdown.reduce((acc: number, queue: { open: number }) => acc + queue.open, 0) ?? 0,
|
() => data?.queueBreakdown.reduce((acc: number, queue: { open: number }) => acc + queue.open, 0) ?? 0,
|
||||||
|
|
|
||||||
|
|
@ -34,8 +34,8 @@ export function SectionCards() {
|
||||||
|
|
||||||
const dashboardEnabled = Boolean(isStaff && convexUserId)
|
const dashboardEnabled = Boolean(isStaff && convexUserId)
|
||||||
const dashboard = useQuery(
|
const dashboard = useQuery(
|
||||||
api.reports.dashboardOverview,
|
dashboardEnabled ? api.reports.dashboardOverview : undefined,
|
||||||
dashboardEnabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : "skip"
|
dashboardEnabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
)
|
)
|
||||||
|
|
||||||
const inProgressSummary = useMemo(() => {
|
const inProgressSummary = useMemo(() => {
|
||||||
|
|
|
||||||
|
|
@ -24,8 +24,8 @@ export function CommentTemplatesManager() {
|
||||||
const [activeKind, setActiveKind] = useState<"comment" | "closing">("comment")
|
const [activeKind, setActiveKind] = useState<"comment" | "closing">("comment")
|
||||||
|
|
||||||
const templates = useQuery(
|
const templates = useQuery(
|
||||||
viewerId ? api.commentTemplates.list : "skip",
|
viewerId ? api.commentTemplates.list : undefined,
|
||||||
viewerId ? { tenantId, viewerId, kind: activeKind } : "skip"
|
viewerId ? { tenantId, viewerId, kind: activeKind } : undefined
|
||||||
) as
|
) as
|
||||||
| {
|
| {
|
||||||
id: Id<"commentTemplates">
|
id: Id<"commentTemplates">
|
||||||
|
|
|
||||||
|
|
@ -135,7 +135,7 @@ export function CloseTicketDialog({
|
||||||
const closingTemplateArgs =
|
const closingTemplateArgs =
|
||||||
actorId && open ? { tenantId, viewerId: actorId, kind: "closing" as const } : undefined
|
actorId && open ? { tenantId, viewerId: actorId, kind: "closing" as const } : undefined
|
||||||
const closingTemplatesRemote = useQuery(
|
const closingTemplatesRemote = useQuery(
|
||||||
actorId && open ? api.commentTemplates.list : "skip",
|
actorId && open ? api.commentTemplates.list : undefined,
|
||||||
closingTemplateArgs
|
closingTemplateArgs
|
||||||
)
|
)
|
||||||
const closingTemplates = Array.isArray(closingTemplatesRemote)
|
const closingTemplates = Array.isArray(closingTemplatesRemote)
|
||||||
|
|
|
||||||
|
|
@ -131,7 +131,7 @@ export function NewTicketDialog({ triggerClassName }: { triggerClassName?: strin
|
||||||
: undefined
|
: undefined
|
||||||
|
|
||||||
useDefaultQueues(DEFAULT_TENANT_ID)
|
useDefaultQueues(DEFAULT_TENANT_ID)
|
||||||
const queuesRemote = useQuery(queuesEnabled ? api.queues.summary : "skip", queueArgs)
|
const queuesRemote = useQuery(queuesEnabled ? api.queues.summary : undefined, queueArgs)
|
||||||
const queues = useMemo(
|
const queues = useMemo(
|
||||||
() => (Array.isArray(queuesRemote) ? (queuesRemote as TicketQueueSummary[]) : []),
|
() => (Array.isArray(queuesRemote) ? (queuesRemote as TicketQueueSummary[]) : []),
|
||||||
[queuesRemote]
|
[queuesRemote]
|
||||||
|
|
@ -148,10 +148,7 @@ export function NewTicketDialog({ triggerClassName }: { triggerClassName?: strin
|
||||||
const companiesArgs = directoryQueryEnabled
|
const companiesArgs = directoryQueryEnabled
|
||||||
? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> }
|
? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> }
|
||||||
: undefined
|
: undefined
|
||||||
const companiesRemote = useQuery(
|
const companiesRemote = useQuery(directoryQueryEnabled ? api.companies.list : undefined, companiesArgs)
|
||||||
directoryQueryEnabled ? api.companies.list : "skip",
|
|
||||||
companiesArgs
|
|
||||||
)
|
|
||||||
const companies = useMemo(
|
const companies = useMemo(
|
||||||
() =>
|
() =>
|
||||||
(Array.isArray(companiesRemote) ? companiesRemote : []).map((company) => ({
|
(Array.isArray(companiesRemote) ? companiesRemote : []).map((company) => ({
|
||||||
|
|
@ -165,10 +162,7 @@ export function NewTicketDialog({ triggerClassName }: { triggerClassName?: strin
|
||||||
const customersArgs = directoryQueryEnabled
|
const customersArgs = directoryQueryEnabled
|
||||||
? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> }
|
? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> }
|
||||||
: undefined
|
: undefined
|
||||||
const customersRemote = useQuery(
|
const customersRemote = useQuery(directoryQueryEnabled ? api.users.listCustomers : undefined, customersArgs)
|
||||||
directoryQueryEnabled ? api.users.listCustomers : "skip",
|
|
||||||
customersArgs
|
|
||||||
)
|
|
||||||
const customers = useMemo(
|
const customers = useMemo(
|
||||||
() => (Array.isArray(customersRemote) ? (customersRemote as CustomerOption[]) : []),
|
() => (Array.isArray(customersRemote) ? (customersRemote as CustomerOption[]) : []),
|
||||||
[customersRemote]
|
[customersRemote]
|
||||||
|
|
|
||||||
|
|
@ -33,13 +33,13 @@ export function PlayNextTicketCard({ context }: PlayNextTicketCardProps) {
|
||||||
const { convexUserId, isStaff } = useAuth()
|
const { convexUserId, isStaff } = useAuth()
|
||||||
const queuesEnabled = Boolean(isStaff && convexUserId)
|
const queuesEnabled = Boolean(isStaff && convexUserId)
|
||||||
const queueArgs = queuesEnabled ? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> } : undefined
|
const queueArgs = queuesEnabled ? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
const queueSummaryResult = useQuery(queuesEnabled ? api.queues.summary : "skip", queueArgs)
|
const queueSummaryResult = useQuery(queuesEnabled ? api.queues.summary : undefined, queueArgs)
|
||||||
const queueSummary: TicketQueueSummary[] = Array.isArray(queueSummaryResult) ? queueSummaryResult : []
|
const queueSummary: TicketQueueSummary[] = Array.isArray(queueSummaryResult) ? queueSummaryResult : []
|
||||||
const playNext = useMutation(api.tickets.playNext)
|
const playNext = useMutation(api.tickets.playNext)
|
||||||
const [selectedQueueId, setSelectedQueueId] = useState<string | undefined>(undefined)
|
const [selectedQueueId, setSelectedQueueId] = useState<string | undefined>(undefined)
|
||||||
|
|
||||||
const nextTicketFromServer = useQuery(
|
const nextTicketFromServer = useQuery(
|
||||||
api.tickets.list,
|
convexUserId ? api.tickets.list : undefined,
|
||||||
convexUserId
|
convexUserId
|
||||||
? {
|
? {
|
||||||
tenantId: DEFAULT_TENANT_ID,
|
tenantId: DEFAULT_TENANT_ID,
|
||||||
|
|
@ -50,7 +50,7 @@ export function PlayNextTicketCard({ context }: PlayNextTicketCardProps) {
|
||||||
queueId: (selectedQueueId as Id<"queues">) || undefined,
|
queueId: (selectedQueueId as Id<"queues">) || undefined,
|
||||||
limit: 1,
|
limit: 1,
|
||||||
}
|
}
|
||||||
: "skip"
|
: undefined
|
||||||
)?.[0]
|
)?.[0]
|
||||||
const nextTicketUi = nextTicketFromServer ? mapTicketFromServer(nextTicketFromServer as unknown) : null
|
const nextTicketUi = nextTicketFromServer ? mapTicketFromServer(nextTicketFromServer as unknown) : null
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ export function RecentTicketsPanel() {
|
||||||
const ticketsArgs = convexUserId
|
const ticketsArgs = convexUserId
|
||||||
? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users">, limit: 12 }
|
? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users">, limit: 12 }
|
||||||
: undefined
|
: undefined
|
||||||
const ticketsResult = useQuery(convexUserId ? api.tickets.list : "skip", ticketsArgs)
|
const ticketsResult = useQuery(convexUserId ? api.tickets.list : undefined, ticketsArgs)
|
||||||
const [enteringId, setEnteringId] = useState<string | null>(null)
|
const [enteringId, setEnteringId] = useState<string | null>(null)
|
||||||
const previousIdsRef = useRef<string[]>([])
|
const previousIdsRef = useRef<string[]>([])
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ export function TicketComments({ ticket }: TicketCommentsProps) {
|
||||||
convexUserId && isStaff
|
convexUserId && isStaff
|
||||||
? { tenantId: ticket.tenantId, viewerId: convexUserId as Id<"users">, kind: "comment" as const }
|
? { tenantId: ticket.tenantId, viewerId: convexUserId as Id<"users">, kind: "comment" as const }
|
||||||
: undefined
|
: undefined
|
||||||
const templatesResult = useQuery(convexUserId && isStaff ? api.commentTemplates.list : "skip", templateArgs)
|
const templatesResult = useQuery(convexUserId && isStaff ? api.commentTemplates.list : undefined, templateArgs)
|
||||||
const templates = Array.isArray(templatesResult)
|
const templates = Array.isArray(templatesResult)
|
||||||
? (templatesResult as { id: string; title: string; body: string }[])
|
? (templatesResult as { id: string; title: string; body: string }[])
|
||||||
: []
|
: []
|
||||||
|
|
|
||||||
|
|
@ -16,18 +16,16 @@ import { useAuth } from "@/lib/auth-client";
|
||||||
|
|
||||||
export function TicketDetailView({ id }: { id: string }) {
|
export function TicketDetailView({ id }: { id: string }) {
|
||||||
const { convexUserId } = useAuth();
|
const { convexUserId } = useAuth();
|
||||||
const shouldSkip = !convexUserId;
|
const canLoadTicket = Boolean(convexUserId);
|
||||||
const t = useQuery(
|
const queryArgs = canLoadTicket
|
||||||
api.tickets.getById,
|
? {
|
||||||
shouldSkip
|
|
||||||
? "skip"
|
|
||||||
: {
|
|
||||||
tenantId: DEFAULT_TENANT_ID,
|
tenantId: DEFAULT_TENANT_ID,
|
||||||
id: id as Id<"tickets">,
|
id: id as Id<"tickets">,
|
||||||
viewerId: convexUserId as Id<"users">,
|
viewerId: convexUserId as Id<"users">,
|
||||||
}
|
}
|
||||||
);
|
: undefined;
|
||||||
const isLoading = shouldSkip || t === undefined;
|
const t = useQuery(canLoadTicket ? api.tickets.getById : undefined, queryArgs);
|
||||||
|
const isLoading = !convexUserId || t === undefined;
|
||||||
|
|
||||||
if (isLoading) {
|
if (isLoading) {
|
||||||
return (
|
return (
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ export function TicketQueueSummaryCards({ queues }: TicketQueueSummaryProps) {
|
||||||
const { convexUserId, isStaff } = useAuth()
|
const { convexUserId, isStaff } = useAuth()
|
||||||
const enabled = Boolean(isStaff && convexUserId)
|
const enabled = Boolean(isStaff && convexUserId)
|
||||||
const queueArgs = enabled ? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> } : undefined
|
const queueArgs = enabled ? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
const fromServer = useQuery(enabled ? api.queues.summary : "skip", queueArgs)
|
const fromServer = useQuery(enabled ? api.queues.summary : undefined, queueArgs)
|
||||||
const serverData = Array.isArray(fromServer) ? fromServer : undefined
|
const serverData = Array.isArray(fromServer) ? fromServer : undefined
|
||||||
const data: TicketQueueSummary[] = queues ?? serverData ?? []
|
const data: TicketQueueSummary[] = queues ?? serverData ?? []
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -170,10 +170,7 @@ export function TicketSummaryHeader({ ticket }: TicketHeaderProps) {
|
||||||
const companiesArgs = convexUserId
|
const companiesArgs = convexUserId
|
||||||
? { tenantId: ticket.tenantId, viewerId: convexUserId as Id<"users"> }
|
? { tenantId: ticket.tenantId, viewerId: convexUserId as Id<"users"> }
|
||||||
: undefined
|
: undefined
|
||||||
const companiesRemote = useQuery(
|
const companiesRemote = useQuery(convexUserId ? api.companies.list : undefined, companiesArgs)
|
||||||
convexUserId ? api.companies.list : "skip",
|
|
||||||
companiesArgs
|
|
||||||
)
|
|
||||||
const companies = useMemo(
|
const companies = useMemo(
|
||||||
() =>
|
() =>
|
||||||
(Array.isArray(companiesRemote) ? companiesRemote : []).map((company) => ({
|
(Array.isArray(companiesRemote) ? companiesRemote : []).map((company) => ({
|
||||||
|
|
@ -187,10 +184,7 @@ export function TicketSummaryHeader({ ticket }: TicketHeaderProps) {
|
||||||
const customersArgs = convexUserId
|
const customersArgs = convexUserId
|
||||||
? { tenantId: ticket.tenantId, viewerId: convexUserId as Id<"users"> }
|
? { tenantId: ticket.tenantId, viewerId: convexUserId as Id<"users"> }
|
||||||
: undefined
|
: undefined
|
||||||
const customersRemote = useQuery(
|
const customersRemote = useQuery(convexUserId ? api.users.listCustomers : undefined, customersArgs)
|
||||||
convexUserId ? api.users.listCustomers : "skip",
|
|
||||||
customersArgs
|
|
||||||
)
|
|
||||||
const customers = useMemo(
|
const customers = useMemo(
|
||||||
() => (Array.isArray(customersRemote) ? (customersRemote as CustomerOption[]) : []),
|
() => (Array.isArray(customersRemote) ? (customersRemote as CustomerOption[]) : []),
|
||||||
[customersRemote]
|
[customersRemote]
|
||||||
|
|
@ -199,14 +193,14 @@ export function TicketSummaryHeader({ ticket }: TicketHeaderProps) {
|
||||||
const queueArgs = queuesEnabled
|
const queueArgs = queuesEnabled
|
||||||
? { tenantId: ticket.tenantId, viewerId: convexUserId as Id<"users"> }
|
? { tenantId: ticket.tenantId, viewerId: convexUserId as Id<"users"> }
|
||||||
: undefined
|
: undefined
|
||||||
const queuesResult = useQuery(queuesEnabled ? api.queues.summary : "skip", queueArgs)
|
const queuesResult = useQuery(queuesEnabled ? api.queues.summary : undefined, queueArgs)
|
||||||
const queues: TicketQueueSummary[] = Array.isArray(queuesResult) ? queuesResult : []
|
const queues: TicketQueueSummary[] = Array.isArray(queuesResult) ? queuesResult : []
|
||||||
const { categories, isLoading: categoriesLoading } = useTicketCategories(ticket.tenantId)
|
const { categories, isLoading: categoriesLoading } = useTicketCategories(ticket.tenantId)
|
||||||
const workSummaryArgs = convexUserId
|
const workSummaryArgs = convexUserId
|
||||||
? { ticketId: ticket.id as Id<"tickets">, viewerId: convexUserId as Id<"users"> }
|
? { ticketId: ticket.id as Id<"tickets">, viewerId: convexUserId as Id<"users"> }
|
||||||
: undefined
|
: undefined
|
||||||
const workSummaryRemote = useQuery(
|
const workSummaryRemote = useQuery(
|
||||||
convexUserId ? api.tickets.workSummary : "skip",
|
convexUserId ? api.tickets.workSummary : undefined,
|
||||||
workSummaryArgs
|
workSummaryArgs
|
||||||
) as
|
) as
|
||||||
| {
|
| {
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,7 @@ export function TicketsView({ initialFilters }: TicketsViewProps = {}) {
|
||||||
|
|
||||||
const queuesEnabled = Boolean(isStaff && convexUserId)
|
const queuesEnabled = Boolean(isStaff && convexUserId)
|
||||||
const queueArgs = queuesEnabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
const queueArgs = queuesEnabled ? { tenantId, viewerId: convexUserId as Id<"users"> } : undefined
|
||||||
const queuesResult = useQuery(queuesEnabled ? api.queues.summary : "skip", queueArgs)
|
const queuesResult = useQuery(queuesEnabled ? api.queues.summary : undefined, queueArgs)
|
||||||
const queues: TicketQueueSummary[] = Array.isArray(queuesResult) ? queuesResult : []
|
const queues: TicketQueueSummary[] = Array.isArray(queuesResult) ? queuesResult : []
|
||||||
const agents = useQuery(api.users.listAgents, { tenantId }) as { _id: string; name: string }[] | undefined
|
const agents = useQuery(api.users.listAgents, { tenantId }) as { _id: string; name: string }[] | undefined
|
||||||
const ticketsArgs = convexUserId
|
const ticketsArgs = convexUserId
|
||||||
|
|
@ -81,7 +81,7 @@ export function TicketsView({ initialFilters }: TicketsViewProps = {}) {
|
||||||
search: filters.search || undefined,
|
search: filters.search || undefined,
|
||||||
}
|
}
|
||||||
: undefined
|
: undefined
|
||||||
const ticketsRaw = useQuery(convexUserId ? api.tickets.list : "skip", ticketsArgs)
|
const ticketsRaw = useQuery(convexUserId ? api.tickets.list : undefined, ticketsArgs)
|
||||||
|
|
||||||
const tickets = useMemo(
|
const tickets = useMemo(
|
||||||
() => mapTicketsFromServerList(Array.isArray(ticketsRaw) ? (ticketsRaw as unknown[]) : []),
|
() => mapTicketsFromServerList(Array.isArray(ticketsRaw) ? (ticketsRaw as unknown[]) : []),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue