move file

src/components/ActionBar/ActionBar.js

@@ -1,6 +1,6 @@
 import './ActionBar.scss';
 import { useDispatch, useSelector } from 'react-redux';
-import getIcon from '../iconMap';
+import getIcon from '../Common/Icon/iconMap';
 import { sendAnalyticsEvent } from '../../utils';
 import { modalShown, updatePrintModeOn } from '../../reducers/view/viewSlice';
 import { StaleDataWarnings } from '../Warnings/StaleDataWarnings';

src/components/iconMap.js → src/components/Common/Icon/iconMap.js

@@ -1,26 +1,26 @@
 import { cloneElement } from 'react';
-import { ReactComponent as ApprovedRound } from '../icons/approved-round.svg';
-import { ReactComponent as AreaChart } from '../icons/area-chart-custom.svg';
-import { ReactComponent as Chart } from '../icons/chart.svg';
-import { ReactComponent as ClockRound } from '../icons/clock-round.svg';
-import { ReactComponent as Copy } from '../icons/copy.svg';
-import { ReactComponent as Down } from '../icons/down.svg';
-import { ReactComponent as Error } from '../icons/error.svg';
-import { ReactComponent as ErrorRound } from '../icons/error-round.svg';
-import { ReactComponent as ExternalLink } from '../icons/external-link.svg';
-import { ReactComponent as HelpRound } from '../icons/help-round.svg';
-import { ReactComponent as Left } from '../icons/left.svg';
-import { ReactComponent as LineChart } from '../icons/line-chart-custom.svg';
-import { ReactComponent as List } from '../icons/list.svg';
-import { ReactComponent as Map } from '../icons/map.svg';
-import { ReactComponent as MinusRound } from '../icons/minus-round.svg';
-import { ReactComponent as PlusRound } from '../icons/plus-round.svg';
-import { ReactComponent as Printer } from '../icons/print.svg';
-import { ReactComponent as Right } from '../icons/right.svg';
-import { ReactComponent as Search } from '../icons/search.svg';
-import { ReactComponent as Up } from '../icons/up.svg';
-import { ReactComponent as Updating } from '../icons/updating.svg';
-import { ReactComponent as WarningRound } from '../icons/warning-round.svg';
+import { ReactComponent as ApprovedRound } from '../../../icons/approved-round.svg';
+import { ReactComponent as AreaChart } from '../../../icons/area-chart-custom.svg';
+import { ReactComponent as Chart } from '../../../icons/chart.svg';
+import { ReactComponent as ClockRound } from '../../../icons/clock-round.svg';
+import { ReactComponent as Copy } from '../../../icons/copy.svg';
+import { ReactComponent as Down } from '../../../icons/down.svg';
+import { ReactComponent as Error } from '../../../icons/error.svg';
+import { ReactComponent as ErrorRound } from '../../../icons/error-round.svg';
+import { ReactComponent as ExternalLink } from '../../../icons/external-link.svg';
+import { ReactComponent as HelpRound } from '../../../icons/help-round.svg';
+import { ReactComponent as Left } from '../../../icons/left.svg';
+import { ReactComponent as LineChart } from '../../../icons/line-chart-custom.svg';
+import { ReactComponent as List } from '../../../icons/list.svg';
+import { ReactComponent as Map } from '../../../icons/map.svg';
+import { ReactComponent as MinusRound } from '../../../icons/minus-round.svg';
+import { ReactComponent as PlusRound } from '../../../icons/plus-round.svg';
+import { ReactComponent as Printer } from '../../../icons/print.svg';
+import { ReactComponent as Right } from '../../../icons/right.svg';
+import { ReactComponent as Search } from '../../../icons/search.svg';
+import { ReactComponent as Up } from '../../../icons/up.svg';
+import { ReactComponent as Updating } from '../../../icons/updating.svg';
+import { ReactComponent as WarningRound } from '../../../icons/warning-round.svg';
 
 const iconMap = {
   // cf-icon-svg--approved-round

src/components/ComplaintDetail/ComplaintDetail.js

@@ -3,7 +3,7 @@ import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import { Link, useLocation, useParams } from 'react-router-dom';
 import { useGetDocumentQuery } from '../../api/complaints/complaints';
-import getIcon from '../iconMap';
+import getIcon from '../Common/Icon/iconMap';
 import { Loading } from '../Loading/Loading';
 import { selectRoutesParams } from '../../reducers/routes/selectors';
 import { ComplaintDetailBody } from './ComplaintDetailBody';

src/components/ComplaintDetail/ComplaintDetailBody.js

@@ -1,6 +1,6 @@
 import { ariaReadoutNumbers } from '../../utils';
 import PropTypes from 'prop-types';
-import getIcon from '../iconMap';
+import getIcon from '../Common/Icon/iconMap';
 import { formatDisplayDate } from '../../utils/formatDate';
 
 const SubAggregation = ({ label, value }) => {

src/components/Dialogs/DataExport/DataExport.js

@@ -3,7 +3,7 @@ import { getFullUrl, sendAnalyticsEvent } from '../../../utils';
 import { buildAllResultsUri, buildSomeResultsUri } from './dataExportUtils';
 import { modalHidden, modalShown } from '../../../reducers/view/viewSlice';
 import { useDispatch, useSelector } from 'react-redux';
-import getIcon from '../../iconMap';
+import getIcon from '../../Common/Icon/iconMap';
 import { useEffect, useMemo, useState } from 'react';
 import { MODAL_TYPE_EXPORT_CONFIRMATION } from '../../../constants';
 import { selectQueryRoot } from '../../../reducers/query/selectors';

src/components/Dialogs/DataExport/ExportConfirmation.js

@@ -1,4 +1,4 @@
-import getIcon from '../../iconMap';
+import getIcon from '../../Common/Icon/iconMap';
 import { useDispatch } from 'react-redux';
 import { modalHidden } from '../../../reducers/view/viewSlice';
 

src/components/Filters/Aggregation/AggregationBranch/AggregationBranch.js

@@ -10,7 +10,7 @@ import {
 } from '../../../../utils';
 import { selectFiltersRoot } from '../../../../reducers/filters/selectors';
 import { AggregationItem } from '../AggregationItem/AggregationItem';
-import getIcon from '../../../iconMap';
+import getIcon from '../../../Common/Icon/iconMap';
 import { SLUG_SEPARATOR } from '../../../../constants';
 import {
   filtersReplaced,

src/components/Filters/CollapsibleFilter/CollapsibleFilter.js

@@ -1,5 +1,5 @@
 import './CollapsibleFilter.scss';
-import getIcon from '../../iconMap';
+import getIcon from '../../Common/Icon/iconMap';
 import PropTypes from 'prop-types';
 import { useState } from 'react';
 

src/components/Filters/Date/CompanyReceivedFilter.js

@@ -12,7 +12,7 @@ import dayjs from 'dayjs';
 import dayjsCustomParseFormat from 'dayjs/plugin/customParseFormat';
 import dayjsIsBetween from 'dayjs/plugin/isBetween';
 import { formatDate } from '../../../utils/formatDate';
-import getIcon from '../../iconMap';
+import getIcon from '../../Common/Icon/iconMap';
 import { companyReceivedDateChanged } from '../../../reducers/query/querySlice';
 
 dayjs.extend(dayjsCustomParseFormat);

src/components/Filters/Date/DateFilter.js

@@ -15,7 +15,7 @@ import dayjsCustomParseFormat from 'dayjs/plugin/customParseFormat';
 import dayjsIsBetween from 'dayjs/plugin/isBetween';
 import dayjsUtc from 'dayjs/plugin/utc';
 import { formatDateModel } from '../../../utils/formatDate';
-import getIcon from '../../iconMap';
+import getIcon from '../../Common/Icon/iconMap';
 
 dayjs.extend(dayjsCustomParseFormat);
 dayjs.extend(dayjsIsBetween);

src/components/Filters/FilterPanel/FilterPanel.js

@@ -5,7 +5,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { DateFilter } from '../Date/DateFilter';
 import { FederalState } from '../FederalState/FederalState';
 import { HasNarrative } from '../HasNarrative/HasNarrative';
-import getIcon from '../../iconMap';
+import getIcon from '../../Common/Icon/iconMap';
 import { Issue } from '../Issue/Issue';
 import { Product } from '../Product/Product';
 import { SimpleFilter } from '../SimpleFilter/SimpleFilter';

src/components/List/ListPanel/ListPanel.js

@@ -15,7 +15,7 @@ import { useMemo } from 'react';
 import { Select } from '../../RefineBar/Select';
 import { sendAnalyticsEvent } from '../../../utils';
 import { Separator } from '../../RefineBar/Separator';
-import { TabbedNavigation } from '../../TabbedNavigation';
+import { TabbedNavigation } from '../../TabbedNavigation/TabbedNavigation';
 import { selectViewWidth } from '../../../reducers/view/selectors';
 import {
   selectQuerySize,

src/components/List/Pagination/Pagination.js

@@ -3,7 +3,7 @@ import {
   prevPageShown,
 } from '../../../reducers/query/querySlice';
 import { useDispatch, useSelector } from 'react-redux';
-import getIcon from '../../iconMap';
+import getIcon from '../../Common/Icon/iconMap';
 import { selectQueryPage } from '../../../reducers/query/selectors';
 import { useGetList } from '../../../hooks/useGetList';
 

src/components/Loading/Loading.js

@@ -1,5 +1,5 @@
 import './Loading.scss';
-import getIcon from '../iconMap';
+import getIcon from '../Common/Icon/iconMap';
 import PropTypes from 'prop-types';
 
 export const Loading = ({ isLoading }) => {

src/components/Map/MapPanel.js

@@ -13,7 +13,7 @@ import { processRows } from '../../utils/chart';
 import { useMemo } from 'react';
 import { RowChart } from '../Charts/RowChart/RowChart';
 import { Separator } from '../RefineBar/Separator';
-import { TabbedNavigation } from '../TabbedNavigation';
+import { TabbedNavigation } from '../TabbedNavigation/TabbedNavigation';
 import { TileChartMap } from './TileChartMap/TileChartMap';
 import Warning from '../Warnings/Warning';
 import {

src/components/Map/MapToolbar.js

@@ -1,6 +1,6 @@
 import './MapToolbar.scss';
 import { useDispatch, useSelector } from 'react-redux';
-import getIcon from '../iconMap';
+import getIcon from '../Common/Icon/iconMap';
 import { MODE_LIST, THESE_UNITED_STATES } from '../../constants';
 import { stateFilterCleared } from '../../reducers/filters/filtersSlice';
 import { selectFiltersState } from '../../reducers/filters/selectors';

src/components/RefineBar/ChartToggles.js

@@ -1,6 +1,6 @@
 import './ChartToggles.scss';
 import { chartTypeUpdated } from '../../reducers/trends/trendsSlice';
-import getIcon from '../iconMap';
+import getIcon from '../Common/Icon/iconMap';
 import { selectedClass, sendAnalyticsEvent } from '../../utils';
 import { useDispatch, useSelector } from 'react-redux';
 import { selectTrendsChartType } from '../../reducers/trends/selectors';

src/components/RefineBar/RefineBar.scss

@@ -1,7 +1,7 @@
 @use 'sass:math';
 @use '@cfpb/cfpb-design-system/src/abstracts' as *;
 @use 'css/base' as *;
-@use '../select' as *;
+@use 'select' as *;
 
 .refine-bar {
   section {

src/components/select.scss → src/components/RefineBar/select.scss

@@ -1,5 +1,5 @@
 @use 'sass:math';
-@use '@cfpb/cfpb-design-system/src/abstracts' as *;
+@use '@cfpb/cfpb-design-system/src/abstracts/index' as *;
 
 // select
 $select-border: var(--gray-40);

src/components/ResultsPanel.js → src/components/ResultsPanel/ResultsPanel.js

@@ -1,11 +1,11 @@
-import { MODE_LIST, MODE_MAP, MODE_TRENDS } from '../constants';
+import { MODE_LIST, MODE_MAP, MODE_TRENDS } from '../../constants';
 import { useSelector } from 'react-redux';
-import { ListPanel } from './List/ListPanel/ListPanel';
-import { MapPanel } from './Map/MapPanel';
-import { PrintInfo } from './Print/PrintInfo';
-import { PrintInfoFooter } from './Print/PrintInfoFooter';
-import { selectViewTab } from '../reducers/view/selectors';
-import { TrendsPanel } from './Trends/TrendsPanel/TrendsPanel';
+import { ListPanel } from '../List/ListPanel/ListPanel';
+import { MapPanel } from '../Map/MapPanel';
+import { PrintInfo } from '../Print/PrintInfo';
+import { PrintInfoFooter } from '../Print/PrintInfoFooter';
+import { selectViewTab } from '../../reducers/view/selectors';
+import { TrendsPanel } from '../Trends/TrendsPanel/TrendsPanel';
 
 export const ResultsPanel = () => {
   const tab = useSelector(selectViewTab);

src/components/ResultsPanel.spec.js → src/components/ResultsPanel/ResultsPanel.spec.js

@@ -1,9 +1,9 @@
 import { ResultsPanel } from './ResultsPanel';
-import { testRender as render, screen } from '../testUtils/test-utils';
-import { queryState } from '../reducers/query/querySlice';
-import { viewState } from '../reducers/view/viewSlice';
-import { merge } from '../testUtils/functionHelpers';
-import { MODE_LIST, MODE_MAP } from '../constants';
+import { testRender as render, screen } from '../../testUtils/test-utils';
+import { queryState } from '../../reducers/query/querySlice';
+import { viewState } from '../../reducers/view/viewSlice';
+import { merge } from '../../testUtils/functionHelpers';
+import { MODE_LIST, MODE_MAP } from '../../constants';
 
 describe('ResultsPanel', () => {
   const renderComponent = (newQueryState, newViewState) => {

src/components/Search/AdvancedTips/AdvancedTips.js

@@ -1,7 +1,7 @@
 import './AdvancedTips.scss';
 import { TooltipWrapper } from '../../Common/TooltipWrapper/TooltipWrapper';
 import { ComplexExample } from './ComplexExample';
-import getIcon from '../../iconMap';
+import getIcon from '../../Common/Icon/iconMap';
 
 export const AdvancedTips = () => {
   return (

src/components/Search/AdvancedTips/ComplexExample.js

@@ -1,4 +1,4 @@
-import getIcon from '../../iconMap';
+import getIcon from '../../Common/Icon/iconMap';
 import { TooltipWrapper } from '../../Common/TooltipWrapper/TooltipWrapper';
 import { useState } from 'react';
 import PropTypes from 'prop-types';

src/components/Search/Pill.js

@@ -8,7 +8,7 @@ import { filterPatch, SLUG_SEPARATOR } from '../../constants';
 import { formatPillPrefix, getUpdatedFilters } from '../../utils/filters';
 import { useDispatch, useSelector } from 'react-redux';
 import { coalesce } from '../../utils';
-import getIcon from '../iconMap';
+import getIcon from '../Common/Icon/iconMap';
 import PropTypes from 'prop-types';
 import { selectFiltersRoot } from '../../reducers/filters/selectors';
 import { useGetAggregations } from '../../hooks/useGetAggregations';

src/components/Search/PillPanel.js

@@ -10,7 +10,7 @@ import {
 
 import { useDispatch, useSelector } from 'react-redux';
 import dayjs from 'dayjs';
-import getIcon from '../iconMap';
+import getIcon from '../Common/Icon/iconMap';
 import { Pill } from './Pill';
 import { filtersCleared } from '../../reducers/filters/filtersSlice';
 import { startOfToday } from '../../utils';

src/components/Search/SearchComponents.js

@@ -2,7 +2,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { Hero } from './Hero/Hero';
 import { useEffect } from 'react';
 import { RefinePanel } from './RefinePanel';
-import { ResultsPanel } from '../ResultsPanel';
+import { ResultsPanel } from '../ResultsPanel/ResultsPanel';
 import { RootModal } from '../Dialogs/RootModal';
 import { selectViewIsPrintMode } from '../../reducers/view/selectors';
 import { Tour } from '../Tour/Tour';

src/components/TabbedNavigation.js → src/components/TabbedNavigation/TabbedNavigation.js

@@ -1,8 +1,8 @@
 import './TabbedNavigation.scss';
 import { useDispatch, useSelector } from 'react-redux';
-import getIcon from './iconMap';
-import { selectViewTab } from '../reducers/view/selectors';
-import { tabChanged } from '../reducers/view/viewSlice';
+import getIcon from '../Common/Icon/iconMap';
+import { selectViewTab } from '../../reducers/view/selectors';
+import { tabChanged } from '../../reducers/view/viewSlice';
 
 export const TabbedNavigation = () => {
   const dispatch = useDispatch();

src/components/TabbedNavigation.scss → src/components/TabbedNavigation/TabbedNavigation.scss

@@ -1,5 +1,5 @@
 @use 'sass:math';
-@use '@cfpb/cfpb-design-system/src/abstracts' as *;
+@use '@cfpb/cfpb-design-system/src/abstracts/index' as *;
 @use 'css/base';
 
 .tabbed-navigation {

src/components/TabbedNavigation.spec.js → src/components/TabbedNavigation/TabbedNavigation.spec.js

@@ -1,9 +1,9 @@
 import { TabbedNavigation } from './TabbedNavigation';
-import { MODE_LIST, MODE_MAP, MODE_TRENDS } from '../constants';
+import { MODE_LIST, MODE_MAP, MODE_TRENDS } from '../../constants';
 import userEvent from '@testing-library/user-event';
-import { testRender as render, screen } from '../testUtils/test-utils';
-import { merge } from '../testUtils/functionHelpers';
-import { viewState } from '../reducers/view/viewSlice';
+import { testRender as render, screen } from '../../testUtils/test-utils';
+import { merge } from '../../testUtils/functionHelpers';
+import { viewState } from '../../reducers/view/viewSlice';
 
 jest.useRealTimers();
 describe('component: TabbedNavigation', () => {

src/components/Tour/TourButton.js

@@ -1,5 +1,5 @@
 import './TourButton.scss';
-import getIcon from '../iconMap';
+import getIcon from '../Common/Icon/iconMap';
 import { useDispatch } from 'react-redux';
 import { tourShown } from '../../reducers/view/viewSlice';
 

src/components/Trends/ExternalTooltip/TooltipRow.js

@@ -6,7 +6,7 @@ import {
   selectTrendsLens,
 } from '../../../reducers/trends/selectors';
 import { sanitizeHtmlId } from '../../../utils';
-import getIcon from '../../iconMap';
+import getIcon from '../../Common/Icon/iconMap';
 
 export const TooltipRow = ({ value }) => {
   const dispatch = useDispatch();

src/components/Trends/FocusHeader/FocusHeader.js

@@ -1,6 +1,6 @@
 import './FocusHeader.scss';
 import { useDispatch, useSelector } from 'react-redux';
-import getIcon from '../../iconMap';
+import getIcon from '../../Common/Icon/iconMap';
 import { LensTabs } from '../LensTabs/LensTabs';
 import { focusRemoved } from '../../../reducers/trends/trendsSlice';
 import {

src/components/Trends/FocusHeader/FocusHeader.scss

@@ -1,5 +1,5 @@
 @use 'css/base' as *;
-@use '../../TabbedNavigation';
+@use '../../TabbedNavigation/TabbedNavigation';
 
 .focus-header {
   .clear-focus {

src/components/Trends/LensTabs/LensTabs.scss

@@ -1,4 +1,4 @@
-@use '../../TabbedNavigation';
+@use '../../TabbedNavigation/TabbedNavigation';
 
 .tabbed-navigation {
   &.lens {

src/components/Trends/TrendDepthToggle/TrendDepthToggle.scss

@@ -1,4 +1,4 @@
-@use '../../TabbedNavigation';
+@use '../../TabbedNavigation/TabbedNavigation';
 
 .trend-depth-toggle {
   background: var(--gray-10);

src/components/Trends/TrendsPanel/TrendsPanel.js

@@ -28,7 +28,7 @@ import { processRows } from '../../../utils/chart';
 import { sendAnalyticsEvent } from '../../../utils';
 import { showCompanyOverLay, getIntervals } from '../../../utils/trends';
 import { ActionBar } from '../../ActionBar/ActionBar';
-import { TabbedNavigation } from '../../TabbedNavigation';
+import { TabbedNavigation } from '../../TabbedNavigation/TabbedNavigation';
 import Warning from '../../Warnings/Warning';
 import { FilterPanel } from '../../Filters/FilterPanel/FilterPanel';
 import { FilterPanelToggle } from '../../Filters/FilterPanel/FilterPanelToggle';

src/components/Typeahead/AsyncTypeahead/AsyncTypeahead.js

@@ -2,7 +2,7 @@ import '../Typeahead.scss';
 import { useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import { AsyncTypeahead as Typeahead } from 'react-bootstrap-typeahead';
-import getIcon from '../../iconMap';
+import getIcon from '../../Common/Icon/iconMap';
 import HighlightingOption from '../HighlightingOption/HighlightingOption';
 import { ClearButton } from '../ClearButton/ClearButton';
 

src/components/Typeahead/ClearButton/ClearButton.js

@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import getIcon from '../../iconMap';
+import getIcon from '../../Common/Icon/iconMap';
 
 export const ClearButton = ({ onClear }) => {
   return (

src/components/Typeahead/Input/Input.js

@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import getIcon from '../../iconMap';
+import getIcon from '../../Common/Icon/iconMap';
 import { ClearButton } from '../ClearButton/ClearButton';
 
 export const Input = ({

src/components/Typeahead/Typeahead/Typeahead.js

@@ -3,7 +3,7 @@ import { ClearButton } from '../ClearButton/ClearButton';
 import { useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import { Typeahead as DropdownTypeahead } from 'react-bootstrap-typeahead';
-import getIcon from '../../iconMap';
+import getIcon from '../../Common/Icon/iconMap';
 import HighlightingOption from '../HighlightingOption/HighlightingOption';
 
 export const Typeahead = ({

src/components/Warnings/Error.js

@@ -1,4 +1,4 @@
-import getIcon from '../iconMap';
+import getIcon from '../Common/Icon/iconMap';
 import PropTypes from 'prop-types';
 import './Error.scss';