Dmirano/3787 activites dashboard restructure (#3959)

* layout restructure

* updated tests

* dashboard refactor

* update tests

* added login refactor

* updated tests

* added admin refactor

* updated tests

* route refactor

* route refactor to /pages/

* updated tests (not finishes yet)

* apd components refactor

* updated tests (route still causing issues)

* updated tests

* update tests, all pass now

* fixed merge conflicts

* relocated apd overview components

* updated tests and renamed to ApdOverview

* key state refactor

* updated tests

* previous activity restructure

* updated tests

* schedule summary refactor

* update tests

* executive summary restructure

* updated tests

* proposed budget refactor

* updated tests

* assurance and compliance restructure

* updated tests

* update tests after merge with proposed budget refactor

* export refactor

* updated tests

* activities refactor

* update tests

* activities dashboard refactor

* updated tests

* updated failing tests

web/src/pages/apd/ApdPageRoutes.js

@@ -8,7 +8,7 @@ import {
 } from 'react-router-dom';
 
 import ApdHeader from '../../layout/header/ApdHeader';
-import Activities from '../../containers/activity/All';
+import Activities from './activities/activities-dashboard/ActivitiesDashboard';
 import EntryPage from '../../containers/activity/EntryPage';
 import AssurancesAndCompliance from './assurances-and-compliance/AssurancesAndCompliance';
 import Export from './export/ApdExport';

web/src/pages/apd/ApdReadOnly.js

@@ -15,7 +15,7 @@ import { getUserStateOrTerritory } from '../../reducers/user.selector';
 import ApdStateProfile from './key-state-personnel/KeyStatePersonnelReadOnly';
 import ApdSummary from '../../containers/viewOnly/ApdSummary';
 import PreviousActivities from './previous-activities/PreviousActivitiesReadOnly';
-import Activities from '../../containers/viewOnly/activities/All';
+import Activities from './activities/activities-dashboard/ActivitiesDashboardReadOnly';
 import ScheduleSummary from './schedule-summary/ScheduleSummaryReadOnly';
 import ProposedBudget from './proposed-budget/ProposedBudgetReadOnly';
 import AssuranceAndCompliance from './assurances-and-compliance/AssurancesAndComplianceReadOnly';

web/src/containers/activity/All.js → web/src/pages/apd/activities/activities-dashboard/ActivitiesDashboard.js

@@ -4,12 +4,12 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { useParams } from 'react-router-dom';
 
-import EntryDetails from './EntryDetails';
-import { addActivity as actualAddActivity } from '../../actions/editActivity';
-import { Section } from '../../components/Section';
-import { selectAllActivities } from '../../reducers/activities.selectors';
-import Waypoint from '../ConnectedWaypoint';
-import AlertMissingFFY from '../../components/AlertMissingFFY';
+import EntryDetails from './Activity';
+import { addActivity as actualAddActivity } from '../../../../actions/editActivity';
+import { Section } from '../../../../components/Section';
+import { selectAllActivities } from '../../../../reducers/activities.selectors';
+import Waypoint from '../../../../containers/ConnectedWaypoint';
+import AlertMissingFFY from '../../../../components/AlertMissingFFY';
 
 const All = ({ addActivity, activities }) => {
   const { apdId } = useParams();

web/src/containers/activity/All.test.js → web/src/pages/apd/activities/activities-dashboard/ActivitiesDashboard.test.js

@@ -1,13 +1,13 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { addActivity } from '../../actions/editActivity';
+import { addActivity } from '../../../../actions/editActivity';
 
 import {
   plain as Activities,
   mapStateToProps,
   mapDispatchToProps
-} from './All';
+} from './ActivitiesDashboard';
 
 const initialProps = {
   addActivity: () => {},

web/src/containers/viewOnly/activities/All.js → web/src/pages/apd/activities/activities-dashboard/ActivitiesDashboardReadOnly.js

@@ -2,8 +2,8 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { v4 as uuidv4 } from 'uuid';
 
-import ActivityList from './ActivityList';
-import Activity from './Activity';
+import ActivityList from './ActivityListReadOnly';
+import Activity from './ActivityReadOnly';
 
 const Activities = ({ activities }) => {
   return (

web/src/containers/viewOnly/activities/All.test.js → web/src/pages/apd/activities/activities-dashboard/ActivitiesDashboardReadOnly.test.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import { renderWithConnection, within } from 'apd-testing-library';
-import Activities from './All';
-import apd, { activities } from '../../../fixtures/mo-hitech-apd';
-import budget from '../../../fixtures/mo-hitech-budget';
+import Activities from './ActivitiesDashboardReadOnly';
+import apd, { activities } from '../../../../fixtures/mo-hitech-apd';
+import budget from '../../../../fixtures/mo-hitech-budget';
 
 let props;
 let renderUtils;
@@ -28,7 +28,9 @@ describe('viewOnly <Activities />', () => {
     activities.forEach((activity, index) => {
       expect(
         getByTextWithin(
-          `${index + 1}. ${activity.name || "Untitled"} | ${activity.fundingSource}`
+          `${index + 1}. ${activity.name || 'Untitled'} | ${
+            activity.fundingSource
+          }`
         )
       ).toBeTruthy();
     });

web/src/containers/activity/EntryDetails.js → web/src/pages/apd/activities/activities-dashboard/Activity.js

@@ -4,12 +4,12 @@ import React, { useMemo, useRef, Fragment, useState } from 'react';
 import { connect } from 'react-redux';
 
 import { titleCase } from 'title-case';
-import { selectActivityByIndex } from '../../reducers/activities.selectors';
-import { removeActivity } from '../../actions/editActivity';
-import NavLink from '../../layout/nav/NavLink';
+import { selectActivityByIndex } from '../../../../reducers/activities.selectors';
+import { removeActivity } from '../../../../actions/editActivity';
+import NavLink from '../../../../layout/nav/NavLink';
 
-import { t } from '../../i18n';
-import DeleteModal from '../../components/DeleteModal';
+import { t } from '../../../../i18n';
+import DeleteModal from '../../../../components/DeleteModal';
 
 const makeTitle = ({ name, fundingSource }, i) => {
   let title = `${t('activities.namePrefix')} ${i}`;

web/src/containers/activity/EntryDetails.test.js → web/src/pages/apd/activities/activities-dashboard/Activity.test.js

@@ -1,13 +1,13 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { removeActivity } from '../../actions/editActivity';
+import { removeActivity } from '../../../../actions/editActivity';
 
 import {
   plain as EntryDetails,
   mapStateToProps,
   mapDispatchToProps
-} from './EntryDetails';
+} from './Activity';
 
 const mockPush = jest.fn();
 

web/src/containers/viewOnly/activities/Activity.js → web/src/pages/apd/activities/activities-dashboard/ActivityReadOnly.js

@@ -2,10 +2,10 @@
 import PropTypes from 'prop-types';
 import React, { Fragment } from 'react';
 import { v4 as uuidv4 } from 'uuid';
-import Dollars from '../../../components/Dollars';
+import Dollars from '../../../../components/Dollars';
 
-import CostAllocateFFP from '../../activity/CostAllocateFFP';
-import { stateDateToDisplay, stateDateRangeToDisplay } from '../../../util';
+import CostAllocateFFP from '../../../../containers/activity/CostAllocateFFP';
+import { stateDateToDisplay, stateDateRangeToDisplay } from '../../../../util';
 
 const isYear = value => !!value.match(/^[0-9]{4}$/);
 

web/src/containers/viewOnly/activities/Activity.test.js → web/src/pages/apd/activities/activities-dashboard/ActivityReadOnly.test.js

@@ -1,7 +1,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import Activity from './Activity';
+import Activity from './ActivityReadOnly';
 
 const activity = {
   alternatives: '<p>This is a list of alternatives</p>\n',