Merge pull request #1014 from CruGlobal/appeal-tour

New Appeal Tour and inclusion and exclusion filters

pages/accountLists/[accountListId]/tools/appeals/AppealsWrapper.tsx

@@ -65,9 +65,12 @@ export const AppealsWrapper: React.FC<Props> = ({ children }) => {
     ) {
       setPage(PageEnum.DetailsPage);
       setContactId(appealIdParams);
-    } else if (length > 2) {
+    } else if (length === 3 && appealIdParams[2].toLowerCase() === 'tour') {
       setPage(PageEnum.ContactsPage);
       setContactId(appealIdParams);
+    } else if (length > 2) {
+      setPage(PageEnum.DetailsPage);
+      setContactId(appealIdParams);
     }
   }, [appealIdParams, accountListId]);
 

pages/accountLists/[accountListId]/tools/appeals/appeal/[[...appealId]].page.tsx

@@ -1,7 +1,7 @@
 import React, { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 import { loadSession } from 'pages/api/utils/pagePropsHelpers';
-import AppealsDetailsPage from 'src/components/Tool/Appeal/AppealsDetailsPage';
+import AppealsDetailsPage from 'src/components/Tool/Appeal/AppealDetails/AppealsDetailsPage';
 import { ToolsWrapper } from '../../ToolsWrapper';
 import { AppealsWrapper } from '../AppealsWrapper';
 

src/components/Tool/Appeal/AppealsDetailsPage.tsx → src/components/Tool/Appeal/AppealDetails/AppealsDetailsPage.tsx

@@ -3,9 +3,9 @@ import { DynamicContactsRightPanel } from 'src/components/Contacts/ContactsRight
 import { SidePanelsLayout } from 'src/components/Layouts/SidePanelsLayout';
 import { headerHeight } from 'src/components/Shared/Header/ListHeader';
 import { ContactContextTypesEnum } from 'src/lib/contactContextTypes';
-import { AppealsLeftPanel } from './AppealDetails/AppealLeftPanel/AppealsLeftPanel';
-import { AppealsMainPanel } from './AppealDetails/AppealsMainPanel/AppealsMainPanel';
-import { AppealsContext, AppealsType } from './AppealsContext/AppealsContext';
+import { AppealsContext, AppealsType } from '../AppealsContext/AppealsContext';
+import { AppealsLeftPanel } from './AppealLeftPanel/AppealsLeftPanel';
+import { AppealsMainPanel } from './AppealsMainPanel/AppealsMainPanel';
 
 const AppealsDetailsPage: React.FC = () => {
   const { filterPanelOpen, setContactFocus, contactDetailsOpen } = useContext(