Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DCJ-519: Log dar application state changes #2634

Merged
merged 6 commits into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -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));
Expand Down
7 changes: 6 additions & 1 deletion src/libs/ajax/DAR.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import { Config } from '../config';
import axios from 'axios';
import { isFileEmpty } from '../utils';
import { getApiUrl, fetchOk, getOntologyUrl, fetchAny } from '../ajax';

import {Metrics} from './Metrics';
import eventList from '../events';
import {Storage} from '../storage';

export const DAR = {
//v2 get for DARs
Expand All @@ -17,13 +19,15 @@ export const DAR = {

//v2 update for dar partials
updateDarDraft: async (dar, referenceId) => {
await Metrics.captureEvent(eventList.darUpdate);
const url = `${await getApiUrl()}/api/dar/v2/draft/${referenceId}`;
const res = await axios.put(url, dar, Config.authOpts());
return res.data;
},

//api endpoint for v2 draft submission
postDarDraft: async (dar) => {
await Metrics.captureEvent(eventList.darDraft);
const url = `${await getApiUrl()}/api/dar/v2/draft/`;
const res = await axios.post(url, dar, Config.authOpts());
return res.data;
Expand All @@ -38,6 +42,7 @@ export const DAR = {

//v2 endpoint for DAR POST
postDar: async (dar) => {
await Metrics.captureEvent(eventList.darSubmit);
const filteredDar = fp.omit(['createDate', 'sortDate', 'data_access_request_id'])(dar);
const url = `${await getApiUrl()}/api/dar/v2`;
const res = axios.post(url, filteredDar, Config.authOpts());
Expand Down
4 changes: 4 additions & 0 deletions src/libs/events.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ const eventList = {
userSignIn: 'user:signin',

pageView: 'page:view',
darDraft: 'dar:draft',
darUpdate: 'dar:update',
darAttest: 'dar:attest',
darSubmit: 'dar:submit'
};

export default eventList;
7 changes: 5 additions & 2 deletions src/pages/dar_application/DataAccessRequestApplication.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
Expand Down Expand Up @@ -347,7 +349,7 @@ const DataAccessRequestApplication = (props) => {
}
}, [goToStep, isAttested]);

const attemptSubmit = () => {
const attemptSubmit = async () => {
const validation = validateDARFormData({
formData,
datasets,
Expand All @@ -372,9 +374,10 @@ const DataAccessRequestApplication = (props) => {
if (isInvalidForm) {
scrollToFormErrors(validation, eraCommonsIdValid, hasLibraryCard);
} else {
await Metrics.captureEvent(eventList.darAttest);
setIsAttested(true);
addDucAddendumTab();
goToDucAddendum();
await goToDucAddendum();
}

return !isInvalidForm;
Expand Down
Loading