refactor: use Convex skip sentinel in query args
This commit is contained in:
parent
3de7eccaa8
commit
bd2f22d046
32 changed files with 167 additions and 157 deletions
|
|
@ -126,12 +126,11 @@ export function NewTicketDialog({ triggerClassName }: { triggerClassName?: strin
|
|||
})
|
||||
const { convexUserId, isStaff, role } = useAuth()
|
||||
const queuesEnabled = Boolean(isStaff && convexUserId)
|
||||
const queueArgs = queuesEnabled
|
||||
? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> }
|
||||
: undefined
|
||||
|
||||
useDefaultQueues(DEFAULT_TENANT_ID)
|
||||
const queuesRemote = useQuery(queuesEnabled ? api.queues.summary : undefined, queueArgs)
|
||||
const queuesRemote = useQuery(
|
||||
api.queues.summary,
|
||||
queuesEnabled ? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> } : "skip"
|
||||
)
|
||||
const queues = useMemo(
|
||||
() => (Array.isArray(queuesRemote) ? (queuesRemote as TicketQueueSummary[]) : []),
|
||||
[queuesRemote]
|
||||
|
|
@ -145,10 +144,10 @@ export function NewTicketDialog({ triggerClassName }: { triggerClassName?: strin
|
|||
)
|
||||
|
||||
const directoryQueryEnabled = queuesEnabled && Boolean(convexUserId)
|
||||
const companiesArgs = directoryQueryEnabled
|
||||
? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> }
|
||||
: undefined
|
||||
const companiesRemote = useQuery(directoryQueryEnabled ? api.companies.list : undefined, companiesArgs)
|
||||
const companiesRemote = useQuery(
|
||||
api.companies.list,
|
||||
directoryQueryEnabled ? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> } : "skip"
|
||||
)
|
||||
const companies = useMemo(
|
||||
() =>
|
||||
(Array.isArray(companiesRemote) ? companiesRemote : []).map((company) => ({
|
||||
|
|
@ -159,10 +158,10 @@ export function NewTicketDialog({ triggerClassName }: { triggerClassName?: strin
|
|||
[companiesRemote]
|
||||
)
|
||||
|
||||
const customersArgs = directoryQueryEnabled
|
||||
? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> }
|
||||
: undefined
|
||||
const customersRemote = useQuery(directoryQueryEnabled ? api.users.listCustomers : undefined, customersArgs)
|
||||
const customersRemote = useQuery(
|
||||
api.users.listCustomers,
|
||||
directoryQueryEnabled ? { tenantId: DEFAULT_TENANT_ID, viewerId: convexUserId as Id<"users"> } : "skip"
|
||||
)
|
||||
const customers = useMemo(
|
||||
() => (Array.isArray(customersRemote) ? (customersRemote as CustomerOption[]) : []),
|
||||
[customersRemote]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue