fix: code clean up

dhis2 · Jan 13, 2025 · 16f9d52 · 16f9d52
1 parent 6101ea8
commit 16f9d52
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/...pture-core/components/WidgetsChangelog/common/ChangelogFilterBar/ChangelogFilter.types.js b/...pture-core/components/WidgetsChangelog/common/ChangelogFilterBar/ChangelogFilter.types.js
@@ -17,7 +17,7 @@ export type ChangelogFilterProps = {
     classes: { container: string },
     filterValue: FilterValueType,
     setFilterValue: (value: FilterValueType) => void,
-    columnToFilterBy: string | null,
-    setColumnToFilterBy: (value: string | null) => void,
+    fieldToFilterBy: string | null,
+    setfieldToFilterBy: (value: string | null) => void,
     dataItemDefinitions: DataItemDefinitions,
 };
diff --git a/.../capture-core/components/WidgetsChangelog/common/ChangelogFilterBar/ChangelogFilterBar.js b/.../capture-core/components/WidgetsChangelog/common/ChangelogFilterBar/ChangelogFilterBar.js
@@ -21,8 +21,8 @@ const ChangelogFilterBarPlain = ({
     classes,
     filterValue,
     setFilterValue,
-    columnToFilterBy,
-    setColumnToFilterBy,
+    fieldToFilterBy,
+    setfieldToFilterBy,
     dataItemDefinitions,
 }: ChangelogFilterProps) => {
     const [openMenu, setOpenMenu] = useState<string | null>(null);
@@ -36,14 +36,14 @@ const ChangelogFilterBarPlain = ({
             setOpenMenu(null);
             if (value === 'SHOW_ALL') {
                 setFilterValue('SHOW_ALL');
-                setColumnToFilterBy(null);
+                setfieldToFilterBy(null);
             } else {
                 const column = getFilterColumn(value.id);
                 setFilterValue(value);
-                setColumnToFilterBy(column);
+                setfieldToFilterBy(column);
             }
         },
-        [setFilterValue, setColumnToFilterBy],
+        [setFilterValue, setfieldToFilterBy],
     );
 
     const dataItems = useMemo(
@@ -55,14 +55,14 @@ const ChangelogFilterBarPlain = ({
         [dataItemDefinitions],
     );
 
-    const selectedFilterValue = columnToFilterBy ? filterValue : 'SHOW_ALL';
+    const selectedFilterValue = fieldToFilterBy ? filterValue : 'SHOW_ALL';
 
     return (
         <div className={classes.container}>
             <DropdownFilter
                 label={i18n.t('Data item')}
                 items={dataItems}
-                filterColumn="changelogFilterMenu"
+                filterColumn="dataItem"
                 openMenuName={openMenu}
                 onToggleMenu={toggleMenu}
                 onItemSelected={handleItemSelected}

diff --git a/...ules/capture-core/components/WidgetsChangelog/common/ChangelogFilterBar/DropdownFilter.js b/...ules/capture-core/components/WidgetsChangelog/common/ChangelogFilterBar/DropdownFilter.js
@@ -50,7 +50,6 @@ const DropdownFilterPlain = ({
 
     return (
         <DropdownButton
-            className="filter-button"
             open={isMenuOpen}
             onClick={() => onToggleMenu(filterColumn)}
             component={