feat: usage period filter

frontend/common/types/requests.ts

@@ -22,6 +22,22 @@ export type PagedRequest<T> = T & {
 }
 export type OAuthType = 'github' | 'saml' | 'google'
 export type PermissionLevel = 'organisation' | 'project' | 'environment'
+export const billingPeriods = [
+  {
+    label: 'Current billing period',
+    value: 'current_billing_period',
+  },
+  {
+    label: 'Previous billing period',
+    value: 'previous_billing_period',
+  },
+  { label: 'Last 90 days', value: '90_day_period' },
+  { label: 'Last 30 days', value: undefined },
+]
+export const freePeriods = [
+  { label: 'Last 90 days', value: '90_day_period' },
+  { label: 'Last 30 days', value: undefined },
+]
 export type CreateVersionFeatureState = {
   environmentId: number
   featureId: number

frontend/web/components/App.js

@@ -16,11 +16,9 @@ import { Provider } from 'react-redux'
 import { getStore } from 'common/store'
 import { resolveAuthFlow } from '@datadog/ui-extensions-sdk'
 import ConfigProvider from 'common/providers/ConfigProvider'
-import { getOrganisationUsage } from 'common/services/useOrganisationUsage'
 import Button from './base/forms/Button'
 import Icon from './Icon'
 import AccountStore from 'common/stores/account-store'
-import InfoMessage from './InfoMessage'
 import OrganisationLimit from './OrganisationLimit'
 import GithubStar from './GithubStar'
 import Tooltip from './Tooltip'
@@ -49,7 +47,6 @@ const App = class extends Component {
   }
 
   state = {
-    activeOrganisation: 0,
     asideIsVisible: !isMobile,
     lastEnvironmentId: '',
     lastProjectId: '',
@@ -102,11 +99,9 @@ const App = class extends Component {
     }
     this.listenTo(OrganisationStore, 'change', () => this.forceUpdate())
     this.listenTo(ProjectStore, 'change', () => this.forceUpdate())
-    this.listenTo(AccountStore, 'change', this.getOrganisationUsage)
     if (AccountStore.model) {
       this.onLogin()
     }
-    this.getOrganisationUsage()
     window.addEventListener('scroll', this.handleScroll)
     const updateLastViewed = () => {
       AsyncStorage.getItem('lastEnv').then((res) => {
@@ -123,21 +118,6 @@ const App = class extends Component {
     updateLastViewed()
   }
 
-  getOrganisationUsage = () => {
-    if (
-      AccountStore.getOrganisation()?.id &&
-      this.state.activeOrganisation !== AccountStore.getOrganisation().id
-    ) {
-      getOrganisationUsage(getStore(), {
-        organisationId: AccountStore.getOrganisation()?.id,
-      }).then((res) => {
-        this.setState({
-          activeOrganisation: AccountStore.getOrganisation().id,
-        })
-      })
-    }
-  }
-
   toggleDarkMode = () => {
     const newValue = !Utils.getFlagsmithHasFeature('dark_mode')
     flagsmith.setTrait('dark_mode', newValue)

frontend/web/components/OrganisationUsage.tsx

@@ -1,4 +1,4 @@
-import Utils from 'common/utils/utils'
+import Utils, { planNames } from 'common/utils/utils'
 import React, { FC, useState } from 'react'
 import {
   Bar,
@@ -19,34 +19,51 @@ import {
   ValueType,
 } from 'recharts/types/component/DefaultTooltipContent'
 import InfoMessage from './InfoMessage'
+import { IonIcon } from '@ionic/react'
+import { checkmarkSharp } from 'ionicons/icons'
+import AccountStore from 'common/stores/account-store'
+import { billingPeriods, freePeriods, Req } from 'common/types/requests'
 
 type OrganisationUsageType = {
   organisationId: string
 }
 type LegendItemType = {
   title: string
   value: number
+  selection: string[]
+  onChange: (v: string) => void
   colour?: string
 }
 
-const LegendItem: FC<LegendItemType> = ({ colour, title, value }) => {
+const LegendItem: FC<LegendItemType> = ({
+  colour,
+  onChange,
+  selection,
+  title,
+  value,
+}) => {
   if (!value) {
     return null
   }
   return (
     <div className='mb-4'>
       <h3 className='mb-2'>{Utils.numberWithCommas(value)}</h3>
-      <Row>
+      <Row className='cursor-pointer' onClick={() => onChange(title)}>
         {!!colour && (
           <span
+            className='text-white text-center'
             style={{
               backgroundColor: colour,
               borderRadius: 2,
               display: 'inline-block',
               height: 16,
               width: 16,
             }}
-          />
+          >
+            {selection.includes(title) && (
+              <IonIcon size={'8px'} color='white' icon={checkmarkSharp} />
+            )}
+          </span>
         )}
         <span className='text-muted ml-2'>{title}</span>
       </Row>
@@ -57,76 +74,124 @@ const LegendItem: FC<LegendItemType> = ({ colour, title, value }) => {
 const OrganisationUsage: FC<OrganisationUsageType> = ({ organisationId }) => {
   const [project, setProject] = useState<string | undefined>()
   const [environment, setEnvironment] = useState<string | undefined>()
+  const currentPlan = Utils.getPlanName(AccountStore.getActiveOrgPlan())
+  const [billingPeriod, setBillingPeriod] = useState<
+    Req['getOrganisationUsage']['billing_period']
+  >(currentPlan === planNames.free ? '90_day_period' : 'current_billing_period')
 
   const { data } = useGetOrganisationUsageQuery(
     {
+      billing_period: billingPeriod,
       environmentId: environment,
       organisationId,
       projectId: project,
     },
     { skip: !organisationId },
   )
   const colours = ['#0AADDF', '#27AB95', '#FF9F43', '#EF4D56']
+  const [selection, setSelection] = useState([
+    'Flags',
+    'Identities',
+    'Environment Document',
+    'Traits',
+  ])
+  const updateSelection = (key) => {
+    if (selection.includes(key)) {
+      setSelection(selection.filter((v) => v !== key))
+    } else {
+      setSelection(selection.concat([key]))
+    }
+  }
 
   return data?.totals ? (
-    <div className='mt-4'>
-      <div className='col-md-6 mb-5'>
+    <div className='mt-4 row'>
+      <div className='col-md-4'>
+        <label>Period</label>
+        <Select
+          onChange={(v) => setBillingPeriod(v.value)}
+          value={billingPeriods.find((v) => v.value === billingPeriod)}
+          options={
+            currentPlan === planNames.free ? freePeriods : billingPeriods
+          }
+        />
+      </div>
+      <div className='col-md-4 mb-5'>
         <label>Project</label>
         <ProjectFilter
           showAll
           organisationId={parseInt(organisationId)}
           onChange={setProject}
           value={project}
         />
-        {project && (
-          <div className='mt-4'>
-            <label>Environment</label>
-            <EnvironmentFilter
-              showAll
-              projectId={project}
-              onChange={setEnvironment}
-              value={environment}
-            />
-          </div>
-        )}
       </div>
-      <Row style={{ gap: '32px 64px' }}>
+      {project && (
+        <div className='col-md-4'>
+          <label>Environment</label>
+          <EnvironmentFilter
+            showAll
+            projectId={project}
+            onChange={setEnvironment}
+            value={environment}
+          />
+        </div>
+      )}
+      <div className='d-flex gap-5 align-items-center'>
         <LegendItem
+          selection={selection}
+          onChange={updateSelection}
           colour={colours[0]}
           value={data.totals.flags}
           title='Flags'
         />
         <LegendItem
+          selection={selection}
+          onChange={updateSelection}
           colour={colours[1]}
           value={data.totals.identities}
           title='Identities'
         />
         <LegendItem
+          selection={selection}
+          onChange={updateSelection}
           colour={colours[2]}
           value={data.totals.environmentDocument}
           title='Environment Document'
         />
         <LegendItem
+          selection={selection}
+          onChange={updateSelection}
           colour={colours[3]}
           value={data.totals.traits}
           title='Traits'
         />
         <LegendItem value={data.totals.total} title='Total API Calls' />
-      </Row>
+      </div>
       {data?.events_list?.length === 0 ? (
         <div className='py-4 fw-semibold text-center'>No usage recorded.</div>
       ) : (
         <ResponsiveContainer height={400} width='100%'>
           <BarChart
-            data={data.events_list}
+            data={data.events_list.map((v) => {
+              return {
+                ...v,
+                environment_document: selection.includes('Environment Document')
+                  ? v.environment_document
+                  : undefined,
+                flags: selection.includes('Flags') ? v.flags : undefined,
+                identities: selection.includes('Identities')
+                  ? v.identities
+                  : undefined,
+                traits: selection.includes('Traits') ? v.traits : undefined,
+              }
+            })}
             style={{ stroke: '#fff', strokeWidth: 1 }}
           >
             <CartesianGrid stroke='#EFF1F4' vertical={false} />
             <XAxis
               padding='gap'
               allowDataOverflow={false}
               dataKey='day'
-              interval={0}
+              interval={data.events_list?.length > 31 ? 7 : 0}
               height={120}
               angle={-90}
               textAnchor='end'
@@ -145,28 +210,39 @@ const OrganisationUsage: FC<OrganisationUsageType> = ({ organisationId }) => {
               cursor={{ fill: 'transparent' }}
               content={<RechartsTooltip />}
             />
-            <Bar dataKey='flags' barSize={14} stackId='a' fill={colours[0]} />
-            <Bar
-              dataKey='identities'
-              barSize={14}
-              stackId='a'
-              fill={colours[1]}
-            />
-            <Bar
-              name='Environment Document'
-              dataKey='environment_document'
-              stackId='a'
-              fill={colours[2]}
-              barSize={14}
-            />
-            <Bar dataKey='traits' barSize={14} stackId='a' fill={colours[3]} />
+            {selection.includes('Flags') && (
+              <Bar dataKey='flags' barSize={14} stackId='a' fill={colours[0]} />
+            )}
+            {selection.includes('Identities') && (
+              <Bar
+                dataKey='identities'
+                barSize={14}
+                stackId='a'
+                fill={colours[1]}
+              />
+            )}
+            {selection.includes('Environment Document') && (
+              <Bar
+                name='Environment Document'
+                dataKey='environment_document'
+                stackId='a'
+                fill={colours[2]}
+                barSize={14}
+              />
+            )}
+            {selection.includes('Traits') && (
+              <Bar
+                dataKey='traits'
+                barSize={14}
+                stackId='a'
+                fill={colours[3]}
+              />
+            )}
           </BarChart>
         </ResponsiveContainer>
       )}
       <InfoMessage>
-        Please be aware that usage data can be delayed by up to 3 hours and that
-        these numbers show the API usage for the last 30 days, not your current
-        billing period which may differ.
+        Please be aware that usage data can be delayed by up to 3 hours.
       </InfoMessage>
       <div>
         <h4>What do these numbers mean?</h4>