fix(Field service reports): bug preventing page to open

sws2apps · Sep 9, 2024 · cdf951d · cdf951d
1 parent 36598f6
commit cdf951d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/features/reports/field_service/selector_stats/person_filter/index.tsx b/src/features/reports/field_service/selector_stats/person_filter/index.tsx
@@ -26,7 +26,7 @@ const MenuSubHeader = ({ children }: PropsWithChildren) => {
 const PersonFilter = () => {
   const { t } = useAppTranslation();
 
-  const { filter, handleChangeFilter, filters } = usePersonFilter();
+  const { filter, handleChangeFilter, filters, show_group } = usePersonFilter();
 
   return (
     <Select value={filter} onChange={(e) => handleChangeFilter(e.target.value)}>
@@ -49,14 +49,18 @@ const PersonFilter = () => {
           </MenuItem>
         ))}
 
-      <MenuSubHeader>{t('tr_fieldServiceGroups')}</MenuSubHeader>
-      {filters
-        .find((f) => f.key === 'groups')
-        .options.map((option) => (
-          <MenuItem key={option.key} value={option.key}>
-            <Typography>{option.name}</Typography>
-          </MenuItem>
-        ))}
+      {show_group && (
+        <MenuSubHeader>{t('tr_fieldServiceGroups')}</MenuSubHeader>
+      )}
+
+      {show_group &&
+        filters
+          .find((f) => f.key === 'groups')
+          .options.map((option) => (
+            <MenuItem key={option.key} value={option.key}>
+              <Typography>{option.name}</Typography>
+            </MenuItem>
+          ))}
     </Select>
   );
 };

diff --git a/src/features/reports/field_service/selector_stats/person_filter/usePersonFilter.tsx b/src/features/reports/field_service/selector_stats/person_filter/usePersonFilter.tsx
@@ -68,13 +68,17 @@ const usePersonFilter = () => {
     return result;
   }, [t, groups]);
 
+  const show_group = useMemo(() => {
+    return filters.some((record) => record.key === 'groups');
+  }, [filters]);
+
   const handleChangeFilter = (value: PersonFilterOption) => {
     setSelectedPublisher(undefined);
 
     setFilter(value);
   };
 
-  return { filters, handleChangeFilter, filter };
+  return { filters, handleChangeFilter, filter, show_group };
 };
 
 export default usePersonFilter;