MPDX-9494 - Merge src/components/common into src/components/Shared and fix imports

pages/accountLists/[accountListId]/contacts/ContactsWrapper.tsx

@@ -2,9 +2,9 @@ import { ParsedUrlQuery } from 'node:querystring';
 import { useRouter } from 'next/router';
 import React, { useMemo } from 'react';
 import { ContactsProvider } from 'src/components/Contacts/ContactsContext/ContactsContext';
+import { ContactPanelProvider } from 'src/components/Shared/ContactPanelProvider/ContactPanelProvider';
 import { TableViewModeEnum } from 'src/components/Shared/Header/ListHeader';
-import { ContactPanelProvider } from 'src/components/common/ContactPanelProvider/ContactPanelProvider';
-import { UrlFiltersProvider } from 'src/components/common/UrlFiltersProvider/UrlFiltersProvider';
+import { UrlFiltersProvider } from 'src/components/Shared/UrlFiltersProvider/UrlFiltersProvider';
 import { useUserPreference } from 'src/hooks/useUserPreference';
 
 // Extract the initial view mode from the URL

pages/accountLists/[accountListId]/contacts/[[...contactId]].page.tsx

@@ -11,11 +11,11 @@ import { ContactsMainPanel } from 'src/components/Contacts/ContactsMainPanel/Con
 import { DynamicContactsRightPanel } from 'src/components/Contacts/ContactsRightPanel/DynamicContactsRightPanel';
 import { SidePanelsLayout } from 'src/components/Layouts/SidePanelsLayout';
 import Loading from 'src/components/Loading';
+import { useContactPanel } from 'src/components/Shared/ContactPanelProvider/ContactPanelProvider';
 import {
   TableViewModeEnum,
   headerHeight,
 } from 'src/components/Shared/Header/ListHeader';
-import { useContactPanel } from 'src/components/common/ContactPanelProvider/ContactPanelProvider';
 import { getAppName } from 'src/lib/getAppName';
 import { ContactsWrapper } from './ContactsWrapper';
 

pages/accountLists/[accountListId]/reports/donations/[[...contactId]].page.tsx

@@ -6,15 +6,15 @@ import { DynamicContactsRightPanel } from 'src/components/Contacts/ContactsRight
 import { SidePanelsLayout } from 'src/components/Layouts/SidePanelsLayout';
 import Loading from 'src/components/Loading';
 import { DonationsReport } from 'src/components/Reports/DonationsReport/DonationsReport';
+import {
+  ContactPanelProvider,
+  useContactPanel,
+} from 'src/components/Shared/ContactPanelProvider/ContactPanelProvider';
 import {
   MultiPageMenu,
   NavTypeEnum,
 } from 'src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenu';
 import { ReportPageWrapper } from 'src/components/Shared/styledComponents/ReportPageWrapper';
-import {
-  ContactPanelProvider,
-  useContactPanel,
-} from 'src/components/common/ContactPanelProvider/ContactPanelProvider';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { getAppName } from 'src/lib/getAppName';
 

pages/accountLists/[accountListId]/reports/expectedMonthlyTotal/[[...contactId]].page.tsx

@@ -7,15 +7,15 @@ import { SidePanelsLayout } from 'src/components/Layouts/SidePanelsLayout';
 import Loading from 'src/components/Loading';
 import { ExpectedMonthlyTotalReport } from 'src/components/Reports/ExpectedMonthlyTotalReport/ExpectedMonthlyTotalReport';
 import { ExpectedMonthlyTotalReportHeader } from 'src/components/Reports/ExpectedMonthlyTotalReport/Header/ExpectedMonthlyTotalReportHeader';
+import {
+  ContactPanelProvider,
+  useContactPanel,
+} from 'src/components/Shared/ContactPanelProvider/ContactPanelProvider';
 import {
   MultiPageMenu,
   NavTypeEnum,
 } from 'src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenu';
 import { ReportPageWrapper } from 'src/components/Shared/styledComponents/ReportPageWrapper';
