Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

show quota exceeded cards correctly #7868

Merged
merged 3 commits into from
Mar 1, 2024
Merged

show quota exceeded cards correctly #7868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b31fc67
show quota exceeded cards correctly
Vadman97 Feb 29, 2024
009a65a
fix overage card logic
Vadman97 Feb 29, 2024
5bf0adf
build docker images in all prs
Vadman97 Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Publish Production Docker Images

on:
workflow_dispatch:
pull_request:
types: [opened, synchronize]
release:
types: [published]

Expand Down
81 changes: 59 additions & 22 deletions frontend/src/pages/Billing/utils/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ import moment from 'moment'
import { GetBillingDetailsForProjectQuery } from '@/graph/generated/operations'

import {
BillingDetails,
Maybe,
Plan,
PlanType,
ProductType,
RetentionPeriod,
Expand Down Expand Up @@ -67,28 +69,63 @@ export const RETENTION_PERIOD_LABELS: { [K in RetentionPeriod]: string } = {
}

export const getMeterAmounts = (
data: GetBillingDetailsForProjectQuery,
details:
| Maybe<
{ __typename?: 'BillingDetails' } & Pick<
BillingDetails,
| 'meter'
| 'membersMeter'
| 'errorsMeter'
| 'logsMeter'
| 'tracesMeter'
| 'sessionsBillingLimit'
| 'errorsBillingLimit'
| 'logsBillingLimit'
| 'tracesBillingLimit'
> & {
plan: { __typename?: 'Plan' } & Pick<
Plan,
| 'type'
| 'interval'
| 'membersLimit'
| 'sessionsLimit'
| 'errorsLimit'
| 'logsLimit'
| 'tracesLimit'
| 'sessionsRate'
| 'errorsRate'
| 'logsRate'
| 'tracesRate'
>
}
>
| undefined
| null,
): { [K in ProductType]: [number, number | undefined] } => {
const sessionsMeter = data.billingDetailsForProject?.meter ?? 0
const sessionsQuota = data.billingDetailsForProject?.sessionsBillingLimit
? data.billingDetailsForProject.plan.sessionsLimit +
(data.billingDetailsForProject.sessionsBillingLimit ?? 0)
: undefined
const errorsMeter = data.billingDetailsForProject?.errorsMeter ?? 0
const errorsQuota = data.billingDetailsForProject?.errorsBillingLimit
? data.billingDetailsForProject.plan.errorsLimit +
(data.billingDetailsForProject.errorsBillingLimit ?? 0)
: undefined
const logsMeter = data.billingDetailsForProject?.logsMeter ?? 0
const logsQuota = data.billingDetailsForProject?.logsBillingLimit
? data.billingDetailsForProject.plan.logsLimit +
(data.billingDetailsForProject.logsBillingLimit ?? 0)
: undefined
const tracesMeter = data.billingDetailsForProject?.tracesMeter ?? 0
const tracesQuota = data.billingDetailsForProject?.tracesBillingLimit
? data.billingDetailsForProject.plan.tracesLimit +
(data.billingDetailsForProject.tracesBillingLimit ?? 0)
: undefined
if (!details) {
return {
[ProductType.Sessions]: [0, undefined],
[ProductType.Errors]: [0, undefined],
[ProductType.Logs]: [0, undefined],
[ProductType.Traces]: [0, undefined],
}
}
const sessionsMeter = details?.meter ?? 0
const sessionsQuota = details?.sessionsBillingLimit
? details?.sessionsBillingLimit
: details?.plan.sessionsLimit
const errorsMeter = details?.errorsMeter ?? 0
const errorsQuota = details?.errorsBillingLimit
? details?.errorsBillingLimit
: details?.plan.errorsLimit
const logsMeter = details?.logsMeter ?? 0
const logsQuota = details?.logsBillingLimit
? details?.logsBillingLimit
: details?.plan.logsLimit
const tracesMeter = details?.tracesMeter ?? 0
const tracesQuota = details?.tracesBillingLimit
? details?.tracesBillingLimit
: details?.plan.tracesLimit
return {
[ProductType.Sessions]: [sessionsMeter, sessionsQuota],
[ProductType.Errors]: [errorsMeter, errorsQuota],
Expand All @@ -100,7 +137,7 @@ export const getMeterAmounts = (
export const getQuotaPercents = (
data: GetBillingDetailsForProjectQuery,
): [ProductType, number][] => {
const amts = getMeterAmounts(data)
const amts = getMeterAmounts(data.billingDetailsForProject)
const sessionAmts = amts[ProductType.Sessions]
const errorAmts = amts[ProductType.Errors]
const logAmts = amts[ProductType.Logs]
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/LogsPage/OverageCard/OverageCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const OverageCard = ({ productType }: Props) => {
)
}

const meters = getMeterAmounts(data)
const meters = getMeterAmounts(data.billingDetails)
const meter = meters[productType][0]
const quota = meters[productType][1]
if (quota === undefined || meter < quota) {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/Sessions/SessionsFeedV3/OverageCard/OverageCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const OverageCard = ({ productType }: Props) => {
)
}

const meters = getMeterAmounts(data)
const meters = getMeterAmounts(data.billingDetails)
const meter = meters[productType][0]
const quota = meters[productType][1]
if (quota === undefined || meter < quota) {
Expand Down
Loading