Merge pull request #16 from vtex-apps/feature/S2BRFPA-915-filtros

Feature/s2 brfpa 915 filtros
vtex-apps · Aug 19, 2022 · 47b998d · 47b998d
2 parents 6061516 + 2082a0f
commit 47b998d
Show file tree

Hide file tree

Showing 12 changed files with 569 additions and 217 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Added
+
+- Filter on historyTable
+
 ## [1.3.0] - 2022-08-19
 
 ## [1.2.0] - 2022-08-08

diff --git a/messages/en.json b/messages/en.json
@@ -21,6 +21,15 @@
   "history.value.title": "Valor",
   "history.status.title": "Status",
   "history.pagination.of": "de",
+  "history.filter.clear": "Limpar filtros",
+  "history.filter.all": "Tudo",
+  "history.filter.is": "é",
+  "history.filter.between": "entre",
+  "history.filter.and": "e",
+  "history.filter.date": "Data",
+  "history.filter.status": "Status",
+  "history.filter.status.credit": "Entradas",
+  "history.filter.status.debit": "Saídas",
   "collapsible.title": "Minha carteira",
   "provider.without.code": "Código inexistente",
   "provider.missing.value": "Insira um valor para resgatar",

diff --git a/messages/es.json b/messages/es.json
@@ -21,6 +21,15 @@
   "history.value.title": "Valor",
   "history.status.title": "Status",
   "history.pagination.of": "de",
+  "history.filter.clear": "Limpar filtros",
+  "history.filter.all": "Tudo",
+  "history.filter.is": "é",
+  "history.filter.between": "entre",
+  "history.filter.and": "e",
+  "history.filter.date": "Data",
+  "history.filter.status": "Status",
+  "history.filter.status.credit": "Entradas",
+  "history.filter.status.debit": "Saídas",
   "collapsible.title": "Minha carteira",
   "provider.without.code": "Código inexistente",
   "provider.missing.value": "Insira um valor para resgatar",

diff --git a/messages/pt.json b/messages/pt.json
@@ -21,6 +21,15 @@
   "history.value.title": "Valor",
   "history.status.title": "Status",
   "history.pagination.of": "de",
+  "history.filter.clear": "Limpar filtros",
+  "history.filter.all": "Tudo",
+  "history.filter.is": "é",
+  "history.filter.between": "entre",
+  "history.filter.and": "e",
+  "history.filter.date": "Data",
+  "history.filter.status": "Status",
+  "history.filter.status.credit": "Entradas",
+  "history.filter.status.debit": "Saídas",
   "collapsible.title": "Minha carteira",
   "provider.without.code": "Código inexistente",
   "provider.missing.value": "Insira um valor para resgatar",

diff --git a/react/Components/history.tsx b/react/Components/history.tsx
@@ -10,14 +10,15 @@ import { historyMessages } from '../utils/definedMessages'
 const History: FC = () => {
   const intl = useIntl()
   const [modalOpen, setModalOpen] = useState(false)
-  const { loadingHistory } = useStore()
+  const { loadingHistory, setFilterHistory } = useStore()
 
   const handleToggle = () => {
+    setFilterHistory(undefined)
     setModalOpen(!modalOpen)
   }
 
   return (
-    <span className="ml3" style={{ position: 'absolute' }}>
+    <span className="ml3 history">
       {loadingHistory ? (
         <Spinner color="currentColor" size={20} />
       ) : (