FiltersStack

carkom · Jan 27, 2024 · bde4313 · bde4313
1 parent be08c73
commit bde4313
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/packages/desktop-client/src/components/accounts/Header.jsx b/packages/desktop-client/src/components/accounts/Header.jsx
@@ -21,7 +21,7 @@ import { Search } from '../common/Search';
 import { Stack } from '../common/Stack';
 import { View } from '../common/View';
 import { FilterButton } from '../filters/FiltersMenu';
-import { FiltersStack } from '../filters/SavedFilters';
+import { FiltersStack } from '../filters/FiltersStack';
 import { KeyHandlers } from '../KeyHandlers';
 import { NotesButton } from '../NotesButton';
 import { SelectedTransactionsButton } from '../transactions/SelectedTransactions';

diff --git a/packages/desktop-client/src/components/filters/FiltersMenu.jsx b/packages/desktop-client/src/components/filters/FiltersMenu.jsx
@@ -589,7 +589,6 @@ function FilterExpression({
 
 export function AppliedFilters({
   filters,
-  editingFilter,
   onUpdate,
   onDelete,
   conditionsOp,
@@ -616,7 +615,6 @@ export function AppliedFilters({
           op={filter.op}
           value={filter.value}
           options={filter.options}
-          editing={editingFilter === filter}
           onChange={newFilter => onUpdate(filter, newFilter)}
           onDelete={() => onDelete(filter)}
         />

diff --git a/...t/src/components/filters/SavedFilters.jsx → ...t/src/components/filters/FiltersStack.tsx b/...t/src/components/filters/SavedFilters.jsx → ...t/src/components/filters/FiltersStack.tsx
@@ -1,10 +1,15 @@
 import React from 'react';
 
+import { type RuleConditionEntity } from 'loot-core/types/models/rule';
+
 import { Stack } from '../common/Stack';
 import { View } from '../common/View';
 
 import { AppliedFilters } from './FiltersMenu';
-import { SavedFilterMenuButton } from './SavedFilterMenuButton';
+import {
+  type SavedFilter,
+  SavedFilterMenuButton,
+} from './SavedFilterMenuButton';
 
 export function FiltersStack({
   filters,
@@ -16,6 +21,19 @@ export function FiltersStack({
   filterId,
   filtersList,
   onCondOpChange,
+}: {
+  filters: RuleConditionEntity[];
+  conditionsOp: string;
+  onUpdateFilter: (
+    filter: RuleConditionEntity,
+    newFilter: RuleConditionEntity,
+  ) => RuleConditionEntity;
+  onDeleteFilter: (filter: RuleConditionEntity) => void;
+  onClearFilters: () => void;
+  onReloadSavedFilter: () => void;
+  filterId: SavedFilter;
+  filtersList: RuleConditionEntity[];
+  onCondOpChange: () => void;
 }) {
   return (
     <View>