diff --git a/src/components/ui/AicNetCostInfoTip.tsx b/src/components/ui/AicNetCostInfoTip.tsx index 78eed6f..286804b 100644 --- a/src/components/ui/AicNetCostInfoTip.tsx +++ b/src/components/ui/AicNetCostInfoTip.tsx @@ -1,6 +1,6 @@ import { InfoTip } from '../InfoTip' -const AIC_NET_COST_INFO = 'All values are provided without any additional negotiated discounts applied.' +const AIC_NET_COST_INFO = 'All values are provided without any existing discounts.' export function AicNetCostInfoTip() { return ( diff --git a/src/components/ui/BillingTotalsCards.tsx b/src/components/ui/BillingTotalsCards.tsx index 6c3c90a..609b8f2 100644 --- a/src/components/ui/BillingTotalsCards.tsx +++ b/src/components/ui/BillingTotalsCards.tsx @@ -1,7 +1,7 @@ import { appLinks } from '../../config/links' import type { IndividualPlanUpgradeRecommendation } from '../../utils/individualPlanUpgrade' import { formatAic, formatUsd } from '../../utils/format' -import { NegotiatedDiscountDisclaimer } from './NegotiatedDiscountDisclaimer' +import { ExistingDiscountDisclaimer } from './ExistingDiscountDisclaimer' import { PromotionalDataDisclaimer } from './PromotionalDataDisclaimer' export type BillingTotalsCardsProps = { @@ -18,7 +18,7 @@ export type BillingTotalsCardsProps = { business: number enterprise: number } - showNegotiatedDiscountDisclaimer?: boolean + showExistingDiscountDisclaimer?: boolean showPromotionalDataDisclaimer?: boolean upgradeRecommendation?: IndividualPlanUpgradeRecommendation | null className?: string @@ -35,7 +35,7 @@ export function BillingTotalsCards({ aicQuantity, licenseAmount, licenseSeatCounts, - showNegotiatedDiscountDisclaimer = false, + showExistingDiscountDisclaimer = false, showPromotionalDataDisclaimer = false, upgradeRecommendation = null, className = '', @@ -89,7 +89,7 @@ export function BillingTotalsCards({ {formatUsd(licenseAmount)} )} - {(licenseAmount !== undefined || showNegotiatedDiscountDisclaimer) && ( + {(licenseAmount !== undefined || showExistingDiscountDisclaimer) && (
{licenseAmount !== undefined && (
@@ -97,7 +97,7 @@ export function BillingTotalsCards({ {formatUsd(pruTotalAmount)}
)} - {showNegotiatedDiscountDisclaimer && } + {showExistingDiscountDisclaimer && }
)} @@ -128,7 +128,7 @@ export function BillingTotalsCards({ {formatUsd(licenseAmount)} )} - {(licenseAmount !== undefined || showNegotiatedDiscountDisclaimer || showPromotionalDataDisclaimer) && ( + {(licenseAmount !== undefined || showExistingDiscountDisclaimer || showPromotionalDataDisclaimer) && (
{licenseAmount !== undefined && (
@@ -136,9 +136,9 @@ export function BillingTotalsCards({ {formatUsd(aicTotalAmount)}
)} - {showNegotiatedDiscountDisclaimer && ( + {showExistingDiscountDisclaimer && ( <> - + )} diff --git a/src/components/ui/ExistingDiscountDisclaimer.tsx b/src/components/ui/ExistingDiscountDisclaimer.tsx new file mode 100644 index 0000000..7f5334b --- /dev/null +++ b/src/components/ui/ExistingDiscountDisclaimer.tsx @@ -0,0 +1,13 @@ +export const EXISTING_DISCOUNT_DISCLAIMER = 'All values are provided without any existing discounts.' + +type ExistingDiscountDisclaimerProps = { + className?: string +} + +export function ExistingDiscountDisclaimer({ className = '' }: ExistingDiscountDisclaimerProps) { + return ( +

+ {EXISTING_DISCOUNT_DISCLAIMER} +

+ ) +} diff --git a/src/components/ui/NegotiatedDiscountDisclaimer.tsx b/src/components/ui/NegotiatedDiscountDisclaimer.tsx deleted file mode 100644 index 147aa23..0000000 --- a/src/components/ui/NegotiatedDiscountDisclaimer.tsx +++ /dev/null @@ -1,13 +0,0 @@ -export const NEGOTIATED_DISCOUNT_DISCLAIMER = 'All values are provided without any additional negotiated discounts applied.' - -type NegotiatedDiscountDisclaimerProps = { - className?: string -} - -export function NegotiatedDiscountDisclaimer({ className = '' }: NegotiatedDiscountDisclaimerProps) { - return ( -

- {NEGOTIATED_DISCOUNT_DISCLAIMER} -

- ) -} diff --git a/src/components/ui/index.ts b/src/components/ui/index.ts index dd5b34b..c48ceb7 100644 --- a/src/components/ui/index.ts +++ b/src/components/ui/index.ts @@ -8,5 +8,5 @@ export { BillingTotalsCards } from './BillingTotalsCards' export type { BillingTotalsCardsProps } from './BillingTotalsCards' export { BillingProjectionDisclaimer } from './BillingProjectionDisclaimer' export { AicNetCostInfoTip } from './AicNetCostInfoTip' -export { NegotiatedDiscountDisclaimer, NEGOTIATED_DISCOUNT_DISCLAIMER } from './NegotiatedDiscountDisclaimer' +export { ExistingDiscountDisclaimer, EXISTING_DISCOUNT_DISCLAIMER } from './ExistingDiscountDisclaimer' export { PromotionalDataDisclaimer } from './PromotionalDataDisclaimer' diff --git a/src/views/CostCentersView.tsx b/src/views/CostCentersView.tsx index 004b365..eab02a5 100644 --- a/src/views/CostCentersView.tsx +++ b/src/views/CostCentersView.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo, useState } from 'react' import type { ChangeEvent } from 'react' -import { BillingProjectionDisclaimer, NegotiatedDiscountDisclaimer } from '../components/ui' +import { BillingProjectionDisclaimer, ExistingDiscountDisclaimer } from '../components/ui' import { th, thNum, td, tdNum } from '../components/ui/tableStyles' import { appLinks } from '../config/links' import type { CostCenterResult, CostCenterUserTotals, CostTotals } from '../pipeline/aggregators/costCenterAggregator' @@ -145,7 +145,7 @@ export function CostCentersView({ data, rangeStart }: { data: CostCenterResult; Overages {formatUsd(totals.netAmount)}
- +
@@ -166,7 +166,7 @@ export function CostCentersView({ data, rangeStart }: { data: CostCenterResult; Additional usage {formatUsd(totals.aicNetAmount)}
- + diff --git a/src/views/CostManagementView.tsx b/src/views/CostManagementView.tsx index c0c3f96..95eab14 100644 --- a/src/views/CostManagementView.tsx +++ b/src/views/CostManagementView.tsx @@ -231,7 +231,7 @@ export function CostManagementView({ aicQuantity={currentAicQuantity} licenseAmount={licenseAmount} licenseSeatCounts={licenseSeatCounts} - showNegotiatedDiscountDisclaimer={!isIndividualReport} + showExistingDiscountDisclaimer={!isIndividualReport} showPromotionalDataDisclaimer={isIndividualReport} upgradeRecommendation={upgradeRecommendation} /> diff --git a/src/views/ModelsView.tsx b/src/views/ModelsView.tsx index 86ffd29..619f02a 100644 --- a/src/views/ModelsView.tsx +++ b/src/views/ModelsView.tsx @@ -2,7 +2,7 @@ import { useState, useMemo } from 'react' import { InfoIcon } from '@primer/octicons-react' import type { ModelUsageResult, ModelDailyUsageData, ModelUsageTotals } from '../pipeline/aggregators/modelUsageAggregator' import { DualAxisLineChart, MultiSeriesStackedBarChart } from '../components' -import { BillingProjectionDisclaimer, NegotiatedDiscountDisclaimer, PromotionalDataDisclaimer } from '../components/ui' +import { BillingProjectionDisclaimer, ExistingDiscountDisclaimer, PromotionalDataDisclaimer } from '../components/ui' import { th, thNum, td, tdNum } from '../components/ui/tableStyles' import { calculateAicDiscountAmount, calculateSavingsDifference } from '../utils/billingComparison' import { fillDataForRange } from '../utils/fillDataForRange' @@ -122,7 +122,7 @@ export function ModelsView({ modelUsage, isIndividualReport, rangeStart, rangeEn const periodLabel = rangeStart ? new Date(rangeStart + 'T00:00:00').toLocaleString('en-US', { month: 'long', year: 'numeric' }) : null - const showNegotiatedDiscountDisclaimer = !isIndividualReport + const showExistingDiscountDisclaimer = !isIndividualReport return (
@@ -220,7 +220,7 @@ export function ModelsView({ modelUsage, isIndividualReport, rangeStart, rangeEn Overages {formatUsd(selectedModelTotals.netAmount)} - {showNegotiatedDiscountDisclaimer && } + {showExistingDiscountDisclaimer && }
@@ -241,7 +241,7 @@ export function ModelsView({ modelUsage, isIndividualReport, rangeStart, rangeEn Additional usage {formatUsd(selectedModelAicNetAmount)}
- {showNegotiatedDiscountDisclaimer ? : } + {showExistingDiscountDisclaimer ? : } diff --git a/src/views/OrganizationsView.tsx b/src/views/OrganizationsView.tsx index adf38ad..aac9dee 100644 --- a/src/views/OrganizationsView.tsx +++ b/src/views/OrganizationsView.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo, useState } from 'react' import type { ChangeEvent } from 'react' -import { BillingProjectionDisclaimer, NegotiatedDiscountDisclaimer } from '../components/ui' +import { BillingProjectionDisclaimer, ExistingDiscountDisclaimer } from '../components/ui' import { th, thNum, td, tdNum } from '../components/ui/tableStyles' import { appLinks } from '../config/links' import type { OrganizationResult, OrgTotals, OrgUserTotals } from '../pipeline/aggregators/organizationAggregator' @@ -144,7 +144,7 @@ export function OrganizationsView({ data, rangeStart }: { data: OrganizationResu Overages {formatUsd(totals.netAmount)} - +
@@ -165,7 +165,7 @@ export function OrganizationsView({ data, rangeStart }: { data: OrganizationResu Additional usage {formatUsd(totals.aicNetAmount)}
- + diff --git a/src/views/OverviewView.tsx b/src/views/OverviewView.tsx index a8fc727..30f7208 100644 --- a/src/views/OverviewView.tsx +++ b/src/views/OverviewView.tsx @@ -135,7 +135,7 @@ export function OverviewView({ aicQuantity={overviewTotals.aicQuantity} licenseAmount={licenseAmount} licenseSeatCounts={licenseSeatCounts} - showNegotiatedDiscountDisclaimer={reportPlanScope !== 'individual'} + showExistingDiscountDisclaimer={reportPlanScope !== 'individual'} showPromotionalDataDisclaimer={reportPlanScope === 'individual'} upgradeRecommendation={upgradeRecommendation} className="mb-3" diff --git a/src/views/UserDetailsView.tsx b/src/views/UserDetailsView.tsx index 0f24e38..93a1b87 100644 --- a/src/views/UserDetailsView.tsx +++ b/src/views/UserDetailsView.tsx @@ -6,7 +6,7 @@ import { calculateAicDiscountAmount, calculateSavingsDifference } from '../utils import { fillDataForRange } from '../utils/fillDataForRange' import { formatAic } from '../utils/format' import { getUserSpendSegmentLabel } from '../utils/userSpendSegments' -import { BillingProjectionDisclaimer, NegotiatedDiscountDisclaimer, PromotionalDataDisclaimer } from '../components/ui' +import { BillingProjectionDisclaimer, ExistingDiscountDisclaimer, PromotionalDataDisclaimer } from '../components/ui' import { th, thNum, td, tdNum } from '../components/ui/tableStyles' type DailySummaryModelRow = { @@ -179,8 +179,8 @@ export function UserDetailsView({ const aicDiscountAmount = user ? calculateAicDiscountAmount(user.totals.aicGrossAmount, user.totals.aicNetAmount) : 0 const savings = user ? calculateSavingsDifference(user.totals.netAmount, user.totals.aicNetAmount) : 0 const planLabel = user ? getPlanLabel(user.totalMonthlyQuota, reportPlanScope) : null - const showNegotiatedDiscountDisclaimer = reportPlanScope !== 'individual' - const spendSegmentLabel = user && showNegotiatedDiscountDisclaimer ? getUserSpendSegmentLabel(user.spendSegment) : null + const showExistingDiscountDisclaimer = reportPlanScope !== 'individual' + const spendSegmentLabel = user && showExistingDiscountDisclaimer ? getUserSpendSegmentLabel(user.spendSegment) : null if (!user) { return ( @@ -271,7 +271,7 @@ export function UserDetailsView({ Overages {formatCost(user.totals.netAmount)} - {showNegotiatedDiscountDisclaimer && } + {showExistingDiscountDisclaimer && }
@@ -292,7 +292,7 @@ export function UserDetailsView({ Additional usage {formatCost(user.totals.aicNetAmount)}
- {showNegotiatedDiscountDisclaimer ? : } + {showExistingDiscountDisclaimer ? : }