DUOS-2014[risk=no] Updated Researcher Actions functionality to account for DarCollectionSummary

src/components/dar_collection_table/Actions.js

@@ -42,7 +42,6 @@ const resumeDARApplication = (referenceId, history) => {
 export default function Actions(props) {
   const { showConfirmationModal, collection, goToVote, consoleType, actions = [] } = props;
   const collectionId = collection.darCollectionId;
-
   const uniqueId = (collectionId ? collectionId : collection.referenceIds[0]);
 
   const history = useHistory();
@@ -72,7 +71,7 @@ export default function Actions(props) {
     onClick: () => showConfirmationModal(collection, 'cancel'),
     style: baseCancelButtonStyle,
     hoverStyle: hoverCancelButtonStyle,
-    dataTip: 'Cancel Elections',
+    dataTip: `Cancel ${consoleType === 'researcher' ? 'Collection' : 'Elections'}`,
     icon: Block,
   };
 

src/libs/ajax.js

@@ -190,7 +190,7 @@ export const Collections = {
     return res.data;
   },
   getCollectionSummaryByRoleNameAndId: async({roleName, id}) => {
-    const url = `${await Config.getApiUrl()}/api/collections/role/${roleName}/summary/${id}`;
+    const url = `${await getApiUrl()}/api/collections/role/${roleName}/summary/${id}`;
     const res = await axios.get(url, Config.authOpts());
     return res.data;
   },

src/libs/utils.js

@@ -1,7 +1,7 @@
 import Noty from 'noty';
 import 'noty/lib/noty.css';
 import 'noty/lib/themes/bootstrap-v3.css';
-import {map as nonFPMap} from 'lodash';
+import {map as nonFPMap, forEach as nonFPForEach} from 'lodash';
 import { DAR, DataSet } from './ajax';
 import {Theme, Styles } from './theme';
 import { each, flatMap, flatten, flow, forEach, get, getOr, indexOf, uniq, values, find, first, map, isEmpty, filter, cloneDeep, isNil, toLower, includes, every, capitalize } from 'lodash/fp';
@@ -110,7 +110,7 @@ export const getPropertyValuesFromUser = (user) => {
 };
 
 export const applyHoverEffects = (e, style) => {
-  forEach((key, value) => {
+  nonFPForEach((key, value) => {
     e.target.style[key] = value;
   })(style);
 };

src/pages/ResearcherConsole.js

@@ -5,31 +5,10 @@ import { Styles } from '../libs/theme';
 import { Collections, DAR } from '../libs/ajax';
 import { DarCollectionTableColumnOptions, DarCollectionTable } from '../components/dar_collection_table/DarCollectionTable';
 import accessIcon from '../images/icon_access.png';
-import {Notifications, searchOnFilteredList, getSearchFilterFunctions, formatDate} from '../libs/utils';
+import {Notifications, searchOnFilteredList, getSearchFilterFunctions } from '../libs/utils';
 import SearchBar from '../components/SearchBar';
 import { consoleTypes } from '../components/dar_table/DarTableActions';
-
-const formatDraft = (draft) => {
-  const { data, referenceId, id, createDate } = draft;
-  const {
-    projectTitle,
-    datasets,
-    institution,
-  } = data;
-  const darCode = 'DRAFT_DAR_' + formatDate(createDate);
-
-  const output =  {
-    darCode,
-    referenceId,
-    darCollectionId: id,
-    projectTitle,
-    isDraft: true,
-    createDate: 'Unsubmitted',
-    datasets,
-    institution,
-  };
-  return output;
-};
+import { USER_ROLES } from '../libs/utils';
 
 const filterFn = getSearchFilterFunctions().darCollections;
 
@@ -73,14 +52,15 @@ export default function ResearcherConsole() {
   const cancelCollection = async (darCollection) => {
     try {
       const { darCollectionId, darCode } = darCollection;
-      const canceledCollection = await Collections.cancelCollection(darCollectionId);
+      await Collections.cancelCollection(darCollectionId);
+      const updatedCollection = await Collections.getCollectionSummaryByRoleNameAndId({roleName: USER_ROLES.researcher, id: darCollectionId});
       const targetIndex = researcherCollections.findIndex((collection) =>
         collection.darCollectionId === darCollectionId);
       if (targetIndex < 0) {
         throw new Error('Error: Could not find target Data Access Request');
       }
       const clonedCollections = cloneDeep(researcherCollections);
-      clonedCollections[targetIndex] = canceledCollection;
+      clonedCollections[targetIndex] = updatedCollection;
       setResearcherCollections(clonedCollections);
       Notifications.showSuccess({text: `Deleted Data Access Request ${darCode}`});
     } catch (error) {
@@ -102,7 +82,7 @@ export default function ResearcherConsole() {
       }
       //remove resubmitted collection from DAR Collection table
       const clonedCollections = cloneDeep(researcherCollections);
-      clonedCollections[targetIndex] = formatDraft(draftCollection);
+      clonedCollections[targetIndex] = draftCollection;
       setResearcherCollections(clonedCollections);
       Notifications.showSuccess({text: `Revising Data Access Request ${darCode}`});
     } catch (error) {
@@ -132,7 +112,6 @@ export default function ResearcherConsole() {
   const deleteDraft = async ({ referenceIds, darCode }) => {
     try {
       const targetIndex = deleteDraftById({ referenceId: referenceIds[0] });
-
       if (targetIndex === -1) {
         Notifications.showError({ text: 'Error processing delete request' });
       } else {