Merge pull request #296 from AmbireTech/bidding-mode

add filter by placement for admin  analytics

src/components/AdminPanel/AdminAnalytics.tsx

@@ -61,6 +61,14 @@ const sspsData: Array<{ value: SSPs; label: string }> = [
   { value: 'Qortex', label: 'Qortex' }
 ]
 
+type Placements = '' | 'app' | 'site'
+
+const placementData: Array<{ value: Placements; label: string }> = [
+  { value: '', label: 'All Placements' },
+  { value: 'app', label: 'App' },
+  { value: 'site', label: 'Site' }
+]
+
 const mapSegmentLabel = (analType: AnalyticsType, segment: string): { segementLabel: string } => {
   let segementLabel = segment
 
@@ -103,6 +111,7 @@ const AdminAnalytics = () => {
   const [timeframe, setTimeframe] = useState<Timeframe>('month')
   const [analType, setAnalType] = useState<AnalyticsType>('ssp')
   const [ssp, setSsp] = useState<SSPs>('')
+  const [placement, setPlacement] = useState<Placements>('')
   const [startDate, setStartDate] = useState<Date | null>(
     dayjs().subtract(1, 'month').startOf('month').toDate()
   )
@@ -151,14 +160,15 @@ const AdminAnalytics = () => {
         timeframe,
         startDate || undefined,
         end || undefined,
-        ssp || undefined
+        ssp || undefined,
+        placement || undefined
       )
       setAnalyticsKey(key)
       console.log('key', key)
     }
 
     checkAnalytics()
-  }, [analType, getAnalyticsKeyAndUpdate, ssp, startDate, timeframe])
+  }, [analType, getAnalyticsKeyAndUpdate, placement, ssp, startDate, timeframe])
 
   const loading = useMemo(() => adminMappedAnalytics?.status === 'loading', [adminMappedAnalytics])
 
@@ -242,6 +252,14 @@ const AdminAnalytics = () => {
           data={sspsData}
           size="md"
         />
+        <Select
+          label="Placement"
+          value={placement}
+          // @ts-ignore
+          onChange={(val) => setPlacement(val as Placements)}
+          data={placementData}
+          size="md"
+        />
         <Select
           label="Period"
           value={timeframe}

src/contexts/CampaignsContext/CampaignsAnalyticsContext.tsx

@@ -1,4 +1,4 @@
-import { Campaign } from 'adex-common'
+import { Campaign, Placement } from 'adex-common'
 import {
   createContext,
   FC,
@@ -153,7 +153,8 @@ interface ICampaignsAnalyticsContext {
     timeframe?: Timeframe,
     startFrom?: Date,
     endTo?: Date,
-    ssp?: SSPs
+    ssp?: SSPs,
+    placement?: Placement
   ) => Promise<{ key: string; period: AnalyticsPeriod } | undefined>
   initialAnalyticsLoading: boolean
   mappedAnalytics: Map<string, MappedAnalyticsRecord>
@@ -238,7 +239,8 @@ const CampaignsAnalyticsProvider: FC<PropsWithChildren> = ({ children }) => {
       selectedTimeframe?: Timeframe,
       startFrom?: Date,
       endTo?: Date,
-      ssp?: SSPs
+      ssp?: SSPs,
+      placement?: Placement
     ): Promise<{ key: string; period: AnalyticsPeriod } | undefined> => {
       if (!analyticsType || (!forAdmin && !campaign?.id)) {
         return
@@ -286,6 +288,7 @@ const CampaignsAnalyticsProvider: FC<PropsWithChildren> = ({ children }) => {
         timezone: 'UTC',
         timeframe,
         ...{ ssp },
+        ...{ placement },
         segmentBy: analyticsType === 'timeframe' ? undefined : analyticsType
       }