fix: change variabel name

dhis2 · Jan 13, 2025 · 750c0de · 750c0de
1 parent 70cc6d4
commit 750c0de
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 23 deletions.
diff --git a/..._modules/capture-core/components/WidgetsChangelog/common/Changelog/Changelog.component.js b/..._modules/capture-core/components/WidgetsChangelog/common/Changelog/Changelog.component.js
@@ -26,8 +26,8 @@ export const ChangelogComponent = ({
     pager,
     columnToSortBy,
     setColumnToSortBy,
-    fieldToFilterBy,
-    setfieldToFilterBy,
+    attributeToFilterBy,
+    setAttributeToFilterBy,
     filterValue,
     setFilterValue,
     setPage,
@@ -45,8 +45,8 @@ export const ChangelogComponent = ({
         <ModalTitle>{i18n.t('Changelog')}</ModalTitle>
         <ModalContent>
             <ChangelogFilterBar
-                fieldToFilterBy={fieldToFilterBy}
-                setfieldToFilterBy={setfieldToFilterBy}
+                attributeToFilterBy={attributeToFilterBy}
+                setAttributeToFilterBy={setAttributeToFilterBy}
                 filterValue={filterValue}
                 setFilterValue={setFilterValue}
                 dataItemDefinitions={dataItemDefinitions}

diff --git a/..._modules/capture-core/components/WidgetsChangelog/common/Changelog/Changelog.container.js b/..._modules/capture-core/components/WidgetsChangelog/common/Changelog/Changelog.container.js
@@ -40,8 +40,8 @@ export const Changelog = ({
         setSortDirection,
         filterValue,
         setFilterValue,
-        fieldToFilterBy,
-        setfieldToFilterBy,
+        attributeToFilterBy,
+        setAttributeToFilterBy,
     } = useChangelogData({ entityId, entityType, programId });
 
     const {
@@ -81,8 +81,8 @@ export const Changelog = ({
             setSortDirection={setSortDirection}
             filterValue={filterValue}
             setFilterValue={setFilterValue}
-            fieldToFilterBy={fieldToFilterBy}
-            setfieldToFilterBy={setfieldToFilterBy}
+            attributeToFilterBy={attributeToFilterBy}
+            setAttributeToFilterBy={setAttributeToFilterBy}
             dataItemDefinitions={dataItemDefinitions}
         />
     );

diff --git a/...core_modules/capture-core/components/WidgetsChangelog/common/Changelog/Changelog.types.js b/...core_modules/capture-core/components/WidgetsChangelog/common/Changelog/Changelog.types.js
@@ -71,8 +71,8 @@ export type ChangelogProps = {
     setColumnToSortBy: (string) => void,
     sortDirection: SortDirection,
     setSortDirection: SetSortDirection,
-    fieldToFilterBy?: string | null,
-    setfieldToFilterBy: (string | null) => void,
+    attributeToFilterBy?: string | null,
+    setAttributeToFilterBy: (string | null) => void,
     filterValue: any,
     setFilterValue: (any) => void,
     dataItemDefinitions: ItemDefinitions,

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,
-    fieldToFilterBy: string | null,
-    setfieldToFilterBy: (value: string | null) => void,
+    attributeToFilterBy: string | null,
+    setAttributeToFilterBy: (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,
-    fieldToFilterBy,
-    setfieldToFilterBy,
+    attributeToFilterBy,
+    setAttributeToFilterBy,
     dataItemDefinitions,
 }: ChangelogFilterProps) => {
     const [openMenu, setOpenMenu] = useState<string | null>(null);
@@ -36,14 +36,14 @@ const ChangelogFilterBarPlain = ({
             setOpenMenu(null);
             if (value === 'SHOW_ALL') {
                 setFilterValue('SHOW_ALL');
-                setfieldToFilterBy(null);
+                setAttributeToFilterBy(null);
             } else {
                 const column = getFilterColumn(value.id);
                 setFilterValue(value);
-                setfieldToFilterBy(column);
+                setAttributeToFilterBy(column);
             }
         },
-        [setFilterValue, setfieldToFilterBy],
+        [setFilterValue, setAttributeToFilterBy],
     );
 
     const dataItems = useMemo(
@@ -55,7 +55,7 @@ const ChangelogFilterBarPlain = ({
         [dataItemDefinitions],
     );
 
-    const selectedFilterValue = fieldToFilterBy ? filterValue : 'SHOW_ALL';
+    const selectedFilterValue = attributeToFilterBy ? filterValue : 'SHOW_ALL';
 
     return (
         <div className={classes.container}>

diff --git a/src/core_modules/capture-core/components/WidgetsChangelog/common/hooks/useChangelogData.js b/src/core_modules/capture-core/components/WidgetsChangelog/common/hooks/useChangelogData.js
@@ -18,9 +18,11 @@ type Props = {
 
 export const useChangelogData = ({ entityId, entityType, programId }: Props) => {
     const [columnToSortBy, setColumnToSortBy] = useState<string>(COLUMN_TO_SORT_BY.DATE);
+    console.log('columnToSortBy', columnToSortBy);
     const [sortDirection, setSortDirection] = useState<SortDirection>(SORT_DIRECTION.DEFAULT);
 
-    const [fieldToFilterBy, setfieldToFilterBy] = useState<string | null>(null);
+    const [attributeToFilterBy, setAttributeToFilterBy] = useState<string | null>(null);
+    console.log('attributeToFilterBy', attributeToFilterBy);
     const [filterValue, setFilterValue] = useState<Object>('Show all');
 
     const [page, setPage] = useState<number>(1);
@@ -32,8 +34,8 @@ export const useChangelogData = ({ entityId, entityType, programId }: Props) =>
     };
 
     const filterParam =
-        filterValue !== 'Show all' && fieldToFilterBy
-            ? `${fieldToFilterBy}:eq:${filterValue.id}`
+        filterValue !== 'Show all' && attributeToFilterBy
+            ? `${attributeToFilterBy}:eq:${filterValue.id}`
             : undefined;
 
     const orderParam =
@@ -71,8 +73,8 @@ export const useChangelogData = ({ entityId, entityType, programId }: Props) =>
         setSortDirection,
         columnToSortBy,
         setColumnToSortBy,
-        fieldToFilterBy,
-        setfieldToFilterBy,
+        attributeToFilterBy,
+        setAttributeToFilterBy,
         filterValue,
         setFilterValue,
         page,