-import {
-  ContactPanelProvider,
-  useContactPanel,
-} from 'src/components/common/ContactPanelProvider/ContactPanelProvider';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { getAppName } from 'src/lib/getAppName';
 

pages/accountLists/[accountListId]/reports/financialAccounts/[financialAccountId]/Wrapper.tsx

@@ -1,7 +1,7 @@
 import { useRouter } from 'next/router';
 import React, { useEffect, useState } from 'react';
 import { FinancialAccountProvider } from 'src/components/Reports/FinancialAccountsReport/Context/FinancialAccountsContext';
-import { UrlFiltersProvider } from 'src/components/common/UrlFiltersProvider/UrlFiltersProvider';
+import { UrlFiltersProvider } from 'src/components/Shared/UrlFiltersProvider/UrlFiltersProvider';
 import { getQueryParam } from 'src/lib/queryParam';
 
 interface Props {

pages/accountLists/[accountListId]/reports/financialAccounts/[financialAccountId]/entries.page.tsx

@@ -20,8 +20,8 @@ import {
   MultiPageMenu,
   NavTypeEnum,
 } from 'src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenu';
+import { UrlFiltersProvider } from 'src/components/Shared/UrlFiltersProvider/UrlFiltersProvider';
 import { UserTypeAccess } from 'src/components/Shared/UserTypeAccess/UserTypeAccess';
-import { UrlFiltersProvider } from 'src/components/common/UrlFiltersProvider/UrlFiltersProvider';
 import { UserTypeEnum } from 'src/graphql/types.generated';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { useReportsDisabled } from 'src/hooks/useReportsDisabled';

pages/accountLists/[accountListId]/reports/partnerCurrency/[[...contactId]].page.tsx

@@ -9,15 +9,15 @@ import {
   FourteenMonthReport,
   FourteenMonthReportCurrencyType,
 } from 'src/components/Reports/FourteenMonthReports/FourteenMonthReport';
+import {
+  ContactPanelProvider,
+  useContactPanel,
+} from 'src/components/Shared/ContactPanelProvider/ContactPanelProvider';
 import {
   MultiPageMenu,
   NavTypeEnum,
 } from 'src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenu';
 import { ReportPageWrapper } from 'src/components/Shared/styledComponents/ReportPageWrapper';
-import {
-  ContactPanelProvider,
-  useContactPanel,
-} from 'src/components/common/ContactPanelProvider/ContactPanelProvider';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { getAppName } from 'src/lib/getAppName';
 

pages/accountLists/[accountListId]/reports/partnerGivingAnalysis/[[...contactId]].page.tsx

@@ -7,16 +7,16 @@ import { DynamicContactsRightPanel } from 'src/components/Contacts/ContactsRight
 import { SidePanelsLayout } from 'src/components/Layouts/SidePanelsLayout';
 import Loading from 'src/components/Loading';
 import { PartnerGivingAnalysisReport } from 'src/components/Reports/PartnerGivingAnalysisReport/PartnerGivingAnalysisReport';
+import {
+  ContactPanelProvider,
+  useContactPanel,
+} from 'src/components/Shared/ContactPanelProvider/ContactPanelProvider';
 import { DynamicFilterPanel } from 'src/components/Shared/Filters/DynamicFilterPanel';
 import {
   MultiPageMenu,
   NavTypeEnum,
 } from 'src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenu';
-import {
-  ContactPanelProvider,
-  useContactPanel,
-} from 'src/components/common/ContactPanelProvider/ContactPanelProvider';
-import { UrlFiltersProvider } from 'src/components/common/UrlFiltersProvider/UrlFiltersProvider';
+import { UrlFiltersProvider } from 'src/components/Shared/UrlFiltersProvider/UrlFiltersProvider';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { getAppName } from 'src/lib/getAppName';
 import { useContactFiltersQuery } from '../../contacts/Contacts.generated';

pages/accountLists/[accountListId]/reports/salaryCurrency/[[...contactId]].page.tsx

@@ -9,15 +9,15 @@ import {
   FourteenMonthReport,
   FourteenMonthReportCurrencyType,
 } from 'src/components/Reports/FourteenMonthReports/FourteenMonthReport';
+import {
+  ContactPanelProvider,
+  useContactPanel,
+} from 'src/components/Shared/ContactPanelProvider/ContactPanelProvider';
 import {
   MultiPageMenu,
   NavTypeEnum,
 } from 'src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenu';
 import { ReportPageWrapper } from 'src/components/Shared/styledComponents/ReportPageWrapper';
-import {
-  ContactPanelProvider,
-  useContactPanel,
-} from 'src/components/common/ContactPanelProvider/ContactPanelProvider';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { getAppName } from 'src/lib/getAppName';
 

pages/accountLists/[accountListId]/settings/organizations.page.tsx

@@ -5,9 +5,9 @@ import { useTranslation } from 'react-i18next';
 import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
 import { ImpersonateUserAccordion } from 'src/components/Settings/Organization/ImpersonateUser/ImpersonateUserAccordion';
 import { ManageOrganizationAccessAccordion } from 'src/components/Settings/Organization/ManageOrganizationAccess/ManageOrganizationAccessAccordion';
+import { OrganizationAutocomplete } from 'src/components/Shared/Autocomplete/OrganizationAutocomplete/OrganizationAutocomplete';
 import { OrganizationAccordion } from 'src/components/Shared/Forms/Accordions/AccordionEnum';
 import { AccordionGroup } from 'src/components/Shared/Forms/Accordions/AccordionGroup';
-import { OrganizationAutocomplete } from 'src/components/common/Autocomplete/OrganizationAutocomplete/OrganizationAutocomplete';
 import { Organizations as OrganizationsType } from 'src/graphql/types.generated';
 import { SettingsWrapper } from './Wrapper';
 import { useOrganizationsQuery } from './organizations.generated';

pages/accountLists/[accountListId]/settings/organizations/accountLists.page.tsx

@@ -11,7 +11,7 @@ import useMediaQuery from '@mui/material/useMediaQuery';
 import { useTranslation } from 'react-i18next';
 import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
 import { AccountLists } from 'src/components/Settings/Organization/AccountLists/AccountLists';
-import { OrganizationAutocomplete } from 'src/components/common/Autocomplete/OrganizationAutocomplete/OrganizationAutocomplete';
+import { OrganizationAutocomplete } from 'src/components/Shared/Autocomplete/OrganizationAutocomplete/OrganizationAutocomplete';
 import { useDebouncedValue } from 'src/hooks/useDebounce';
 import { SettingsWrapper } from '../Wrapper';
 import {

pages/accountLists/[accountListId]/settings/organizations/contacts.page.tsx

@@ -11,7 +11,7 @@ import useMediaQuery from '@mui/material/useMediaQuery';
 import { useTranslation } from 'react-i18next';
 import { ensureSessionAndAccountList } from 'pages/api/utils/pagePropsHelpers';
 import { Contacts } from 'src/components/Settings/Organization/Contacts/Contacts';
-import { OrganizationAutocomplete } from 'src/components/common/Autocomplete/OrganizationAutocomplete/OrganizationAutocomplete';
+import { OrganizationAutocomplete } from 'src/components/Shared/Autocomplete/OrganizationAutocomplete/OrganizationAutocomplete';
 import { useDebouncedValue } from 'src/hooks/useDebounce';
 import { SettingsWrapper } from '../Wrapper';
 import {

pages/accountLists/[accountListId]/tasks/[[...contactId]].page.tsx

@@ -13,6 +13,10 @@ import { InfiniteList } from 'src/components/InfiniteList/InfiniteList';
 import { navBarHeight } from 'src/components/Layouts/Primary/Primary';
 import { SidePanelsLayout } from 'src/components/Layouts/SidePanelsLayout';
 import Loading from 'src/components/Loading';
+import {
+  ContactPanelProvider,
+  useContactPanel,
+} from 'src/components/Shared/ContactPanelProvider/ContactPanelProvider';
 import { DynamicFilterPanel } from 'src/components/Shared/Filters/DynamicFilterPanel';
 import { UserOptionFragment } from 'src/components/Shared/Filters/FilterPanel.generated';
 import NullState from 'src/components/Shared/Filters/NullState/NullState';
@@ -21,16 +25,12 @@ import {
   PageEnum,
   headerHeight,
 } from 'src/components/Shared/Header/ListHeader';
-import { TaskModalEnum } from 'src/components/Task/Modal/TaskModal';
-import { TaskRow } from 'src/components/Task/TaskRow/TaskRow';
-import {
-  ContactPanelProvider,
-  useContactPanel,
-} from 'src/components/common/ContactPanelProvider/ContactPanelProvider';
 import {
   UrlFiltersProvider,
   useUrlFilters,
-} from 'src/components/common/UrlFiltersProvider/UrlFiltersProvider';
+} from 'src/components/Shared/UrlFiltersProvider/UrlFiltersProvider';
+import { TaskModalEnum } from 'src/components/Task/Modal/TaskModal';
+import { TaskRow } from 'src/components/Task/TaskRow/TaskRow';
 import { useGetTaskIdsForMassSelectionQuery } from 'src/hooks/GetIdsForMassSelection.generated';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { useMassSelection } from 'src/hooks/useMassSelection';

pages/accountLists/[accountListId]/tools/ToolsWrapper.tsx

@@ -4,16 +4,16 @@ import { DynamicContactsRightPanel } from 'src/components/Contacts/ContactsRight
 import { navBarHeight } from 'src/components/Layouts/Primary/Primary';
 import { SidePanelsLayout } from 'src/components/Layouts/SidePanelsLayout';
 import Loading from 'src/components/Loading';
+import {
+  ContactPanelProvider,
+  useContactPanel,
+} from 'src/components/Shared/ContactPanelProvider/ContactPanelProvider';
 import {
   HeaderTypeEnum,
   MultiPageHeader,
   multiPageHeaderHeight,
 } from 'src/components/Shared/MultiPageLayout/MultiPageHeader';
 import NavToolList from 'src/components/Tool/NavToolList/NavToolList';
-import {
-  ContactPanelProvider,
-  useContactPanel,
-} from 'src/components/common/ContactPanelProvider/ContactPanelProvider';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { getAppName } from 'src/lib/getAppName';
 import { PageContentWrapper } from '../settings/styledComponents/PageContentWrapper';

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

@@ -1,14 +1,14 @@
 import { useRouter } from 'next/router';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useGetUserOptionsLazyQuery } from 'src/components/Contacts/ContactFlow/GetUserOptions.generated';
+import { ContactPanelProvider } from 'src/components/Shared/ContactPanelProvider/ContactPanelProvider';
+import { UrlFiltersProvider } from 'src/components/Shared/UrlFiltersProvider/UrlFiltersProvider';
 import {
   AppealTourEnum,
   AppealsProvider,
   AppealsViewModeEnum,
   TableViewModeEnum,
 } from 'src/components/Tool/Appeal/AppealsContext/AppealsContext';
-import { ContactPanelProvider } from 'src/components/common/ContactPanelProvider/ContactPanelProvider';
-import { UrlFiltersProvider } from 'src/components/common/UrlFiltersProvider/UrlFiltersProvider';
 import { useUpdateUserOptionMutation } from 'src/hooks/UserPreference.generated';
 
 /**

pages/setup/start.page.tsx

@@ -5,11 +5,11 @@ import { useUpdatePersonalPreferencesMutation } from 'src/components/Settings/pr
 import { SetupPage } from 'src/components/Setup/SetupPage';
 import { LargeButton } from 'src/components/Setup/styledComponents';
 import { useNextSetupPage } from 'src/components/Setup/useNextSetupPage';
+import { LanguageAutocomplete } from 'src/components/Shared/Autocomplete/LanguageAutocomplete/LanguageAutocomplete';
 import {
   PrivacyPolicyLink,
   TermsOfUseLink,
 } from 'src/components/Shared/Links/Links';
-import { LanguageAutocomplete } from 'src/components/common/Autocomplete/LanguageAutocomplete/LanguageAutocomplete';
 import { getAppName } from 'src/lib/getAppName';
 import { ensureSessionAndAccountList } from '../api/utils/pagePropsHelpers';
 

src/components/Announcements/AnnouncementModal/AnnouncementModal.tsx

@@ -1,8 +1,8 @@
 import React, { useMemo } from 'react';
 import { Box, DialogActions, DialogContent, Typography } from '@mui/material';
 import { useTranslation } from 'react-i18next';
-import { CancelButton } from 'src/components/common/Modal/ActionButtons/ActionButtons';
-import Modal from 'src/components/common/Modal/Modal';
+import { CancelButton } from 'src/components/Shared/Modal/ActionButtons/ActionButtons';
+import Modal from 'src/components/Shared/Modal/Modal';
 import theme from 'src/theme';
 import { AnnouncementAction } from '../AnnouncementAction/AnnouncementAction';
 import {
@@ -35,7 +35,7 @@
       <DialogContent dividers>
         {announcement.imageUrl && (
           <Box textAlign="center" mb={2}>
             <img
               src={announcement.imageUrl}
               alt={announcement.title}
               style={{

src/components/Coaching/CoachingRow/CoachingRow.tsx

@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next';
 import { useLocale } from 'src/hooks/useLocale';
 import { useRequiredSession } from 'src/hooks/useRequiredSession';
 import { currencyFormat } from 'src/lib/intlFormat';
-import { Confirmation } from '../../common/Modal/Confirmation/Confirmation';
+import { Confirmation } from '../../Shared/Modal/Confirmation/Confirmation';
 import { AppealProgress } from '../AppealProgress/AppealProgress';
 import { CoachedPersonFragment } from '../LoadCoachingList.generated';
 import { useDeleteCoachingAccountListMutation } from './CoachingRow.generated';

src/components/Contacts/ContactDetails/ContactDetails.test.tsx

@@ -5,7 +5,7 @@ import userEvent from '@testing-library/user-event';
 import { SnackbarProvider } from 'notistack';
 import TestRouter from '__tests__/util/TestRouter';
 import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
-import { ContactPanelProvider } from 'src/components/common/ContactPanelProvider/ContactPanelProvider';
+import { ContactPanelProvider } from 'src/components/Shared/ContactPanelProvider/ContactPanelProvider';
 import theme from '../../../theme';
 import {
   ContactDetailContext,

src/components/Contacts/ContactDetails/ContactDetails.tsx

@@ -5,7 +5,7 @@ import TabPanel from '@mui/lab/TabPanel';
 import { Box, Tab } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
-import { useContactPanel } from 'src/components/common/ContactPanelProvider/ContactPanelProvider';
+import { useContactPanel } from 'src/components/Shared/ContactPanelProvider/ContactPanelProvider';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import theme from '../../../theme';
 import {

src/components/Contacts/ContactDetails/ContactDetailsHeader/ContactDetailsHeader.test.tsx

@@ -7,7 +7,7 @@ import userEvent from '@testing-library/user-event';
 import { SnackbarProvider } from 'notistack';
 import TestRouter from '__tests__/util/TestRouter';
 import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
-import { ContactPanelProvider } from 'src/components/common/ContactPanelProvider/ContactPanelProvider';
+import { ContactPanelProvider } from 'src/components/Shared/ContactPanelProvider/ContactPanelProvider';
 import theme from 'src/theme';
 import { ContactDetailProvider } from '../ContactDetailContext';
 import { ContactDetailsHeader } from './ContactDetailsHeader';

src/components/Contacts/ContactDetails/ContactDetailsHeader/ContactDetailsHeader.tsx

@@ -13,7 +13,7 @@ import {
 } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
-import { useContactPanel } from 'src/components/common/ContactPanelProvider/ContactPanelProvider';
+import { useContactPanel } from 'src/components/Shared/ContactPanelProvider/ContactPanelProvider';
 import { StatusEnum } from 'src/graphql/types.generated';
 import theme from '../../../../theme';
 import { StarContactIconButton } from '../../StarContactIconButton/StarContactIconButton';

src/components/Contacts/ContactDetails/ContactDetailsHeader/ContactDetailsMoreActions/ContactDetailsMoreActions.test.tsx

@@ -6,8 +6,8 @@ import userEvent from '@testing-library/user-event';
 import { SnackbarProvider } from 'notistack';
 import TestRouter from '__tests__/util/TestRouter';
 import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
+import { ContactPanelProvider } from 'src/components/Shared/ContactPanelProvider/ContactPanelProvider';
 import { TaskModalEnum } from 'src/components/Task/Modal/TaskModal';
-import { ContactPanelProvider } from 'src/components/common/ContactPanelProvider/ContactPanelProvider';
 import { StatusEnum } from 'src/graphql/types.generated';
 import useTaskModal from '../../../../../hooks/useTaskModal';
 import theme from '../../../../../theme';

src/components/Contacts/ContactDetails/ContactDetailsHeader/ContactDetailsMoreActions/ContactDetailsMoreActions.tsx

@@ -20,9 +20,9 @@ import {
   DynamicCreateMultipleContacts,
   preloadCreateMultipleContacts,
 } from 'src/components/Layouts/Primary/TopBar/Items/AddMenu/Items/CreateMultipleContacts/DynamicCreateMultipleContacts';
+import { useContactPanel } from 'src/components/Shared/ContactPanelProvider/ContactPanelProvider';
+import Modal from 'src/components/Shared/Modal/Modal';
 import { TaskModalEnum } from 'src/components/Task/Modal/TaskModal';
-import { useContactPanel } from 'src/components/common/ContactPanelProvider/ContactPanelProvider';
-import Modal from 'src/components/common/Modal/Modal';
 import { StatusEnum } from 'src/graphql/types.generated';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import useTaskModal from 'src/hooks/useTaskModal';

src/components/Contacts/ContactDetails/ContactDetailsHeader/ContactDetailsMoreActions/MoreActionHideContactModal.tsx

@@ -7,7 +7,7 @@ import {
   DialogContentText,
 } from '@mui/material';
 import { useTranslation } from 'react-i18next';
-import Modal from 'src/components/common/Modal/Modal';
+import Modal from 'src/components/Shared/Modal/Modal';
 import { getAppName } from 'src/lib/getAppName';
 
 interface MoreActionHideContactProps {

src/components/Contacts/ContactDetails/ContactDetailsHeader/DeleteContactModal/DeleteContactModal.tsx

@@ -11,12 +11,12 @@ import {
   Typography,
 } from '@mui/material';
 import { useTranslation } from 'react-i18next';
-import { LoadingIndicator } from 'src/components/Shared/styledComponents/LoadingStyling';
 import {
   CancelButton,
   DeleteButton,
-} from 'src/components/common/Modal/ActionButtons/ActionButtons';
-import Modal from 'src/components/common/Modal/Modal';
+} from 'src/components/Shared/Modal/ActionButtons/ActionButtons';
+import Modal from 'src/components/Shared/Modal/Modal';
+import { LoadingIndicator } from 'src/components/Shared/styledComponents/LoadingStyling';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { isEditableSource, sourceToStr } from 'src/lib/sourceHelper';
 import { useContactSourceQuery } from './ContactSource.generated';