Skip to content

Commit

Permalink
Merge pull request #318 from AmbireTech/common-stats-remove
Browse files Browse the repository at this point in the history
Common stats remove
  • Loading branch information
ivopaunov authored Dec 9, 2024
2 parents b16f379 + 89ebee1 commit 9d3a8ad
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 362 deletions.
6 changes: 0 additions & 6 deletions src/components/AdminPanel/AdminPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import Invoices from 'components/Billing/Invoices'
import AdminAnalytics from './AdminAnalytics'
import Accounts from './Accounts'
import SSPsAnalytics from './SSPsAnalytics'
import { SspStats } from './SspStats'
// import { AccountDetails } from './AccountDetails'

const AdminPanel = () => {
Expand All @@ -29,7 +28,6 @@ const AdminPanel = () => {
<Tabs.Tab value="invoices">Invoices</Tabs.Tab>
<Tabs.Tab value="validatorAnalytics">Validator Analytics</Tabs.Tab>
<Tabs.Tab value="sspAnalytics">SSPs Analytics</Tabs.Tab>
<Tabs.Tab value="sspStats">SSP stats</Tabs.Tab>
<Tabs.Tab value="accounts">Accounts</Tabs.Tab>
<Tabs.Tab value="user-account" disabled>
Account details
Expand All @@ -53,10 +51,6 @@ const AdminPanel = () => {
<SSPsAnalytics />
</Tabs.Panel>

<Tabs.Panel value="sspStats" pt="xs">
<SspStats />
</Tabs.Panel>

<Tabs.Panel value="accounts" pt="xs">
<Accounts />
</Tabs.Panel>
Expand Down
130 changes: 0 additions & 130 deletions src/components/AdminPanel/SspStats.tsx

This file was deleted.

31 changes: 23 additions & 8 deletions src/components/CreateCampaign/StepThree/StepThree.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import {
Radio,
Text,
TextInput,
SimpleGrid
SimpleGrid,
Tooltip,
ActionIcon
} from '@mantine/core'
import { useMemo } from 'react'
import useCreateCampaignContext from 'hooks/useCreateCampaignContext'
Expand Down Expand Up @@ -180,13 +182,26 @@ const StepThree = () => {
(learn more)
</DefaultCustomAnchor>
</Group>
<Checkbox
label="Bid on loose sources"
key={key('targetingInput.inputs.advanced.looseSourceCTR')}
{...getInputProps('targetingInput.inputs.advanced.looseSourceCTR', {
type: 'checkbox'
})}
/>
<Group>
<Checkbox
label="Bid on loose sources"
key={key('targetingInput.inputs.advanced.looseSourceCTR')}
{...getInputProps('targetingInput.inputs.advanced.looseSourceCTR', {
type: 'checkbox'
})}
/>
<Tooltip
multiline
maw={420}
label={`Enabling bidding on sources with a low Clickthrough Rate (CTR) increases the chances of winning bids
but may reduce the campaign’s overall CTR. This option is helpful for campaigns focused on brand awareness
rather than driving clicks.`}
>
<ActionIcon size="sm" variant="transparent">
<InfoIcon />
</ActionIcon>
</Tooltip>
</Group>
</Stack>

<TextInput
Expand Down
60 changes: 29 additions & 31 deletions src/components/EditCampaign/EditCampaign.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import {
Button,
Group,
Text,
Tooltip,
ActionIcon,
Checkbox,
NumberInput,
Paper,
Tabs,
SimpleGrid
SimpleGrid,
Tooltip,
ActionIcon
} from '@mantine/core'
import { useForm } from '@mantine/form'
import { modals } from '@mantine/modals'
Expand All @@ -25,20 +25,19 @@ import { parseBigNumTokenAmountToDecimal, parseToBigNumPrecision } from 'helpers

import {
campaignToCampaignUI,
findArrayWithLengthInObjectAsValue,
getRecommendedCPMRange
findArrayWithLengthInObjectAsValue
} from 'helpers/createCampaignHelpers'
import useAccount from 'hooks/useAccount'
import { useCallback, useEffect, useMemo } from 'react'
import { useCampaignsData } from 'hooks/useCampaignsData'
import type { Blocker, BlockerFunction } from 'react-router-dom'
import { useBlocker, useParams, useNavigate } from 'react-router-dom'
import InfoFilledIcon from 'resources/icons/InfoFilled'
import throttle from 'lodash.throttle'
import { defaultConfirmModalProps } from 'components/common/Modals/CustomConfirmModal'
import Placements from 'components/CampaignAnalytics/Placements'
import DefaultCustomAnchor from 'components/common/customAnchor'
import { CPMHelper } from 'components/CreateCampaign/StepThree/CpmHelper'
import InfoIcon from 'resources/icons/Info'

type TargetingInputEdit = {
version: string
Expand All @@ -63,12 +62,7 @@ const EditCampaign = ({ campaign, isAdmin }: { campaign: Campaign; isAdmin?: boo
} = useAccount()
const { tabValue = 'budget' } = useParams()
const navigate = useNavigate()
const { supplyStats, editCampaign } = useCampaignsData()

const recommendedPaymentBounds = useMemo(
() => getRecommendedCPMRange(supplyStats, campaign),
[campaign, supplyStats]
)
const { editCampaign } = useCampaignsData()

const form = useForm<FormProps>({
initialValues: {
Expand Down Expand Up @@ -273,19 +267,10 @@ const EditCampaign = ({ campaign, isAdmin }: { campaign: Campaign; isAdmin?: boo
<SimpleGrid cols={{ base: 1, xl: 2 }}>
<Stack gap="xl" w="100%">
<Stack gap="xs">
<Group gap="xs">
<Text c="secondaryText" size="sm" fw="bold">
CPM
</Text>
<Tooltip
label={`Recommended CPM: Min - ${recommendedPaymentBounds.min}; Max - ${recommendedPaymentBounds.max}`}
ml="sm"
>
<ActionIcon variant="transparent" color="secondaryText" size="xs">
<InfoFilledIcon />
</ActionIcon>
</Tooltip>
</Group>
<Text c="secondaryText" size="sm" fw="bold">
CPM
</Text>

<Group align="baseline" grow>
<NumberInput
w="196px"
Expand Down Expand Up @@ -358,12 +343,25 @@ const EditCampaign = ({ campaign, isAdmin }: { campaign: Campaign; isAdmin?: boo
(learn more)
</DefaultCustomAnchor>
</Group>
<Checkbox
label="Bid on loose sources"
{...form.getInputProps('targetingInput.inputs.advanced.looseSourceCTR', {
type: 'checkbox'
})}
/>
<Group>
<Checkbox
label="Bid on low CTR sources"
{...form.getInputProps('targetingInput.inputs.advanced.looseSourceCTR', {
type: 'checkbox'
})}
/>
<Tooltip
multiline
maw={420}
label={`Enabling bidding on sources with a low Clickthrough Rate (CTR) increases the chances of winning bids
but may reduce the campaign’s overall CTR. This option is helpful for campaigns focused on brand awareness
rather than driving clicks.`}
>
<ActionIcon size="sm" variant="transparent">
<InfoIcon />
</ActionIcon>
</Tooltip>
</Group>
</Stack>

<Button disabled={!form.isDirty()} size="lg" type="submit" maw={200}>
Expand Down
Loading

0 comments on commit 9d3a8ad

Please sign in to comment.