DCJ-519: Log dar application state changes (#2634)

DataBiosphere · Jul 30, 2024 · feaf2d3 · feaf2d3
1 parent e3c6640
commit feaf2d3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/cypress/component/DataAccessRequest/data_access_request_validation.spec.js b/cypress/component/DataAccessRequest/data_access_request_validation.spec.js
@@ -5,10 +5,11 @@ import DataAccessRequestApplication from '../../../src/pages/dar_application/Dat
 import { MemoryRouter } from 'react-router-dom';
 import { DAR } from '../../../src/libs/ajax/DAR';
 import { DataSet } from '../../../src/libs/ajax/DataSet';
-import { User } from '../../../src/libs/ajax/User';
-import { Storage } from '../../../src/libs/storage.js';
+import { Metrics } from '../../../src/libs/ajax/Metrics';
 import { Navigation } from '../../../src/libs/utils.js';
 import { NotificationService } from '../../../src/libs/notificationService';
+import { Storage } from '../../../src/libs/storage.js';
+import { User } from '../../../src/libs/ajax/User';
 
 const props = {
   match: {
@@ -90,6 +91,7 @@ describe('Data Access Request - Validation', () => {
 
   describe('With Library Cards', () => {
     beforeEach(() => {
+      cy.stub(Metrics, 'captureEvent').returns(Promise.resolve());
       cy.stub(User, 'getSOsForCurrentUser').returns(userSigningOfficials);
       cy.stub(DataSet, 'autocompleteDatasets').returns(Promise.resolve(datasets));
       cy.stub(DataSet, 'getDatasetsByIds').returns(Promise.resolve(datasets));

diff --git a/src/libs/ajax/DAR.js b/src/libs/ajax/DAR.js
@@ -6,6 +6,8 @@ import axios from 'axios';
 import { isFileEmpty } from '../utils';
 import { getApiUrl, fetchOk, getOntologyUrl, fetchAny } from '../ajax';
 import {DAAUtils} from '../../utils/DAAUtils';
+import {Metrics} from './Metrics';
+import eventList from '../events';
 
 export const DAR = {
   //v2 get for DARs
@@ -17,6 +19,7 @@ export const DAR = {
 
   //v2, v3 Draft DAR Update
   updateDarDraft: async (dar, referenceId) => {
+    await Metrics.captureEvent(eventList.dar, {'action': 'update'});
     const url = DAAUtils.isEnabled() ?
       `${await getApiUrl()}/api/dar/v3/draft/${referenceId}` :
       `${await getApiUrl()}/api/dar/v2/draft/${referenceId}`;
@@ -26,6 +29,7 @@ export const DAR = {
 
   //v2, v3 Draft DAR Creation
   postDarDraft: async (dar) => {
+    await Metrics.captureEvent(eventList.dar, {'action': 'draft'});
     const url = DAAUtils.isEnabled() ?
       `${await getApiUrl()}/api/dar/v3/draft` :
       `${await getApiUrl()}/api/dar/v2/draft`;
@@ -42,6 +46,7 @@ export const DAR = {
 
   //v2, v3 DAR Creation
   postDar: async (dar) => {
+    await Metrics.captureEvent(eventList.dar, {'action': 'submit'});
     const filteredDar = fp.omit(['createDate', 'sortDate', 'data_access_request_id'])(dar);
     const url = DAAUtils.isEnabled() ?
       `${await getApiUrl()}/api/dar/v3` :

diff --git a/src/libs/events.js b/src/libs/events.js
@@ -11,7 +11,8 @@ const eventList = {
   dataLibraryBrand: (brand) => {
     const cleanKey = brand.replaceAll('/', '');
     return `page:view:dataLibrary:${cleanKey}`;
-  }
+  },
+  dar: 'page:view:dar'
 };
 
 export default eventList;
diff --git a/src/pages/dar_application/DataAccessRequestApplication.jsx b/src/pages/dar_application/DataAccessRequestApplication.jsx
@@ -31,6 +31,8 @@ import { isArray, set } from 'lodash';
 import DucAddendum from './DucAddendum';
 import UsgOmbText from '../../components/UsgOmbText';
 import {DAAUtils} from '../../utils/DAAUtils';
+import {Metrics} from '../../libs/ajax/Metrics';
+import eventList from '../../libs/events';
 const ApplicationTabs = [
   { name: 'Researcher Information' },
   { name: 'Data Access Request' },
@@ -348,7 +350,7 @@ const DataAccessRequestApplication = (props) => {
     }
   }, [goToStep, isAttested]);
 
-  const attemptSubmit = () => {
+  const attemptSubmit = async () => {
     const validation = validateDARFormData({
       formData,
       datasets: (props.draftDar && DAAUtils.isEnabled()) ? selectedDatasets : datasets,
@@ -373,9 +375,10 @@ const DataAccessRequestApplication = (props) => {
     if (isInvalidForm) {
       scrollToFormErrors(validation, eraCommonsIdValid, hasLibraryCard);
     } else {
+      await Metrics.captureEvent(eventList.dar, {'action': 'attest'});
       setIsAttested(true);
       addDucAddendumTab();
-      goToDucAddendum();
+      await goToDucAddendum();
     }
 
     return !isInvalidForm;