Merge pull request #1367 from digma-ai/fix/web-global-filter

Fix global filter in Web Admin

Author: kshmidt-digma

src/components/Admin/Header/HeaderContent/EnvironmentSelect/index.tsx

@@ -5,7 +5,6 @@ import {
 } from "../../../../../containers/Admin/hooks";
 import { useGetEnvironmentsQuery } from "../../../../../redux/services/digma";
 import { setSelectedEnvironmentId } from "../../../../../redux/slices/issuesReportSlice";
-import { setEnvironmentId } from "../../../../../redux/slices/scopeSlice";
 import { sendUserActionTrackingEvent } from "../../../../../utils/actions/sendUserActionTrackingEvent";
 import { EnvironmentIcon } from "../../../../common/EnvironmentIcon";
 import { ChevronIcon } from "../../../../common/icons/16px/ChevronIcon";
@@ -53,10 +52,14 @@ export const EnvironmentSelect = () => {
       sortedEnvironments.length > 0 &&
       !selectedEnvironmentId
     ) {
-      dispatch(setEnvironmentId(sortedEnvironments[0].id));
+      dispatch(setSelectedEnvironmentId(sortedEnvironments[0].id));
     }
   }, [dispatch, sortedEnvironments, selectedEnvironmentId]);
 
+  if (!selectedEnvironmentId) {
+    return null;
+  }
+
   return (
     <NewPopover
       content={
@@ -79,7 +82,9 @@ export const EnvironmentSelect = () => {
             {selectedEnvironment && (
               <EnvironmentIcon environment={selectedEnvironment} size={16} />
             )}
-            <s.EnvironmentName>{selectedEnvironment?.name}</s.EnvironmentName>
+            <s.EnvironmentName>
+              {selectedEnvironment?.name ?? selectedEnvironmentId}
+            </s.EnvironmentName>
             <s.ChevronIconContainer>
               <ChevronIcon
                 direction={isMenuOpen ? Direction.Up : Direction.Down}

src/components/Admin/Header/HeaderContent/FilterToolbar/index.tsx

@@ -1,17 +1,9 @@
-import { useAdminSelector } from "../../../../../containers/Admin/hooks";
 import { EnvironmentSelect } from "../EnvironmentSelect";
 import { FilterMenu } from "../FilterMenu";
 
-export const FilterToolbar = () => {
-  const environmentId = useAdminSelector(
-    (state) => state.codeIssuesReport.selectedEnvironmentId
-  );
-  return (
-    environmentId && (
-      <>
-        <EnvironmentSelect />
-        <FilterMenu />
-      </>
-    )
-  );
-};
+export const FilterToolbar = () => (
+  <>
+    <EnvironmentSelect />
+    <FilterMenu />
+  </>
+);