fix: record MAP_VIEW statistics when saving and opening maps [v39]

cypress/integration/filemenu.cy.js

@@ -37,11 +37,19 @@ describe('File menu', () => {
             req.continue();
         }).as('saveMap');
 
+        cy.intercept({ method: 'POST', url: /dataStatistics/ }).as(
+            'postDataStatistics'
+        );
+
         saveNewMap(MAP_TITLE);
 
         cy.wait('@saveMap')
             .its('response.statusCode')
             .should('eq', 201);
+
+        cy.wait('@postDataStatistics')
+            .its('response.statusCode')
+            .should('eq', 201);
     });
 
     it.skip('save existing as new map', () => {
@@ -67,11 +75,19 @@ describe('File menu', () => {
             req.continue();
         }).as('saveAsNewMap');
 
+        cy.intercept({ method: 'POST', url: /dataStatistics/ }).as(
+            'postDataStatistics'
+        );
+
         saveAsNewMap(SAVEAS_MAP_TITLE);
 
         cy.wait('@saveAsNewMap')
             .its('response.statusCode')
             .should('eq', 201);
+
+        cy.wait('@postDataStatistics')
+            .its('response.statusCode')
+            .should('eq', 201);
     });
 
     it.skip('save changes to existing map', () => {

cypress/integration/smoke.cy.js

@@ -9,8 +9,16 @@ context('Smoke Test', () => {
     });
 
     it('loads with map id', () => {
+        cy.intercept({ method: 'POST', url: /dataStatistics/ }).as(
+            'postDataStatistics'
+        );
+
         cy.visit('/?id=ytkZY3ChM6J', EXTENDED_TIMEOUT); //ANC: 3rd visit coverage last year by district
 
+        cy.wait('@postDataStatistics')
+            .its('response.statusCode')
+            .should('eq', 201);
+
         cy.get('canvas', EXTENDED_TIMEOUT).should('be.visible');
 
         const Layer = new ThematicLayer();

src/actions/map.js

@@ -1,7 +1,7 @@
 import log from 'loglevel';
 import * as types from '../constants/actionTypes';
 import { getFallbackBasemap } from '../constants/basemaps';
-import { fetchMap } from '../util/requests';
+import { fetchMap, dataStatisticsMutation } from '../util/requests';
 import { addOrgUnitPaths } from '../util/helpers';
 import { loadLayer } from './layers';
 
@@ -50,6 +50,12 @@ export const tOpenMap = (mapId, keyDefaultBaseMap, dataEngine) => async (
     try {
         const map = await fetchMap(mapId, dataEngine, keyDefaultBaseMap);
 
+        // record map view
+        dataEngine.mutate(dataStatisticsMutation, {
+            variables: { id: mapId },
+            onError: error => log.error('Error: ', error),
+        });
+
         const basemapConfig =
             getState().basemaps.find(bm => bm.id === map.basemap.id) ||
             getFallbackBasemap();

src/components/app/FileMenu.js

@@ -1,3 +1,4 @@
+import log from 'loglevel';
 import React from 'react';
 import PropTypes from 'prop-types';
 import i18n from '@dhis2/d2-i18n';
@@ -7,7 +8,7 @@ import { useD2 } from '@dhis2/app-runtime-adapter-d2';
 import { useDataMutation, useDataEngine } from '@dhis2/app-runtime';
 import { newMap, tOpenMap, setMapProps } from '../../actions/map';
 import { setAlert } from '../../actions/alerts';
-import { fetchMap } from '../../util/requests';
+import { fetchMap, dataStatisticsMutation } from '../../util/requests';
 import { cleanMapConfig } from '../../util/favorites';
 import { useSystemSettings } from '../SystemSettingsProvider';
 
@@ -48,6 +49,10 @@ export const FileMenu = ({ map, newMap, tOpenMap, setMapProps, setAlert }) => {
         onError: e => setError({ message: getSaveFailureMessage(e.message) }),
     });
 
+    const [postDataStatistics] = useDataMutation(dataStatisticsMutation, {
+        onError: e => log.error('Error:', e.message),
+    });
+
     const saveMap = async () => {
         const config = cleanMapConfig({
             config: map,
@@ -63,6 +68,8 @@ export const FileMenu = ({ map, newMap, tOpenMap, setMapProps, setAlert }) => {
             data: config,
         });
 
+        postDataStatistics({ id: map.id });
+
         setAlert({ success: true, message: getSavedMessage(config.name) });
     };
 
@@ -96,8 +103,11 @@ export const FileMenu = ({ map, newMap, tOpenMap, setMapProps, setAlert }) => {
         });
 
         if (response.status === 'OK') {
+            const newMapId = response.response.uid;
+            postDataStatistics({ id: newMapId });
+
             const newMapConfig = await fetchMap(
-                response.response.uid,
+                newMapId,
                 engine,
                 keyDefaultBaseMap
             );

src/util/requests.js

@@ -48,6 +48,15 @@ export const fetchMap = async (id, engine, keyDefaultBaseMap) =>
 //     },
 // };
 
+export const dataStatisticsMutation = {
+    resource: 'dataStatistics',
+    params: ({ id }) => ({
+        favorite: id,
+        eventType: 'MAP_VIEW',
+    }),
+    type: 'create',
+};
+
 export const fetchOrgUnits = async () => {
     // TODO - use d2 until correct dataQuery format can be determined
     const d2 = await getD2();