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

feat(portal): enable ticket reopen and improve loading UX

Browse source
This commit is contained in:
Esdras Renan 2025-11-14 13:08:59 -03:00
parent 8b905dc467
commit 50a80f5244
4 changed files with 40 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/components/portal/portal-ticket-detail.tsx
View file

@ -276,6 +276,10 @@ export function PortalTicketDetail({ ticketId }: PortalTicketDetailProps) {
)
const viewerId = convexUserId ?? null
const viewerRole = role ?? ""
const viewerEmailRaw = session?.user?.email ?? machineContext?.assignedUserEmail ?? null
const viewerEmail = (viewerEmailRaw ?? "").trim().toLowerCase()
const rawReopenDeadline = ticket?.reopenDeadline ?? null
const DEFAULT_REOPEN_DAYS = 7
@ -285,8 +289,19 @@ export function PortalTicketDetail({ ticketId }: PortalTicketDetailProps) {
: fallbackClosedMs
? fallbackClosedMs + DEFAULT_REOPEN_DAYS * 24 * 60 * 60 * 1000
: null
const isRequesterById = Boolean(ticket?.requester?.id && viewerId && ticket.requester.id === viewerId)
const isRequesterByEmail = Boolean(
viewerEmail && ticket?.requester?.email && viewerEmail === ticket.requester.email.trim().toLowerCase()
)
const isRequester = isRequesterById || isRequesterByEmail
const reopenWindowActive = inferredDeadline ? inferredDeadline > Date.now() : true
const canReopenTicket = !!ticket && ticket.status === "RESOLVED" && reopenWindowActive
const canReopenTicket =
!!ticket &&
ticket.status === "RESOLVED" &&
reopenWindowActive &&
(isStaff || viewerRole === "manager" || isRequester)
const reopenDeadlineLabel = useMemo(() => {
const deadline = inferredDeadline ?? rawReopenDeadline
if (!deadline) return null

21
src/components/portal/portal-ticket-list.tsx
View file

@ -1,6 +1,6 @@
"use client"
import { useMemo, useState } from "react"
import { useEffect, useMemo, useState } from "react"
import { useQuery } from "convex/react"
import { api } from "@/convex/_generated/api"
import type { Id } from "@/convex/_generated/dataModel"
@ -21,7 +21,7 @@ import {
} from "@/components/portal/portal-ticket-filters"
export function PortalTicketList() {
const { convexUserId, session, machineContext, role, isLoading: authLoading, machineContextLoading } = useAuth()
const { convexUserId, session, machineContext, role } = useAuth()
const viewerId = (convexUserId ?? machineContext?.assignedUserId ?? null) as Id<"users"> | null
@ -41,6 +41,15 @@ export function PortalTicketList() {
return mapTicketsFromServerList((ticketsRaw as unknown[]) ?? [])
}, [ticketsRaw])
const [initialLoadCompleted, setInitialLoadCompleted] = useState(false)
useEffect(() => {
if (initialLoadCompleted) return
if (!viewerId) return
if (ticketsRaw === undefined) return
setInitialLoadCompleted(true)
}, [initialLoadCompleted, viewerId, ticketsRaw])
const [filters, setFilters] = useState<PortalTicketFiltersState>(defaultPortalTicketFilters)
// No app desktop, colaboradores e gestores não devem ver filtros avançados
@ -145,13 +154,7 @@ export function PortalTicketList() {
setFilters(defaultPortalTicketFilters)
}
const hasAuthContext = Boolean(session || machineContext)
const isLoading = Boolean(
authLoading ||
machineContextLoading ||
(hasAuthContext && !viewerId) ||
(viewerId && ticketsRaw === undefined)
)
const isLoading = !initialLoadCompleted
if (isLoading) {
return (