Merge pull request #58 from varun2948/fix/-faster-load-project-list-w…

…ith-no-map-omit Fix/ faster load project list with no map omit
naxa-developers · Feb 14, 2024 · df668e7 · df668e7
2 parents d916da7 + c054519
commit df668e7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/frontend/src/components/projectDetail/downloadOsmData.js b/frontend/src/components/projectDetail/downloadOsmData.js
@@ -85,7 +85,12 @@ export const DownloadOsmData = ({ projectMappingTypes, project }) => {
       window.focus();
       if (window._paq) {
         // Check if Matomo tracking array (_paq) exists
-        window._paq.push(['trackEvent', 'OSMDownloads', 'Click', `${title}_${fileFormat}`]);
+        window._paq.push([
+          'trackEvent',
+          'OSMDownloads',
+          'Click',
+          `${project.projectId}_${title}_${fileFormat}`,
+        ]);
       }
       // Check if the request was successful
       if (responsehead.ok) {

diff --git a/frontend/src/components/projects/projectNav.js b/frontend/src/components/projects/projectNav.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Link, useLocation } from 'react-router-dom';
 import { FormattedMessage } from 'react-intl';
 import { useSelector, useDispatch } from 'react-redux';
@@ -84,7 +84,18 @@ export const ProjectNav = (props) => {
   const encodedParams = stringify(fullProjectsQuery)
     ? ['?', stringify(fullProjectsQuery)].join('')
     : '';
+  const isMapShown = useSelector((state) => state.preferences['mapShown']);
 
+  useEffect(() => {
+    setQuery(
+      {
+        ...fullProjectsQuery,
+        omitMapResults:!isMapShown
+      },
+      'pushIn',
+    );
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  },[isMapShown])
   const linkCombo = 'link ph3 f6 pv2 ba b--tan br1 ph3 fw5';
 
   const moreFiltersAnyActive =

diff --git a/frontend/src/hooks/UseProjectsQueryAPI.js b/frontend/src/hooks/UseProjectsQueryAPI.js
@@ -38,6 +38,7 @@ const projectQueryAllSpecification = {
   stale: BooleanParam,
   createdFrom: StringParam,
   basedOnMyInterests: BooleanParam,
+  omitMapResults: BooleanParam,
 };
 
 /* This can be passed into project API or used independently */
@@ -70,6 +71,7 @@ const backendToQueryConversion = {
   stale: 'lastUpdatedTo',
   createdFrom: 'createdFrom',
   basedOnMyInterests: 'basedOnMyInterests',
+  omitMapResults:'omitMapResults',
 };
 
 const dataFetchReducer = (state, action) => {