[User Experience App] Fix ux app env filter (elastic#105918) (elastic…

…#106001)

Co-authored-by: Shahzad <[email protected]>

x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx

@@ -27,7 +27,7 @@ export function RumHome() {
 
   const { isSmall, isXXL } = useBreakPoints();
 
-  const envStyle = isSmall ? {} : { maxWidth: 200 };
+  const envStyle = isSmall ? {} : { maxWidth: 500 };
 
   return (
     <CsmSharedContextProvider>
@@ -59,7 +59,7 @@ export function RumHome() {
 function PageHeader() {
   const { isSmall } = useBreakPoints();
 
-  const envStyle = isSmall ? {} : { maxWidth: 200 };
+  const envStyle = isSmall ? {} : { maxWidth: 400 };
 
   return (
     <div style={{ width: '100%' }}>

x-pack/plugins/apm/server/lib/rum_client/ui_filters/get_es_filter.test.ts

@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { getEsFilter } from './get_es_filter';
+
+describe('getEfFilters', function () {
+  it('should return environment in include filters', function () {
+    const result = getEsFilter({
+      browser: ['Chrome'],
+      environment: 'production',
+    });
+
+    expect(result).toEqual([
+      { terms: { 'user_agent.name': ['Chrome'] } },
+      { term: { 'service.environment': 'production' } },
+    ]);
+  });
+
+  it('should not return environment in exclude filters', function () {
+    const result = getEsFilter(
+      { browserExcluded: ['Chrome'], environment: 'production' },
+      true
+    );
+
+    expect(result).toEqual([{ terms: { 'user_agent.name': ['Chrome'] } }]);
+  });
+});

x-pack/plugins/apm/server/lib/rum_client/ui_filters/get_es_filter.ts

@@ -34,5 +34,8 @@ export function getEsFilter(uiFilters: UxUIFilters, exclude?: boolean) {
       };
     }) as ESFilter[];
 
-  return [...mappedFilters, ...environmentQuery(uiFilters.environment)];
+  return [
+    ...mappedFilters,
+    ...(exclude ? [] : environmentQuery(uiFilters.environment)),
+  ];
 }