Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
SocialGouv
1000jours
les1000jours
Commits
01db2413
Unverified
Commit
01db2413
authored
Jul 21, 2021
by
benguedj
Committed by
GitHub
Jul 21, 2021
Browse files
feat:
🎸
Ajoutes les stats des filtres dans Matomo (#545)
✅
Closes: #519
parent
3c55e0ce
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
3 deletions
+28
-3
front/screens/aroundMe/aroundMeFilter.component.tsx
front/screens/aroundMe/aroundMeFilter.component.tsx
+17
-3
front/screens/listArticles.component.tsx
front/screens/listArticles.component.tsx
+9
-0
front/utils/tracker.util.ts
front/utils/tracker.util.ts
+2
-0
No files found.
front/screens/aroundMe/aroundMeFilter.component.tsx
View file @
01db2413
import
{
useMatomo
}
from
"
matomo-tracker-react-native
"
;
import
*
as
React
from
"
react
"
;
import
{
useEffect
,
useState
}
from
"
react
"
;
import
{
...
...
@@ -33,7 +34,7 @@ import type {
PoiTypeFromDB
,
StepFromDB
,
}
from
"
../../type
"
;
import
{
StorageUtils
,
StringUtils
}
from
"
../../utils
"
;
import
{
StorageUtils
,
StringUtils
,
TrackerUtils
}
from
"
../../utils
"
;
interface
Props
{
visible
:
boolean
;
...
...
@@ -41,6 +42,7 @@ interface Props {
}
const
AroundMeFilter
:
React
.
FC
<
Props
>
=
({
visible
,
hideModal
})
=>
{
const
{
trackScreenView
}
=
useMatomo
();
const
[
filterDataFromDb
,
setFilterDataFromDb
]
=
useState
<
unknown
>
();
const
[
fetchedFiltersFromDB
,
setFetchedFiltersFromDB
]
=
...
...
@@ -54,14 +56,14 @@ const AroundMeFilter: React.FC<Props> = ({ visible, hideModal }) => {
useEffect
(()
=>
{
if
(
!
filterDataFromDb
)
return
;
const
extractFilterDataAndCheckSavedFilters
=
async
()
=>
{
const
extractFilterDataAndCheckSavedFilters
=
()
=>
{
const
{
cartographieTypes
,
etapes
}
=
filterDataFromDb
as
{
cartographieTypes
:
PoiTypeFromDB
[];
etapes
:
StepFromDB
[];
};
extractFilterData
(
cartographieTypes
,
etapes
);
};
void
extractFilterDataAndCheckSavedFilters
();
extractFilterDataAndCheckSavedFilters
();
},
[
filterDataFromDb
]);
useEffect
(()
=>
{
...
...
@@ -245,6 +247,16 @@ const AroundMeFilter: React.FC<Props> = ({ visible, hideModal }) => {
));
};
const
sendFiltersTracker
=
(
filters
:
string
[])
=>
{
if
(
!
StringUtils
.
stringArrayIsNullOrEmpty
(
filters
))
{
filters
.
forEach
((
filter
)
=>
{
trackScreenView
(
`
${
TrackerUtils
.
TrackingEvent
.
FILTER_CARTO
}
-
${
filter
}
`
);
});
}
};
return
(
<>
<
FetchFilterData
setFilterData
=
{
setFilterDataFromDb
}
/>
...
...
@@ -307,6 +319,8 @@ const AroundMeFilter: React.FC<Props> = ({ visible, hideModal }) => {
StorageKeysConstants
.
cartoFilterKey
,
cartoFilterStorage
);
sendFiltersTracker
(
cartoFilterStorage
.
etapes
);
sendFiltersTracker
(
cartoFilterStorage
.
types
);
setCartoFilterStorage
({
etapes
:
[],
types
:
[]
});
hideModal
(
true
);
}
}
...
...
front/screens/listArticles.component.tsx
View file @
01db2413
...
...
@@ -99,8 +99,17 @@ const ListArticles: FC<Props> = ({ navigation, route }) => {
return
isMatching
;
};
const
sendFiltersTracker
=
(
filters
:
ArticleFilter
[])
=>
{
filters
.
forEach
((
filter
)
=>
{
trackScreenView
(
`
${
TrackerUtils
.
TrackingEvent
.
FILTER_ARTICLES
}
-
${
filter
.
thematique
.
nom
}
`
);
});
};
const
applyFilters
=
(
filters
:
ArticleFilter
[])
=>
{
const
activeFilters
=
_
.
filter
(
filters
,
{
active
:
true
});
sendFiltersTracker
(
activeFilters
);
const
result
=
filteredArticles
.
map
((
article
)
=>
{
if
(
activeFilters
.
length
>
0
)
article
.
hide
=
!
matchWithFilters
(
article
,
activeFilters
);
...
...
front/utils/tracker.util.ts
View file @
01db2413
...
...
@@ -18,4 +18,6 @@ export enum TrackingEvent {
CARTO
=
"
Cartographie
"
,
EPDS
=
"
EPDS
"
,
NOTIFICATION
=
"
Notification
"
,
FILTER_CARTO
=
"
Filtre (Carto)
"
,
FILTER_ARTICLES
=
"
Filtre (Articles)
"
,
}
Social Groovy Bot
🤖
@SocialGroovyBot
mentioned in commit
b5922206
·
Jul 21, 2021
mentioned in commit
b5922206
mentioned in commit b59222065ed01f1a3f38916b14b1d17618e66cb2
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment