From 1145130d0d1891882cd3be9052c3a91f761277de Mon Sep 17 00:00:00 2001
From: Luca Orlandini <luca.orlandini@gmail.com>
Date: Fri, 11 Jun 2021 13:46:05 +0200
Subject: [PATCH] Client - Display number of active filters (#239)

---
 .../client/js/components/home/FiltersMenu.jsx        |  3 ++-
 geonode_mapstore_client/client/js/routes/Home.jsx    | 12 +++++-------
 .../static/mapstore/translations/data.de-DE.json     |  1 +
 .../static/mapstore/translations/data.en-US.json     |  1 +
 .../static/mapstore/translations/data.es-ES.json     |  1 +
 .../static/mapstore/translations/data.fr-FR.json     |  1 +
 .../static/mapstore/translations/data.it-IT.json     |  1 +
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/geonode_mapstore_client/client/js/components/home/FiltersMenu.jsx b/geonode_mapstore_client/client/js/components/home/FiltersMenu.jsx
index 5df1436469..8461805ac2 100644
--- a/geonode_mapstore_client/client/js/components/home/FiltersMenu.jsx
+++ b/geonode_mapstore_client/client/js/components/home/FiltersMenu.jsx
@@ -25,6 +25,7 @@ const FiltersMenu = forwardRef(({
     defaultLabelId,
     onClear,
     totalResources,
+    totalFilters,
     filtersActive
 }, ref) => {
 
@@ -46,7 +47,7 @@ const FiltersMenu = forwardRef(({
                         size="sm"
                         onClick={onClick}
                     >
-                        <Message msgId="gnhome.filters" />
+                        <Message msgId="gnhome.filtersCount" msgParams={{ count: totalFilters }} />
                     </Button>
                     {filtersActive && <Button
                         variant="default"
diff --git a/geonode_mapstore_client/client/js/routes/Home.jsx b/geonode_mapstore_client/client/js/routes/Home.jsx
index ea8ebbb531..f8b22f3b7b 100644
--- a/geonode_mapstore_client/client/js/routes/Home.jsx
+++ b/geonode_mapstore_client/client/js/routes/Home.jsx
@@ -309,11 +309,9 @@ function Home({
 
 
     const { query } = url.parse(location.search, true);
-
-    const queryFilters = Object.keys(query).reduce((acc, key) => key.indexOf('filter') === 0
-        ? [...acc, ...castArray(query[key]).map((value) => ({ key, value }))]
-        : acc, []);
-
+    const queryFilters = Object.keys(query).reduce((acc, key) => key.indexOf('sort') === 0
+        ? acc
+        : [...acc, ...castArray(query[key]).map((value) => ({ key, value }))], []);
 
     const pk = match.params.pk;
     const ctype = match.params.ctype;
@@ -479,7 +477,6 @@ function Home({
                                 column={ hideHero &&
                                     <ConnectedDetailsPanel
                                         resource={resource}
-                                        filters={queryFilters}
                                         linkHref={hrefDetailPanel}
                                         formatHref={handleFormatHref}
                                         sectionStyle={{
@@ -521,7 +518,8 @@ function Home({
                                     orderOptions={filters?.order?.options}
                                     defaultLabelId={filters?.order?.defaultLabelId}
                                     totalResources={totalResources}
-                                    filtersActive={!!(queryFilters.length > 0 || query.f || query.extent)}
+                                    totalFilters={queryFilters.length}
+                                    filtersActive={!!(queryFilters.length > 0)}
                                 />
 
                             </ConnectedCardGrid>
diff --git a/geonode_mapstore_client/client/static/mapstore/translations/data.de-DE.json b/geonode_mapstore_client/client/static/mapstore/translations/data.de-DE.json
index 0500e4883d..dbb9cee9f5 100644
--- a/geonode_mapstore_client/client/static/mapstore/translations/data.de-DE.json
+++ b/geonode_mapstore_client/client/static/mapstore/translations/data.de-DE.json
@@ -61,6 +61,7 @@
             "register": "Registrieren",
             "signIn": "Anmelden",
             "filters": "Filter",
+            "filtersCount": "{count, plural, =0 { Filter } other {Filter (#)}}",
             "admin": "Admin",
             "logOut": "Ausloggen",
             "terms": "Terms",
diff --git a/geonode_mapstore_client/client/static/mapstore/translations/data.en-US.json b/geonode_mapstore_client/client/static/mapstore/translations/data.en-US.json
index ab2af75176..b98e297760 100644
--- a/geonode_mapstore_client/client/static/mapstore/translations/data.en-US.json
+++ b/geonode_mapstore_client/client/static/mapstore/translations/data.en-US.json
@@ -61,6 +61,7 @@
             "register": "Register",
             "signIn": "Sign in",
             "filters": "Filters",
+            "filtersCount": "{count, plural, =0 { Filters } other {Filters (#)}}",
             "admin": "Admin",
             "logOut": "Log out",
             "terms": "Terms",
diff --git a/geonode_mapstore_client/client/static/mapstore/translations/data.es-ES.json b/geonode_mapstore_client/client/static/mapstore/translations/data.es-ES.json
index be3b7b4dfc..f479f6e5d5 100644
--- a/geonode_mapstore_client/client/static/mapstore/translations/data.es-ES.json
+++ b/geonode_mapstore_client/client/static/mapstore/translations/data.es-ES.json
@@ -61,6 +61,7 @@
             "register": "Registrarse",
             "signIn": "Ingresar",
             "filters": "Filtros",
+            "filtersCount": "{count, plural, =0 { Filtros } other {Filtros (#)}}",
             "admin": "Administración",
             "logOut": "Salir",
             "terms": "Terms",
diff --git a/geonode_mapstore_client/client/static/mapstore/translations/data.fr-FR.json b/geonode_mapstore_client/client/static/mapstore/translations/data.fr-FR.json
index 86d3ffa45d..abd47289ab 100644
--- a/geonode_mapstore_client/client/static/mapstore/translations/data.fr-FR.json
+++ b/geonode_mapstore_client/client/static/mapstore/translations/data.fr-FR.json
@@ -61,6 +61,7 @@
             "register": "S'inscrire",
             "signIn": "Connexion",
             "filters": "Filtres",
+            "filtersCount": "{count, plural, =0 { Filtres } other {Filtres (#)}}",
             "admin": "Administration",
             "logOut": "Se déconnecter",
             "terms": "Terms",
diff --git a/geonode_mapstore_client/client/static/mapstore/translations/data.it-IT.json b/geonode_mapstore_client/client/static/mapstore/translations/data.it-IT.json
index f6979f4216..12696083c9 100644
--- a/geonode_mapstore_client/client/static/mapstore/translations/data.it-IT.json
+++ b/geonode_mapstore_client/client/static/mapstore/translations/data.it-IT.json
@@ -61,6 +61,7 @@
             "register": "Registrati",
             "signIn": "Accedi",
             "filters": "Filtri",
+            "filtersCount": "{count, plural, =0 { Filtri } other {Filtri (#)}}",
             "myresources": "Risorse",
             "mylink": "I miei Link",
             "admin": "Amministrazione",