Skip to content

Commit 9ac73bb

Browse files
authored
fix(billing): gate org billing query to invite modal open state and allow GA doubleclick in CSP (#4328)
* fix(billing): gate org billing query to invite modal open state and allow GA doubleclick in CSP * fix(csp): drop redundant stats.g.doubleclick.net entry
1 parent 18a559b commit 9ac73bb

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ export function InviteModal({
7979
const { data: pendingInvitations = [], isLoading: isPendingInvitationsLoading } =
8080
usePendingInvitations(open ? workspaceId : undefined)
8181

82-
const { data: organizationBillingData } = useOrganizationBilling(organizationId ?? '')
82+
const { data: organizationBillingData } = useOrganizationBilling(organizationId ?? '', {
83+
enabled: open,
84+
})
8385

8486
const batchSendInvitations = useBatchSendWorkspaceInvitations()
8587
const cancelInvitation = useCancelWorkspaceInvitation()

apps/sim/hooks/queries/organization.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,11 @@ async function fetchOrganizationBilling(orgId: string, signal?: AbortSignal) {
201201
/**
202202
* Hook to fetch organization billing data
203203
*/
204-
export function useOrganizationBilling(orgId: string) {
204+
export function useOrganizationBilling(orgId: string, options?: { enabled?: boolean }) {
205205
return useQuery({
206206
queryKey: organizationKeys.billing(orgId),
207207
queryFn: ({ signal }) => fetchOrganizationBilling(orgId, signal),
208-
enabled: !!orgId,
208+
enabled: !!orgId && (options?.enabled ?? true),
209209
retry: false,
210210
staleTime: 30 * 1000,
211211
placeholderData: keepPreviousData,

apps/sim/lib/core/security/csp.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ const STATIC_CONNECT_SRC = [
105105
'https://analytics.google.com',
106106
'https://www.google.com',
107107
'https://analytics.ahrefs.com',
108+
'https://*.g.doubleclick.net',
108109
]
109110
: []),
110111
] as const

0 commit comments

Comments
 (0)