Cosmetic clean-up

met-web/src/components/engagement/form/ActionContext.tsx

@@ -1,7 +1,6 @@
 import React, { createContext, useState, useEffect, useMemo } from 'react';
-import { useRouteLoaderData } from 'react-router-dom';
 import { postEngagement, patchEngagement } from '../../../services/engagementService';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useRouteLoaderData, useNavigate, useParams } from 'react-router-dom';
 import { EngagementContext, EngagementForm, EngagementFormUpdate, EngagementParams } from './types';
 import { createDefaultEngagement, Engagement, EngagementMetadata, MetadataTaxon } from '../../../models/engagement';
 import { saveObject } from 'services/objectStorageService';

met-web/src/components/engagement/form/EngagementFormTabs/EngagementContent/ContentTabs.tsx

@@ -52,7 +52,6 @@ export const ContentTabs: React.FC = () => {
             return;
         }
         await deleteEngagementContent(savedEngagement.id, tab_id);
-        // await fetchEngagementContents();
         setTabIndex(0);
 
         // Check if the deleted tab was a custom tab and reset customTabAdded state

met-web/src/components/engagement/listing/index.tsx

@@ -31,7 +31,6 @@ import { Button, TextInput } from 'components/common/Input';
 import { faPlus } from '@fortawesome/pro-regular-svg-icons';
 import { AutoBreadcrumbs } from 'components/common/Navigation/Breadcrumb';
 import { Page } from 'services/type';
-import { GetEngagementsParams } from 'services/engagementService';
 
 interface SearchFilter {
     key?: string;

met-web/src/components/engagement/view/ActionContext.tsx

@@ -205,14 +205,6 @@ export const ActionProvider = ({ children }: { children: JSX.Element | JSX.Eleme
         handleFetchEngagementIdBySlug();
     }, [slug]);
 
-    useEffect(() => {
-        // revalidator.revalidate();
-    }, [engagementId]);
-
-    useEffect(() => {
-        // revalidator.revalidate();
-    }, [savedEngagement]);
-
     return (
         <ActionContext.Provider
             value={{

met-web/src/routes/AuthenticatedRoutes.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { Params, defer, Navigate, Route } from 'react-router-dom';
 import NotFound from './NotFound';
-import EngagementForm from '../components/engagement/form'; // TODO: Convert tenant calls to route loader
-import EngagementListing from '../components/engagement/listing'; // TODO: Convert tenant calls to route loader
-import EngagementView from '../components/engagement/view'; // TODO: Convert tenant calls to route loader
+import EngagementForm from '../components/engagement/form';
+import EngagementListing from '../components/engagement/listing';
+import EngagementView from '../components/engagement/view';
 import SurveyListing from 'components/survey/listing';
 import CreateSurvey from 'components/survey/create';
 import SurveyFormBuilder from 'components/survey/building';
@@ -17,7 +17,7 @@ import EngagementComments from '../components/engagement/dashboard/comment';
 import UnderConstruction from './UnderConstruction';
 import FeedbackListing from 'components/feedback/listing';
 import UserManagementListing from 'components/userManagement/listing';
-import Dashboard from 'components/dashboard'; // TODO: Convert tenant calls to route loader
+import Dashboard from 'components/dashboard';
 import Unauthorized from './Unauthorized';
 import AuthGate from './AuthGate';
 import { USER_ROLES } from 'services/userService/constants';

met-web/src/routes/UnauthenticatedRoutes.tsx

@@ -1,7 +1,7 @@
 import SurveySubmit from 'components/survey/submit';
 import EditSurvey from 'components/survey/edit';
 import React from 'react';
-import EngagementView from '../components/engagement/view'; // TODO: Convert tenant calls to route loader
+import EngagementView from '../components/engagement/view';
 import NotAvailable from './NotAvailable';
 import EngagementComments from '../components/engagement/dashboard/comment';
 import PublicDashboard from 'components/publicDashboard';
@@ -12,7 +12,7 @@ import { RedirectLogin } from './RedirectLogin';
 import withLanguageParam from './LanguageParam';
 import { Navigate, Route } from 'react-router-dom';
 import NotFound from './NotFound';
-import ViewEngagement, { engagementLoader } from 'components/engagement/new/view'; // TODO: Convert tenant calls to route loader
+import ViewEngagement, { engagementLoader } from 'components/engagement/new/view';
 import { SurveyLoader } from 'components/survey/building/SurveyLoader';
 
 const ManageSubscriptionWrapper = withLanguageParam(ManageSubscription);

met-web/tests/unit/components/engagement/EngagementFormUserTab.test.tsx

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import { render, waitFor, screen, fireEvent, waitForElementToBeRemoved } from '@testing-library/react';
+import { render, waitFor, screen, fireEvent } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import EngagementForm from '../../../../src/components/engagement/form';
 import { setupEnv } from '../setEnvVars';

met-web/tests/unit/components/engagement/EngagementListing.test.tsx

@@ -139,7 +139,6 @@ const router = createMemoryRouter(
 describe('Engagement listing page tests', () => {
     jest.spyOn(reactRedux, 'useDispatch').mockImplementation(() => jest.fn());
     jest.spyOn(notificationSlice, 'openNotification').mockImplementation(jest.fn());
-    const getEngagementMock = jest.spyOn(engagementService, 'getEngagements');
 
     beforeEach(() => {
         setupEnv();