Fix: Delete unnecessary code

Author: novakzaballa

frontend/common/dispatcher/app-actions.js

@@ -104,12 +104,6 @@ const AppActions = Object.assign({}, require('./base/_app-actions'), {
       id,
     })
   },
-  getEnv(environmentId) {
-    Dispatcher.handleViewAction({
-      actionType: Actions.GET_ENVIRONMENT,
-      environmentId,
-    })
-  },
   deleteUser(id) {
     Dispatcher.handleViewAction({
       actionType: Actions.DELETE_USER,

frontend/common/stores/project-store.js

@@ -84,14 +84,6 @@ const controller = {
       store.saved()
     })
   },
-  getEnv: (envId) => {
-    data.get(`${Project.api}environments/${envId}/`).then((environment) => {
-      environment.total_segment_overrides =
-        environment.total_segment_overrides || 0
-      store.model = Object.assign(store.model, { environment })
-      store.saved()
-    })
-  },
   getProject: (id, cb, force) => {
     if (force) {
       store.loading()
@@ -226,9 +218,6 @@ store.dispatcherIndex = Dispatcher.register(store, (payload) => {
     case Actions.EDIT_ENVIRONMENT:
       controller.editEnv(action.env)
       break
-    case Actions.GET_ENVIRONMENT:
-      controller.getEnv(action.environmentId)
-      break
     case Actions.DELETE_ENVIRONMENT:
       controller.deleteEnv(action.env)
       break

frontend/web/components/App.js

@@ -19,12 +19,10 @@ import { resolveAuthFlow } from '@datadog/ui-extensions-sdk'
 import ConfigProvider from 'common/providers/ConfigProvider'
 import Permission from 'common/providers/Permission'
 import { getOrganisationUsage } from 'common/services/useOrganisationUsage'
-import { getSubscriptionMetadata } from 'common/services/useSubscriptionMetadata'
 import Button from './base/forms/Button'
 import Icon from './Icon'
 import AccountStore from 'common/stores/account-store'
 import InfoMessage from './InfoMessage'
-import Format from 'common/utils/format'
 import OrganisationLimit from './OrganisationLimit'
 
 const App = class extends Component {
@@ -41,10 +39,8 @@ const App = class extends Component {
     asideIsVisible: !isMobile,
     lastEnvironmentId: '',
     lastProjectId: '',
-    maxApiCalls: 50000,
     pin: '',
     showAnnouncement: true,
-    totalApiCalls: 0,
   }
 
   constructor(props, context) {
@@ -74,19 +70,11 @@ const App = class extends Component {
       AccountStore.getOrganisation()?.id &&
       this.state.activeOrganisation !== AccountStore.getOrganisation().id
     ) {
-      getSubscriptionMetadata(getStore(), {
-        id: AccountStore.getOrganisation()?.id,
-      }).then((res) => {
-        this.setState({
-          maxApiCalls: res?.data?.max_api_calls,
-        })
-      })
       getOrganisationUsage(getStore(), {
         organisationId: AccountStore.getOrganisation()?.id,
       }).then((res) => {
         this.setState({
           activeOrganisation: AccountStore.getOrganisation().id,
-          totalApiCalls: res?.data?.totals.total,
         })
       })
     }
@@ -299,17 +287,6 @@ const App = class extends Component {
     )
     const dismissed = flagsmith.getTrait('dismissed_announcement')
     const showBanner = !dismissed || dismissed !== announcementValue.id
-    const maxApiCallsPercentage = Utils.calculateRemainingLimitsPercentage(
-      this.state.totalApiCalls,
-      this.state.maxApiCalls,
-      70,
-    ).percentage
-
-    const alertMaxApiCallsText = `You have used ${Format.shortenNumber(
-      this.state.totalApiCalls,
-    )}/${Format.shortenNumber(
-      this.state.maxApiCalls,
-    )} of your allowed requests.`
 
     return (
       <Provider store={getStore()}>

frontend/web/components/Aside.js

@@ -50,7 +50,6 @@ const Aside = class extends Component {
               ? {}
               : { live_from_after: new Date().toISOString() },
           )
-          AppActions.getEnv(this.props.environmentId)
         }
       })
     }
@@ -78,7 +77,6 @@ const Aside = class extends Component {
               ? {}
               : { live_from_after: new Date().toISOString() },
           )
-          AppActions.getEnv(this.props.environmentId)
         }
       }
     }

frontend/web/components/SegmentOverrides.js

@@ -14,6 +14,8 @@ import Permission from 'common/providers/Permission'
 import Constants from 'common/constants'
 import Icon from './Icon'
 import SegmentOverrideLimit from 'components/SegmentOverrideLimit'
+import { getStore } from 'common/store'
+import { getEnvironment } from 'common/services/useEnvironment'
 
 const arrayMoveMutate = (array, from, to) => {
   array.splice(to < 0 ? array.length + to : to, 0, array.splice(from, 1)[0])
@@ -425,7 +427,16 @@ class TheComponent extends Component {
 
   constructor(props) {
     super(props)
-    this.state = { segmentEditId: undefined }
+    this.state = { segmentEditId: undefined, totalSegmentOverrides: 0 }
+  }
+  componentDidMount() {
+    getEnvironment(getStore(), {
+      id: this.props.environmentId,
+    }).then((res) => {
+      this.setState({
+        totalSegmentOverrides: res[0].data.total_segment_overrides,
+      })
+    })
   }
 
   addItem = () => {
@@ -540,6 +551,11 @@ class TheComponent extends Component {
 
     const visibleValues = value && value.filter((v) => !v.toRemove)
 
+    const segmentOverrideLimitAlert = Utils.calculateRemainingLimitsPercentage(
+      this.state.totalSegmentOverrides,
+      ProjectStore.getMaxSegmentOverridesAllowed(),
+    )
+
     const isLimitReached =
       segmentOverrideLimitAlert.percentage &&
       segmentOverrideLimitAlert.percentage >= 100

frontend/web/components/modals/AssociatedSegmentOverrides.js

@@ -10,6 +10,8 @@ import FlagSelect from 'components/FlagSelect'
 import InfoMessage from 'components/InfoMessage'
 import EnvironmentSelect from 'components/EnvironmentSelect'
 import SegmentOverrideLimit from 'components/SegmentOverrideLimit'
+import { getStore } from 'common/store'
+import { getEnvironment } from 'common/services/useEnvironment'
 
 class TheComponent extends Component {
   state = {
@@ -379,12 +381,35 @@ export default class SegmentOverridesInner extends Component {
 }
 
 class SegmentOverridesInnerAdd extends Component {
-  state = {}
+  state = { totalSegmentOverrides: 0 }
+
+  fetchTotalSegmentOverrides() {
+    const { environmentId } = this.props
+    const env = ProjectStore.getEnvs().find((v) => v.name === environmentId)
+
+    if (!env) {
+      return
+    }
+
+    const id = env.api_key
+
+    getEnvironment(getStore(), { id }).then((res) => {
+      this.setState({
+        totalSegmentOverrides: res[1].data.total_segment_overrides,
+      })
+    })
+  }
 
   componentDidMount() {
     ES6Component(this)
+    this.fetchTotalSegmentOverrides()
   }
 
+  componentDidUpdate(prevProps) {
+    if (prevProps.environmentId !== this.props.environmentId) {
+      this.fetchTotalSegmentOverrides()
+    }
+  }
   render() {
     const { environmentId, id, ignoreFlags, projectId } = this.props
     const addValue = (featureId, feature) => {
@@ -415,7 +440,7 @@ class SegmentOverridesInnerAdd extends Component {
       // updateSegments(segmentOverrides.concat([newValue]))
     }
     const segmentOverrideLimitAlert =
-      ProjectStore.getTotalSegmentOverrides >=
+      this.state.totalSegmentOverrides >=
       ProjectStore.getMaxSegmentOverridesAllowed()
 
     return (