From 010e52d3ce2a1c62da3237b18a478ff9a23acc07 Mon Sep 17 00:00:00 2001
From: cauemarcondes <caue.marcondes@elastic.co>
Date: Tue, 12 May 2020 09:39:31 +0200
Subject: [PATCH] addressing PR comments

---
 .../components/shared/EnvironmentFilter/index.tsx   |  9 +++++++--
 .../shared/ErrorRateAlertTrigger/index.tsx          |  5 ++++-
 .../TransactionDurationAlertTrigger/index.tsx       |  4 +++-
 x-pack/plugins/apm/public/hooks/useEnvironments.tsx | 13 +++++++++----
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx b/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx
index 6d59635c85232..5d03dbbfdf4ff 100644
--- a/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx
@@ -67,10 +67,15 @@ function getOptions(environments: string[]) {
 
 export const EnvironmentFilter: React.FC = () => {
   const location = useLocation();
-  const { uiFilters } = useUrlParams();
+  const { uiFilters, urlParams } = useUrlParams();
 
   const { environment } = uiFilters;
-  const { environments, status = 'loading' } = useEnvironments();
+  const { serviceName, start, end } = urlParams;
+  const { environments, status = 'loading' } = useEnvironments({
+    serviceName,
+    start,
+    end
+  });
 
   return (
     <EuiSelect
diff --git a/x-pack/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.tsx b/x-pack/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.tsx
index e1dd57681923c..649412ecd238e 100644
--- a/x-pack/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.tsx
@@ -13,6 +13,7 @@ import { ALERT_TYPES_CONFIG } from '../../../../common/alert_types';
 import { ServiceAlertTrigger } from '../ServiceAlertTrigger';
 import { PopoverExpression } from '../ServiceAlertTrigger/PopoverExpression';
 import { useEnvironments, ALL_OPTION } from '../../../hooks/useEnvironments';
+import { useUrlParams } from '../../../hooks/useUrlParams';
 
 export interface ErrorRateAlertTriggerParams {
   windowSize: number;
@@ -30,7 +31,9 @@ interface Props {
 export function ErrorRateAlertTrigger(props: Props) {
   const { setAlertParams, setAlertProperty, alertParams } = props;
 
-  const { environmentOptions } = useEnvironments();
+  const { urlParams } = useUrlParams();
+  const { serviceName, start, end } = urlParams;
+  const { environmentOptions } = useEnvironments({ serviceName, start, end });
 
   const defaults = {
     threshold: 25,
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.tsx b/x-pack/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.tsx
index f41cebadc8725..182f09864f086 100644
--- a/x-pack/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.tsx
@@ -40,7 +40,9 @@ export function TransactionDurationAlertTrigger(props: Props) {
   const { urlParams } = useUrlParams();
 
   const transactionTypes = useServiceTransactionTypes(urlParams);
-  const { environmentOptions } = useEnvironments();
+
+  const { serviceName, start, end } = urlParams;
+  const { environmentOptions } = useEnvironments({ serviceName, start, end });
 
   if (!transactionTypes.length) {
     return null;
diff --git a/x-pack/plugins/apm/public/hooks/useEnvironments.tsx b/x-pack/plugins/apm/public/hooks/useEnvironments.tsx
index aefe1a6d07f2c..288241fae5739 100644
--- a/x-pack/plugins/apm/public/hooks/useEnvironments.tsx
+++ b/x-pack/plugins/apm/public/hooks/useEnvironments.tsx
@@ -11,7 +11,6 @@ import {
   ENVIRONMENT_NOT_DEFINED,
   ENVIRONMENT_ALL
 } from '../../common/environment_filter_values';
-import { useUrlParams } from './useUrlParams';
 
 export const ALL_OPTION = {
   value: ENVIRONMENT_ALL,
@@ -31,9 +30,15 @@ function getEnvironmentOptions(environments: string[]) {
   return [ALL_OPTION, ...environmentOptions];
 }
 
-export function useEnvironments() {
-  const { urlParams } = useUrlParams();
-  const { serviceName, start, end } = urlParams;
+export function useEnvironments({
+  serviceName,
+  start,
+  end
+}: {
+  serviceName?: string;
+  start?: string;
+  end?: string;
+}) {
   const { data: environments = [], status = 'loading' } = useFetcher(
     callApmApi => {
       if (start && end) {