rename reports to area-reports

apps/fishing-map/features/app/App.tsx

@@ -33,7 +33,7 @@ import {
 import { fetchUserThunk } from 'features/user/user.slice'
 import { fetchHighlightWorkspacesThunk } from 'features/workspaces-list/workspaces-list.slice'
 import { AsyncReducerStatus } from 'utils/async-slice'
-import { selectShowTimeComparison } from 'features/reports/areas/reports.selectors'
+import { selectShowTimeComparison } from 'features/reports/areas/area-reports.selectors'
 import { DEFAULT_WORKSPACE_ID } from 'data/workspaces'
 import {
   HOME,
@@ -59,7 +59,7 @@ import { selectIsUserLogged } from 'features/user/selectors/user.selectors'
 import ErrorBoundary from 'features/app/ErrorBoundary'
 import { selectDebugOptions } from 'features/debug/debug.slice'
 import { useFitWorkspaceBounds } from 'features/workspace/workspace.hook'
-import { selectReportAreaBounds } from 'features/reports/areas/reports.config.selectors'
+import { selectReportAreaBounds } from 'features/reports/areas/area-reports.config.selectors'
 import { useAppDispatch } from './app.hooks'
 import { selectReadOnly, selectSidebarOpen } from './selectors/app.selectors'
 import { useAnalytics } from './analytics.hooks'

apps/fishing-map/features/app/selectors/app.reports.selector.ts

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit'
 import { selectActiveDataviewsCategories } from 'features/dataviews/selectors/dataviews.resolvers.selectors'
-import { selectReportById } from 'features/reports/areas/reports.slice'
+import { selectReportById } from 'features/reports/areas/area-reports.slice'
 import {
   selectIsVesselGroupReportLocation,
   selectLocationAreaId,
@@ -17,8 +17,8 @@ import {
   selectReportBufferValueSelector,
   selectReportCategorySelector,
   selectReportVesselGraphSelector,
-} from 'features/reports/areas/reports.config.selectors'
-import { ReportCategory, ReportVesselGraph } from 'features/reports/areas/reports.types'
+} from 'features/reports/areas/area-reports.config.selectors'
+import { ReportCategory, ReportVesselGraph } from 'features/reports/areas/area-reports.types'
 import { WORLD_REGION_ID } from 'features/reports/activity/reports-activity.slice'
 
 export const selectCurrentReport = createSelector(

apps/fishing-map/features/app/selectors/app.workspace.selectors.ts

@@ -37,7 +37,7 @@ import {
   selectReportTimeComparison,
   selectReportVesselFilter,
   selectReportVesselPage,
-} from 'features/reports/areas/reports.config.selectors'
+} from 'features/reports/areas/area-reports.config.selectors'
 
 const selectWorkspaceReportState = createSelector(
   [

apps/fishing-map/features/dataviews/selectors/dataviews.instances.selectors.ts

@@ -13,7 +13,7 @@ import {
 import { createDeepEqualSelector } from 'utils/selectors'
 import { getReportVesselGroupVisibleDataviews } from 'features/reports/vessel-groups/vessel-group-report.dataviews'
 import { REPORT_ONLY_VISIBLE_LAYERS } from 'data/config'
-import { getReportCategoryFromDataview } from 'features/reports/areas/reports.utils'
+import { getReportCategoryFromDataview } from 'features/reports/areas/area-reports.utils'
 import {
   selectVGRSection,
   selectVGRSubsection,

apps/fishing-map/features/dataviews/selectors/dataviews.resolvers.selectors.ts

@@ -50,8 +50,8 @@ import {
   getVesselGroupDataviewInstance,
   getVesselGroupEventsDataviewInstances,
 } from 'features/reports/vessel-groups/vessel-group-report.dataviews'
-import { ReportCategory } from 'features/reports/areas/reports.types'
-import { getReportCategoryFromDataview } from 'features/reports/areas/reports.utils'
+import { ReportCategory } from 'features/reports/areas/area-reports.types'
+import { getReportCategoryFromDataview } from 'features/reports/areas/area-reports.utils'
 import { selectVGRActivitySubsection } from 'features/reports/vessel-groups/vessel-group.config.selectors'
 import { FISHING_DATAVIEW_SLUG, PRESENCE_DATAVIEW_SLUG } from 'data/workspaces'
 

apps/fishing-map/features/dataviews/selectors/dataviews.selectors.ts

@@ -25,8 +25,8 @@ import {
   selectVGRSubsection,
 } from 'features/reports/vessel-groups/vessel-group.config.selectors'
 import { getReportVesselGroupVisibleDataviews } from 'features/reports/vessel-groups/vessel-group-report.dataviews'
-import { ReportCategory } from 'features/reports/areas/reports.types'
-import { getReportCategoryFromDataview } from 'features/reports/areas/reports.utils'
+import { ReportCategory } from 'features/reports/areas/area-reports.types'
+import { getReportCategoryFromDataview } from 'features/reports/areas/area-reports.utils'
 import {
   selectActiveActivityDataviews,
   selectActiveContextAreasDataviews,

apps/fishing-map/features/map/Map.tsx

@@ -30,7 +30,7 @@ import MapPopups from 'features/map/popups/MapPopups'
 import { MapCoordinates } from 'types'
 import { useAppDispatch } from 'features/app/app.hooks'
 import { useHasReportTimeseries } from 'features/reports/activity/reports-activity-timeseries.hooks'
-import { selectReportAreaStatus } from 'features/reports/areas/reports.selectors'
+import { selectReportAreaStatus } from 'features/reports/areas/area-reports.selectors'
 import { AsyncReducerStatus } from 'utils/async-slice'
 import {
   MAP_VIEW,

apps/fishing-map/features/map/controls/MapInfo.tsx

@@ -6,7 +6,7 @@ import { DateTime, DateTimeFormatOptions } from 'luxon'
 import { toFixed } from 'utils/shared'
 import { useTimerangeConnect } from 'features/timebar/timebar.hooks'
 import I18nDate from 'features/i18n/i18nDate'
-import { selectShowTimeComparison } from 'features/reports/areas/reports.selectors'
+import { selectShowTimeComparison } from 'features/reports/areas/area-reports.selectors'
 import styles from './MapInfo.module.css'
 import MapScaleControl from './MapScaleControl'
 

apps/fishing-map/features/map/map-layers.hooks.ts

@@ -39,7 +39,7 @@ import { selectDebugOptions } from 'features/debug/debug.slice'
 import {
   selectShowTimeComparison,
   selectTimeComparisonValues,
-} from 'features/reports/areas/reports.selectors'
+} from 'features/reports/areas/area-reports.selectors'
 import { useTimerangeConnect } from 'features/timebar/timebar.hooks'
 import { selectHighlightedTime, selectHighlightedEvents } from 'features/timebar/timebar.slice'
 import { useLocationConnect } from 'routes/routes.hook'

apps/fishing-map/features/map/map.selectors.ts

@@ -11,7 +11,7 @@ import {
 import {
   selectReportPreviewBufferFeature,
   selectReportBufferFeature,
-} from 'features/reports/areas/reports.selectors'
+} from 'features/reports/areas/area-reports.selectors'
 import { WorkspaceCategory } from 'data/workspaces'
 import { BUFFER_PREVIEW_COLOR } from 'data/config'
 import { selectAllDatasets } from 'features/datasets/datasets.slice'

apps/fishing-map/features/map/popups/categories/ContextLayersRow.tsx

@@ -30,7 +30,7 @@ import {
   DEFAULT_BUFFER_OPERATION,
   DEFAULT_POINT_BUFFER_UNIT,
   DEFAULT_POINT_BUFFER_VALUE,
-} from 'features/reports/areas/reports.config'
+} from 'features/reports/areas/area-reports.config'
 import { cleanCurrentWorkspaceReportState } from 'features/workspace/workspace.slice'
 import styles from '../Popup.module.css'
 

apps/fishing-map/features/reports/activity/ReportActivity.tsx

@@ -18,12 +18,12 @@ import {
 } from 'features/dataviews/selectors/dataviews.selectors'
 import { WorkspaceLoginError } from 'features/workspace/WorkspaceError'
 import { selectWorkspaceStatus } from 'features/workspace/workspace.selectors'
-import { selectReportDataviewsWithPermissions } from 'features/reports/areas/reports.selectors'
+import { selectReportDataviewsWithPermissions } from 'features/reports/areas/area-reports.selectors'
 import { selectHasReportVessels } from 'features/reports/activity/vessels/report-activity-vessels.selectors'
 import ReportVesselsPlaceholder from 'features/reports/areas/placeholders/ReportVesselsPlaceholder'
 import { getDownloadReportSupported } from 'features/download/download.utils'
 import { SUPPORT_EMAIL } from 'data/config'
-import { parseReportUrl } from 'features/reports/areas/reports.utils'
+import { parseReportUrl } from 'features/reports/areas/area-reports.utils'
 import {
   getDateRangeHash,
   selectReportVesselsDateRangeHash,
@@ -38,15 +38,18 @@ import {
 import { formatI18nDate } from 'features/i18n/i18nDate'
 import { getDatasetsReportNotSupported } from 'features/datasets/datasets.utils'
 import DatasetLabel from 'features/datasets/DatasetLabel'
-import { LAST_REPORTS_STORAGE_KEY, LastReportStorage } from 'features/reports/areas/reports.config'
+import {
+  LAST_REPORTS_STORAGE_KEY,
+  LastReportStorage,
+} from 'features/reports/areas/area-reports.config'
 // import { REPORT_BUFFER_GENERATOR_ID } from 'features/map/map.config'
 import { selectIsGuestUser, selectUserData } from 'features/user/selectors/user.selectors'
 import { useFetchDataviewResources } from 'features/resources/resources.hooks'
 import ReportActivityGraph from 'features/reports/activity/ReportActivityGraph'
-import { useFetchReportVessel } from 'features/reports/areas/reports.hooks'
+import { useFetchReportVessel } from 'features/reports/areas/area-reports.hooks'
 import ReportVessels from 'features/reports/activity/vessels/ReportVessels'
 import ReportDownload from 'features/reports/activity/download/ReportDownload'
-import styles from 'features/reports/areas/Report.module.css'
+import styles from 'features/reports/areas/AreaReport.module.css'
 
 export type ReportActivityUnit = 'hour' | 'detection'
 

apps/fishing-map/features/reports/activity/ReportActivityBeforeAfter.tsx

@@ -5,11 +5,14 @@ import { InputDate, InputText, Select, SelectOption } from '@globalfishingwatch/
 import { useReportTimeCompareConnect } from 'features/reports/activity/reports-activity-timecomparison.hooks'
 import { selectActiveActivityAndDetectionsDataviews } from 'features/dataviews/selectors/dataviews.selectors'
 import { getSourcesSelectedInDataview } from 'features/workspace/activity/activity.utils'
-import { selectReportAreaIds } from 'features/reports/areas/reports.selectors'
+import { selectReportAreaIds } from 'features/reports/areas/area-reports.selectors'
 import { selectDatasetAreaDetail } from 'features/areas/areas.slice'
 import { TrackCategory, trackEvent } from 'features/app/analytics.hooks'
-import { MAX_MONTHS_TO_COMPARE, MAX_DAYS_TO_COMPARE } from 'features/reports/areas/reports.config'
-import { selectReportTimeComparison } from '../areas/reports.config.selectors'
+import {
+  MAX_MONTHS_TO_COMPARE,
+  MAX_DAYS_TO_COMPARE,
+} from 'features/reports/areas/area-reports.config'
+import { selectReportTimeComparison } from '../areas/area-reports.config.selectors'
 import styles from './ReportActivityBeforeAfter.module.css'
 
 export default function ReportActivityBeforeAfter() {

apps/fishing-map/features/reports/activity/ReportActivityBeforeAfterGraph.tsx

@@ -16,11 +16,11 @@ import { FourwingsInterval } from '@globalfishingwatch/deck-loaders'
 import i18n from 'features/i18n/i18n'
 import { COLOR_PRIMARY_BLUE } from 'features/app/app.config'
 import { getUTCDateTime } from 'utils/dates'
-import { formatDate, tickFormatter } from 'features/reports/areas/reports.utils'
+import { formatDate, tickFormatter } from 'features/reports/areas/area-reports.utils'
 import { formatI18nNumber } from 'features/i18n/i18nNumber'
 import { toFixed } from 'utils/shared'
-import { selectReportTimeComparison } from '../areas/reports.config.selectors'
-import { ReportActivityTimeComparison } from '../areas/reports.types'
+import { selectReportTimeComparison } from '../areas/area-reports.config.selectors'
+import { ReportActivityTimeComparison } from '../areas/area-reports.types'
 import styles from './ReportActivityEvolution.module.css'
 
 interface ComparisonGraphData {

apps/fishing-map/features/reports/activity/ReportActivityEvolution.tsx

@@ -18,7 +18,7 @@ import { formatDateForInterval, getUTCDateTime } from 'utils/dates'
 import { formatI18nNumber } from 'features/i18n/i18nNumber'
 import { formatEvolutionData } from 'features/reports/activity/reports-activity-timeseries.utils'
 import { ReportActivityProps } from 'features/reports/activity/ReportActivityGraph'
-import { tickFormatter } from '../areas/reports.utils'
+import { tickFormatter } from '../areas/area-reports.utils'
 import styles from './ReportActivityEvolution.module.css'
 
 type ReportGraphTooltipProps = {

apps/fishing-map/features/reports/activity/ReportActivityGraph.tsx

@@ -10,14 +10,17 @@ import {
   useReportFeaturesLoading,
   useReportFilteredTimeSeries,
 } from 'features/reports/activity/reports-activity-timeseries.hooks'
-import { selectTimeComparisonValues } from 'features/reports/areas/reports.selectors'
+import { selectTimeComparisonValues } from 'features/reports/areas/area-reports.selectors'
 import ReportActivityPlaceholder from 'features/reports/areas/placeholders/ReportActivityPlaceholder'
 import ReportActivityPeriodComparison from 'features/reports/activity/ReportActivityPeriodComparison'
 import ReportActivityPeriodComparisonGraph from 'features/reports/activity/ReportActivityPeriodComparisonGraph'
 import UserGuideLink from 'features/help/UserGuideLink'
-import { useFitAreaInViewport, useReportAreaBounds } from 'features/reports/areas/reports.hooks'
-import { selectReportActivityGraph } from '../areas/reports.config.selectors'
-import { ReportActivityGraph } from '../areas/reports.types'
+import {
+  useFitAreaInViewport,
+  useReportAreaBounds,
+} from 'features/reports/areas/area-reports.hooks'
+import { selectReportActivityGraph } from '../areas/area-reports.config.selectors'
+import { ReportActivityGraph } from '../areas/area-reports.types'
 import ReportActivityEvolution from './ReportActivityEvolution'
 import ReportActivityBeforeAfter from './ReportActivityBeforeAfter'
 import ReportActivityBeforeAfterGraph from './ReportActivityBeforeAfterGraph'

apps/fishing-map/features/reports/activity/ReportActivityGraphSelector.tsx

@@ -9,11 +9,11 @@ import {
   REPORT_ACTIVITY_GRAPH_PERIOD_COMPARISON,
 } from 'data/config'
 import { selectActiveReportDataviews } from 'features/dataviews/selectors/dataviews.selectors'
-import { useFitAreaInViewport } from 'features/reports/areas/reports.hooks'
+import { useFitAreaInViewport } from 'features/reports/areas/area-reports.hooks'
 import { useSetReportTimeComparison } from 'features/reports/activity/reports-activity-timecomparison.hooks'
 import { TrackCategory, trackEvent } from 'features/app/analytics.hooks'
-import { selectReportActivityGraph } from '../areas/reports.config.selectors'
-import { ReportActivityGraph } from '../areas/reports.types'
+import { selectReportActivityGraph } from '../areas/area-reports.config.selectors'
+import { ReportActivityGraph } from '../areas/area-reports.types'
 
 type ReportActivityGraphSelectorProps = {
   loading: boolean

apps/fishing-map/features/reports/activity/ReportActivityPeriodComparison.tsx

@@ -5,13 +5,16 @@ import { InputDate, InputText, Select } from '@globalfishingwatch/ui-components'
 import { useReportTimeCompareConnect } from 'features/reports/activity/reports-activity-timecomparison.hooks'
 import { selectActiveActivityAndDetectionsDataviews } from 'features/dataviews/selectors/dataviews.selectors'
 import { getSourcesSelectedInDataview } from 'features/workspace/activity/activity.utils'
-import { selectReportAreaIds } from 'features/reports/areas/reports.selectors'
+import { selectReportAreaIds } from 'features/reports/areas/area-reports.selectors'
 import { selectDatasetAreaDetail } from 'features/areas/areas.slice'
 import Hint from 'features/help/Hint'
 import { COLOR_PRIMARY_BLUE } from 'features/app/app.config'
 import { TrackCategory, trackEvent } from 'features/app/analytics.hooks'
-import { MAX_MONTHS_TO_COMPARE, MAX_DAYS_TO_COMPARE } from 'features/reports/areas/reports.config'
-import { selectReportTimeComparison } from '../areas/reports.config.selectors'
+import {
+  MAX_MONTHS_TO_COMPARE,
+  MAX_DAYS_TO_COMPARE,
+} from 'features/reports/areas/area-reports.config'
+import { selectReportTimeComparison } from '../areas/area-reports.config.selectors'
 import styles from './ReportActivityBeforeAfter.module.css'
 
 export default function ReportActivityGraph() {

apps/fishing-map/features/reports/activity/ReportActivityPeriodComparisonGraph.tsx

@@ -17,9 +17,13 @@ import { selectLatestAvailableDataDate } from 'features/app/selectors/app.select
 import i18n, { t } from 'features/i18n/i18n'
 import { COLOR_GRADIENT, COLOR_PRIMARY_BLUE } from 'features/app/app.config'
 import { getUTCDateTime } from 'utils/dates'
-import { formatDate, formatTooltipValue, tickFormatter } from 'features/reports/areas/reports.utils'
+import {
+  formatDate,
+  formatTooltipValue,
+  tickFormatter,
+} from 'features/reports/areas/area-reports.utils'
 import { EMPTY_FIELD_PLACEHOLDER } from 'utils/info'
-import { selectReportTimeComparison } from '../areas/reports.config.selectors'
+import { selectReportTimeComparison } from '../areas/area-reports.config.selectors'
 import styles from './ReportActivityEvolution.module.css'
 
 const DIFFERENCE = 'difference'

apps/fishing-map/features/reports/activity/download/ReportDownload.tsx

@@ -4,7 +4,10 @@ import { Button } from '@globalfishingwatch/ui-components'
 import { setDownloadActivityAreaKey } from 'features/download/downloadActivity.slice'
 import { useAppDispatch } from 'features/app/app.hooks'
 import { TrackCategory, trackEvent } from 'features/app/analytics.hooks'
-import { selectReportAreaIds, selectReportAreaName } from 'features/reports/areas/reports.selectors'
+import {
+  selectReportAreaIds,
+  selectReportAreaName,
+} from 'features/reports/areas/area-reports.selectors'
 import styles from './ReportDownload.module.css'
 
 export default function ReportDownload() {

apps/fishing-map/features/reports/activity/reports-activity-timecomparison.hooks.ts

@@ -9,13 +9,16 @@ import { useTimerangeConnect } from 'features/timebar/timebar.hooks'
 import { useLocationConnect } from 'routes/routes.hook'
 import { getUTCDateTime } from 'utils/dates'
 import { formatI18nDate } from 'features/i18n/i18nDate'
-import { useFitAreaInViewport } from 'features/reports/areas/reports.hooks'
-import { MAX_DAYS_TO_COMPARE, MAX_MONTHS_TO_COMPARE } from 'features/reports/areas/reports.config'
+import { useFitAreaInViewport } from 'features/reports/areas/area-reports.hooks'
+import {
+  MAX_DAYS_TO_COMPARE,
+  MAX_MONTHS_TO_COMPARE,
+} from 'features/reports/areas/area-reports.config'
 import {
   selectReportActivityGraph,
   selectReportTimeComparison,
-} from '../areas/reports.config.selectors'
-import { ReportActivityGraph } from '../areas/reports.types'
+} from '../areas/area-reports.config.selectors'
+import { ReportActivityGraph } from '../areas/area-reports.types'
 
 // TODO get this from start and endDate from datasets
 const MIN_DATE = AVAILABLE_START.slice(0, 10)

apps/fishing-map/features/reports/activity/reports-activity-timeseries.hooks.ts

@@ -26,22 +26,22 @@ import {
   featuresToTimeseries,
   filterTimeseriesByTimerange,
 } from 'features/reports/activity/reports-activity-timeseries.utils'
-import { useReportAreaInViewport } from 'features/reports/areas/reports.hooks'
+import { useReportAreaInViewport } from 'features/reports/areas/area-reports.hooks'
 import {
   selectReportArea,
   selectReportBufferHash,
   selectShowTimeComparison,
-} from 'features/reports/areas/reports.selectors'
+} from 'features/reports/areas/area-reports.selectors'
 import { selectTimeRange } from 'features/app/selectors/app.timebar.selectors'
 import { Area, AreaGeometry } from 'features/areas/areas.slice'
 import { useFilterCellsByPolygonWorker } from 'features/reports/activity/reports-activity-geo.utils.workers.hooks'
 import { TimeRange } from 'features/timebar/timebar.slice'
-import { ReportActivityGraph, ReportCategory } from '../areas/reports.types'
+import { ReportActivityGraph, ReportCategory } from '../areas/area-reports.types'
 import {
   selectReportActivityGraph,
   selectReportTimeComparison,
-} from '../areas/reports.config.selectors'
-import { ENTIRE_WORLD_REPORT_AREA_ID } from '../areas/reports.config'
+} from '../areas/area-reports.config.selectors'
+import { ENTIRE_WORLD_REPORT_AREA_ID } from '../areas/area-reports.config'
 
 interface EvolutionGraphData {
   date: string

apps/fishing-map/features/reports/activity/reports-activity-timeseries.utils.ts

@@ -10,7 +10,7 @@ import {
   ReportGraphProps,
 } from 'features/reports/activity/reports-activity-timeseries.hooks'
 import { FilteredPolygons } from 'features/reports/activity/reports-activity-geo.utils'
-import { DateTimeSeries } from 'features/reports/areas/reports.hooks'
+import { DateTimeSeries } from 'features/reports/areas/area-reports.hooks'
 import { getUTCDateTime } from 'utils/dates'
 import { ComparisonGraphData } from 'features/reports/activity/ReportActivityPeriodComparisonGraph'
 import { getGraphDataFromFourwingsHeatmap } from 'features/timebar/timebar.utils'