From a63bd7022050961b8a8b9ce2a3468749065f8664 Mon Sep 17 00:00:00 2001 From: j8seangel Date: Tue, 24 Sep 2024 18:47:45 +0200 Subject: [PATCH] rename reports to area-reports --- apps/fishing-map/features/app/App.tsx | 4 ++-- .../features/app/selectors/app.reports.selector.ts | 6 +++--- .../app/selectors/app.workspace.selectors.ts | 2 +- .../selectors/dataviews.instances.selectors.ts | 2 +- .../selectors/dataviews.resolvers.selectors.ts | 4 ++-- .../dataviews/selectors/dataviews.selectors.ts | 4 ++-- apps/fishing-map/features/map/Map.tsx | 2 +- apps/fishing-map/features/map/controls/MapInfo.tsx | 2 +- apps/fishing-map/features/map/map-layers.hooks.ts | 2 +- apps/fishing-map/features/map/map.selectors.ts | 2 +- .../map/popups/categories/ContextLayersRow.tsx | 2 +- .../features/reports/activity/ReportActivity.tsx | 13 ++++++++----- .../reports/activity/ReportActivityBeforeAfter.tsx | 9 ++++++--- .../activity/ReportActivityBeforeAfterGraph.tsx | 6 +++--- .../reports/activity/ReportActivityEvolution.tsx | 2 +- .../reports/activity/ReportActivityGraph.tsx | 11 +++++++---- .../activity/ReportActivityGraphSelector.tsx | 6 +++--- .../activity/ReportActivityPeriodComparison.tsx | 9 ++++++--- .../ReportActivityPeriodComparisonGraph.tsx | 8 ++++++-- .../reports/activity/download/ReportDownload.tsx | 5 ++++- .../reports-activity-timecomparison.hooks.ts | 11 +++++++---- .../activity/reports-activity-timeseries.hooks.ts | 10 +++++----- .../activity/reports-activity-timeseries.utils.ts | 2 +- .../reports/activity/vessels/ReportVessels.tsx | 8 ++++---- .../activity/vessels/ReportVesselsGraph.tsx | 6 +++--- .../vessels/ReportVesselsGraphSelector.tsx | 2 +- .../activity/vessels/ReportVesselsTable.tsx | 6 +++--- .../activity/vessels/ReportVesselsTableFooter.tsx | 6 +++--- .../vessels/report-activity-vessels.selectors.ts | 8 ++++---- .../{Report.module.css => AreaReport.module.css} | 0 .../reports/areas/{Report.tsx => AreaReport.tsx} | 13 ++++++++----- ...al.module.css => NewAreaReportModal.module.css} | 0 .../{NewReportModal.tsx => NewAreaReportModal.tsx} | 6 +++--- ...lectors.ts => area-reports.config.selectors.ts} | 4 ++-- .../{reports.config.ts => area-reports.config.ts} | 2 +- .../{reports.hooks.ts => area-reports.hooks.ts} | 7 +++++-- ...orts.selectors.ts => area-reports.selectors.ts} | 14 ++++++++++---- .../{reports.slice.ts => area-reports.slice.ts} | 0 .../{reports.types.ts => area-reports.types.ts} | 0 .../{reports.utils.ts => area-reports.utils.ts} | 6 +++--- .../reports/areas/summary/ReportSummary.tsx | 8 ++++---- .../reports/areas/title/BufferButonTooltip.tsx | 4 ++-- .../features/reports/areas/title/ReportTitle.tsx | 6 +++--- .../features/reports/events/VGREventsGraph.tsx | 2 +- .../reports/events/vgr-events.selectors.ts | 2 +- .../reports/vessel-groups/VesselGroupReport.tsx | 2 +- .../activity/VGRActivitySubsectionSelector.tsx.tsx | 2 +- .../vessels/VesselGroupReportVesselsGraph.tsx | 2 +- .../vessels/VesselGroupReportVesselsTable.tsx | 2 +- .../vessel-group-report-vessels.selectors.ts | 2 +- apps/fishing-map/features/sidebar/Sidebar.tsx | 2 +- .../fishing-map/features/sidebar/SidebarHeader.tsx | 9 +++++---- apps/fishing-map/features/timebar/Timebar.tsx | 2 +- apps/fishing-map/features/timebar/timebar.hooks.ts | 2 +- .../features/timebar/timebar.selectors.ts | 2 +- apps/fishing-map/features/user/UserReports.tsx | 2 +- .../user/selectors/user.permissions.selectors.ts | 2 +- .../features/vessel-groups/vessel-groups.hooks.ts | 2 +- .../features/workspace/workspace.slice.ts | 4 ++-- apps/fishing-map/reducers.ts | 2 +- apps/fishing-map/types/index.ts | 2 +- 61 files changed, 155 insertions(+), 120 deletions(-) rename apps/fishing-map/features/reports/areas/{Report.module.css => AreaReport.module.css} (100%) rename apps/fishing-map/features/reports/areas/{Report.tsx => AreaReport.tsx} (94%) rename apps/fishing-map/features/reports/areas/{NewReportModal.module.css => NewAreaReportModal.module.css} (100%) rename apps/fishing-map/features/reports/areas/{NewReportModal.tsx => NewAreaReportModal.tsx} (97%) rename apps/fishing-map/features/reports/areas/{reports.config.selectors.ts => area-reports.config.selectors.ts} (91%) rename apps/fishing-map/features/reports/areas/{reports.config.ts => area-reports.config.ts} (97%) rename apps/fishing-map/features/reports/areas/{reports.hooks.ts => area-reports.hooks.ts} (98%) rename apps/fishing-map/features/reports/areas/{reports.selectors.ts => area-reports.selectors.ts} (96%) rename apps/fishing-map/features/reports/areas/{reports.slice.ts => area-reports.slice.ts} (100%) rename apps/fishing-map/features/reports/areas/{reports.types.ts => area-reports.types.ts} (100%) rename apps/fishing-map/features/reports/areas/{reports.utils.ts => area-reports.utils.ts} (98%) diff --git a/apps/fishing-map/features/app/App.tsx b/apps/fishing-map/features/app/App.tsx index 633e899679..44eb7b0097 100644 --- a/apps/fishing-map/features/app/App.tsx +++ b/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' diff --git a/apps/fishing-map/features/app/selectors/app.reports.selector.ts b/apps/fishing-map/features/app/selectors/app.reports.selector.ts index ce9b77434c..18412b7483 100644 --- a/apps/fishing-map/features/app/selectors/app.reports.selector.ts +++ b/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( diff --git a/apps/fishing-map/features/app/selectors/app.workspace.selectors.ts b/apps/fishing-map/features/app/selectors/app.workspace.selectors.ts index fd6609bc26..7bb7a0e2e1 100644 --- a/apps/fishing-map/features/app/selectors/app.workspace.selectors.ts +++ b/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( [ diff --git a/apps/fishing-map/features/dataviews/selectors/dataviews.instances.selectors.ts b/apps/fishing-map/features/dataviews/selectors/dataviews.instances.selectors.ts index de5dfef0b4..18769230df 100644 --- a/apps/fishing-map/features/dataviews/selectors/dataviews.instances.selectors.ts +++ b/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, diff --git a/apps/fishing-map/features/dataviews/selectors/dataviews.resolvers.selectors.ts b/apps/fishing-map/features/dataviews/selectors/dataviews.resolvers.selectors.ts index 722bae3494..cb9285adcc 100644 --- a/apps/fishing-map/features/dataviews/selectors/dataviews.resolvers.selectors.ts +++ b/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' diff --git a/apps/fishing-map/features/dataviews/selectors/dataviews.selectors.ts b/apps/fishing-map/features/dataviews/selectors/dataviews.selectors.ts index 7976cee105..b07f05bf21 100644 --- a/apps/fishing-map/features/dataviews/selectors/dataviews.selectors.ts +++ b/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, diff --git a/apps/fishing-map/features/map/Map.tsx b/apps/fishing-map/features/map/Map.tsx index 924904c01a..5d931d570d 100644 --- a/apps/fishing-map/features/map/Map.tsx +++ b/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, diff --git a/apps/fishing-map/features/map/controls/MapInfo.tsx b/apps/fishing-map/features/map/controls/MapInfo.tsx index dfbc6fdc5b..3af30df850 100644 --- a/apps/fishing-map/features/map/controls/MapInfo.tsx +++ b/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' diff --git a/apps/fishing-map/features/map/map-layers.hooks.ts b/apps/fishing-map/features/map/map-layers.hooks.ts index 7bb720d828..4dd7f543bb 100644 --- a/apps/fishing-map/features/map/map-layers.hooks.ts +++ b/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' diff --git a/apps/fishing-map/features/map/map.selectors.ts b/apps/fishing-map/features/map/map.selectors.ts index cf14b28247..6a7ebf8467 100644 --- a/apps/fishing-map/features/map/map.selectors.ts +++ b/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' diff --git a/apps/fishing-map/features/map/popups/categories/ContextLayersRow.tsx b/apps/fishing-map/features/map/popups/categories/ContextLayersRow.tsx index 78bf2ef540..7bbc4b14a2 100644 --- a/apps/fishing-map/features/map/popups/categories/ContextLayersRow.tsx +++ b/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' diff --git a/apps/fishing-map/features/reports/activity/ReportActivity.tsx b/apps/fishing-map/features/reports/activity/ReportActivity.tsx index cb1b4500c6..27853af497 100644 --- a/apps/fishing-map/features/reports/activity/ReportActivity.tsx +++ b/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' diff --git a/apps/fishing-map/features/reports/activity/ReportActivityBeforeAfter.tsx b/apps/fishing-map/features/reports/activity/ReportActivityBeforeAfter.tsx index 21c81635e5..139a6f9130 100644 --- a/apps/fishing-map/features/reports/activity/ReportActivityBeforeAfter.tsx +++ b/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() { diff --git a/apps/fishing-map/features/reports/activity/ReportActivityBeforeAfterGraph.tsx b/apps/fishing-map/features/reports/activity/ReportActivityBeforeAfterGraph.tsx index f18b89ebe5..2f63326720 100644 --- a/apps/fishing-map/features/reports/activity/ReportActivityBeforeAfterGraph.tsx +++ b/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 { diff --git a/apps/fishing-map/features/reports/activity/ReportActivityEvolution.tsx b/apps/fishing-map/features/reports/activity/ReportActivityEvolution.tsx index ed52caf526..47eb8c0ca7 100644 --- a/apps/fishing-map/features/reports/activity/ReportActivityEvolution.tsx +++ b/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 = { diff --git a/apps/fishing-map/features/reports/activity/ReportActivityGraph.tsx b/apps/fishing-map/features/reports/activity/ReportActivityGraph.tsx index 45c5f260c3..459e827237 100644 --- a/apps/fishing-map/features/reports/activity/ReportActivityGraph.tsx +++ b/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' diff --git a/apps/fishing-map/features/reports/activity/ReportActivityGraphSelector.tsx b/apps/fishing-map/features/reports/activity/ReportActivityGraphSelector.tsx index 3bb281b95b..1d08971808 100644 --- a/apps/fishing-map/features/reports/activity/ReportActivityGraphSelector.tsx +++ b/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 diff --git a/apps/fishing-map/features/reports/activity/ReportActivityPeriodComparison.tsx b/apps/fishing-map/features/reports/activity/ReportActivityPeriodComparison.tsx index 4135b8fc11..8cdef7fd2c 100644 --- a/apps/fishing-map/features/reports/activity/ReportActivityPeriodComparison.tsx +++ b/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() { diff --git a/apps/fishing-map/features/reports/activity/ReportActivityPeriodComparisonGraph.tsx b/apps/fishing-map/features/reports/activity/ReportActivityPeriodComparisonGraph.tsx index bd3378ac02..22b8d9ea7e 100644 --- a/apps/fishing-map/features/reports/activity/ReportActivityPeriodComparisonGraph.tsx +++ b/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' diff --git a/apps/fishing-map/features/reports/activity/download/ReportDownload.tsx b/apps/fishing-map/features/reports/activity/download/ReportDownload.tsx index fc34ed82d4..f41baf33a3 100644 --- a/apps/fishing-map/features/reports/activity/download/ReportDownload.tsx +++ b/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() { diff --git a/apps/fishing-map/features/reports/activity/reports-activity-timecomparison.hooks.ts b/apps/fishing-map/features/reports/activity/reports-activity-timecomparison.hooks.ts index 30204563f0..ac0b056b5e 100644 --- a/apps/fishing-map/features/reports/activity/reports-activity-timecomparison.hooks.ts +++ b/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) diff --git a/apps/fishing-map/features/reports/activity/reports-activity-timeseries.hooks.ts b/apps/fishing-map/features/reports/activity/reports-activity-timeseries.hooks.ts index e078b94a1d..1ca84b55b8 100644 --- a/apps/fishing-map/features/reports/activity/reports-activity-timeseries.hooks.ts +++ b/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 diff --git a/apps/fishing-map/features/reports/activity/reports-activity-timeseries.utils.ts b/apps/fishing-map/features/reports/activity/reports-activity-timeseries.utils.ts index e99f0c65c9..02860703b7 100644 --- a/apps/fishing-map/features/reports/activity/reports-activity-timeseries.utils.ts +++ b/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' diff --git a/apps/fishing-map/features/reports/activity/vessels/ReportVessels.tsx b/apps/fishing-map/features/reports/activity/vessels/ReportVessels.tsx index 016b0b301b..9ad93ee3f1 100644 --- a/apps/fishing-map/features/reports/activity/vessels/ReportVessels.tsx +++ b/apps/fishing-map/features/reports/activity/vessels/ReportVessels.tsx @@ -5,11 +5,11 @@ import ReportVesselsGraphSelector from 'features/reports/activity/vessels/Report import { selectActiveReportDataviews } from 'features/dataviews/selectors/dataviews.selectors' import { selectReportCategory } from 'features/app/selectors/app.reports.selector' import ReportSummaryTags from 'features/reports/areas/summary/ReportSummaryTags' -import { FIELDS, getCommonProperties } from 'features/reports/areas/reports.utils' +import { FIELDS, getCommonProperties } from 'features/reports/areas/area-reports.utils' import { PROPERTIES_EXCLUDED } from 'features/reports/areas/summary/ReportSummary' -import { ReportActivityUnit } from 'features/reports/areas/Report' -import { selectReportVesselFilter } from 'features/reports/areas/reports.config.selectors' -import { ReportCategory } from 'features/reports/areas/reports.types' +import { ReportActivityUnit } from 'features/reports/areas/AreaReport' +import { selectReportVesselFilter } from 'features/reports/areas/area-reports.config.selectors' +import { ReportCategory } from 'features/reports/areas/area-reports.types' import ReportVesselsGraph from './ReportVesselsGraph' import ReportVesselsFilter from './ReportVesselsFilter' import ReportVesselsTable from './ReportVesselsTable' diff --git a/apps/fishing-map/features/reports/activity/vessels/ReportVesselsGraph.tsx b/apps/fishing-map/features/reports/activity/vessels/ReportVesselsGraph.tsx index 7521d54adb..131e6ce11c 100644 --- a/apps/fishing-map/features/reports/activity/vessels/ReportVesselsGraph.tsx +++ b/apps/fishing-map/features/reports/activity/vessels/ReportVesselsGraph.tsx @@ -13,15 +13,15 @@ import { REPORT_VESSELS_GRAPH_GEARTYPE, REPORT_VESSELS_GRAPH_VESSELTYPE, } from 'data/config' -import { EMPTY_API_VALUES, OTHERS_CATEGORY_LABEL } from 'features/reports/areas/reports.config' +import { EMPTY_API_VALUES, OTHERS_CATEGORY_LABEL } from 'features/reports/areas/area-reports.config' import { getVesselGearTypeLabel } from 'utils/info' -import { ReportVesselGraph } from 'features/reports/areas/reports.types' +import { ReportVesselGraph } from 'features/reports/areas/area-reports.types' import { selectReportVesselsGraphDataGrouped, selectReportVesselsGraphDataOthers, } from 'features/reports/activity/vessels/report-activity-vessels.selectors' import { cleanFlagState } from 'features/reports/activity/vessels/report-activity-vessels.utils' -import { selectReportDataviewsWithPermissions } from 'features/reports/areas/reports.selectors' +import { selectReportDataviewsWithPermissions } from 'features/reports/areas/area-reports.selectors' import styles from './ReportVesselsGraph.module.css' const MAX_OTHER_TOOLTIP_ITEMS = 10 diff --git a/apps/fishing-map/features/reports/activity/vessels/ReportVesselsGraphSelector.tsx b/apps/fishing-map/features/reports/activity/vessels/ReportVesselsGraphSelector.tsx index f1eb4eb8bc..89ff75cff2 100644 --- a/apps/fishing-map/features/reports/activity/vessels/ReportVesselsGraphSelector.tsx +++ b/apps/fishing-map/features/reports/activity/vessels/ReportVesselsGraphSelector.tsx @@ -11,7 +11,7 @@ import { import { selectReportVesselGraph } from 'features/app/selectors/app.reports.selector' import { TrackCategory, trackEvent } from 'features/app/analytics.hooks' import { selectReportCategory } from 'features/app/selectors/app.reports.selector' -import { ReportCategory, ReportVesselGraph } from 'features/reports/areas/reports.types' +import { ReportCategory, ReportVesselGraph } from 'features/reports/areas/area-reports.types' export default function ReportVesselsGraphSelector() { const { dispatchQueryParams } = useLocationConnect() diff --git a/apps/fishing-map/features/reports/activity/vessels/ReportVesselsTable.tsx b/apps/fishing-map/features/reports/activity/vessels/ReportVesselsTable.tsx index 82a85df3db..14bbb10bfc 100644 --- a/apps/fishing-map/features/reports/activity/vessels/ReportVesselsTable.tsx +++ b/apps/fishing-map/features/reports/activity/vessels/ReportVesselsTable.tsx @@ -10,13 +10,13 @@ import { selectReportCategory } from 'features/app/selectors/app.reports.selecto import { selectActiveReportDataviews } from 'features/dataviews/selectors/dataviews.selectors' import { selectUserData } from 'features/user/selectors/user.selectors' import DatasetLabel from 'features/datasets/DatasetLabel' -import { EMPTY_API_VALUES } from 'features/reports/areas/reports.config' +import { EMPTY_API_VALUES } from 'features/reports/areas/area-reports.config' import VesselLink from 'features/vessel/VesselLink' import VesselPin from 'features/vessel/VesselPin' import { GLOBAL_VESSELS_DATASET_ID } from 'data/workspaces' -import { ReportActivityUnit } from 'features/reports/areas/Report' +import { ReportActivityUnit } from 'features/reports/areas/AreaReport' import { selectReportVesselsPaginated } from 'features/reports/activity/vessels/report-activity-vessels.selectors' -import { ReportCategory } from 'features/reports/areas/reports.types' +import { ReportCategory } from 'features/reports/areas/area-reports.types' import ReportVesselsTableFooter from 'features/reports/activity/vessels/ReportVesselsTableFooter' import styles from 'features/reports/activity/vessels/ReportVesselsTable.module.css' diff --git a/apps/fishing-map/features/reports/activity/vessels/ReportVesselsTableFooter.tsx b/apps/fishing-map/features/reports/activity/vessels/ReportVesselsTableFooter.tsx index 15be5c32cd..f3bf986ed7 100644 --- a/apps/fishing-map/features/reports/activity/vessels/ReportVesselsTableFooter.tsx +++ b/apps/fishing-map/features/reports/activity/vessels/ReportVesselsTableFooter.tsx @@ -17,15 +17,15 @@ import { } from 'features/vessel-groups/vessel-groups.slice' import { selectActiveActivityAndDetectionsDataviews } from 'features/dataviews/selectors/dataviews.selectors' import { TrackCategory, trackEvent } from 'features/app/analytics.hooks' -import { selectReportVesselFilter } from 'features/reports/areas/reports.config.selectors' +import { selectReportVesselFilter } from 'features/reports/areas/area-reports.config.selectors' import { selectReportAreaName, ReportVesselWithDatasets, -} from 'features/reports/areas/reports.selectors' +} from 'features/reports/areas/area-reports.selectors' import { parseReportVesselsToIdentity, getVesselsFiltered, -} from 'features/reports/areas/reports.utils' +} from 'features/reports/areas/area-reports.utils' import styles from './ReportVesselsTableFooter.module.css' import { selectReportVesselsListWithAllInfo, diff --git a/apps/fishing-map/features/reports/activity/vessels/report-activity-vessels.selectors.ts b/apps/fishing-map/features/reports/activity/vessels/report-activity-vessels.selectors.ts index 41a8d5bb88..ece0c5e14b 100644 --- a/apps/fishing-map/features/reports/activity/vessels/report-activity-vessels.selectors.ts +++ b/apps/fishing-map/features/reports/activity/vessels/report-activity-vessels.selectors.ts @@ -8,22 +8,22 @@ import { } from 'features/app/selectors/app.reports.selector' import { selectAllDatasets } from 'features/datasets/datasets.slice' import { getRelatedDatasetByType } from 'features/datasets/datasets.utils' -import { getVesselsFiltered } from 'features/reports/areas/reports.utils' +import { getVesselsFiltered } from 'features/reports/areas/area-reports.utils' import { EMPTY_API_VALUES, MAX_CATEGORIES, OTHERS_CATEGORY_LABEL, -} from 'features/reports/areas/reports.config' +} from 'features/reports/areas/area-reports.config' import { ReportVesselWithDatasets, selectReportActivityFlatten, selectReportDataviewsWithPermissions, -} from 'features/reports/areas/reports.selectors' +} from 'features/reports/areas/area-reports.selectors' import { selectReportResultsPerPage, selectReportVesselFilter, selectReportVesselPage, -} from 'features/reports/areas/reports.config.selectors' +} from 'features/reports/areas/area-reports.config.selectors' import { cleanFlagState, cleanVesselOrGearType, diff --git a/apps/fishing-map/features/reports/areas/Report.module.css b/apps/fishing-map/features/reports/areas/AreaReport.module.css similarity index 100% rename from apps/fishing-map/features/reports/areas/Report.module.css rename to apps/fishing-map/features/reports/areas/AreaReport.module.css diff --git a/apps/fishing-map/features/reports/areas/Report.tsx b/apps/fishing-map/features/reports/areas/AreaReport.tsx similarity index 94% rename from apps/fishing-map/features/reports/areas/Report.tsx rename to apps/fishing-map/features/reports/areas/AreaReport.tsx index 053f8b2862..9cce20e3b3 100644 --- a/apps/fishing-map/features/reports/areas/Report.tsx +++ b/apps/fishing-map/features/reports/areas/AreaReport.tsx @@ -17,13 +17,13 @@ import { selectHasReportBuffer, selectReportArea, selectReportAreaStatus, -} from 'features/reports/areas/reports.selectors' +} from 'features/reports/areas/area-reports.selectors' import { TimebarVisualisations } from 'types' import { useTimebarEnvironmentConnect, useTimebarVisualisationConnect, } from 'features/timebar/timebar.hooks' -import { getReportCategoryFromDataview } from 'features/reports/areas/reports.utils' +import { getReportCategoryFromDataview } from 'features/reports/areas/area-reports.utils' import { resetReportData, selectReportVesselsStatus, @@ -34,11 +34,14 @@ import { useSetTimeseries } from 'features/reports/activity/reports-activity-tim import { TrackCategory, trackEvent } from 'features/app/analytics.hooks' import ActivityReport from 'features/reports/activity/ReportActivity' import ReportTitle from 'features/reports/areas/title/ReportTitle' -import { ReportCategory } from 'features/reports/areas/reports.types' +import { ReportCategory } from 'features/reports/areas/area-reports.types' import ReportSummary from 'features/reports/areas/summary/ReportSummary' import ReportEnvironment from 'features/reports/areas/environment/ReportEnvironment' -import { useFitAreaInViewport, useHighlightReportArea } from 'features/reports/areas/reports.hooks' -import styles from 'features/reports/areas/Report.module.css' +import { + useFitAreaInViewport, + useHighlightReportArea, +} from 'features/reports/areas/area-reports.hooks' +import styles from 'features/reports/areas/AreaReport.module.css' export type ReportActivityUnit = 'hour' | 'detection' diff --git a/apps/fishing-map/features/reports/areas/NewReportModal.module.css b/apps/fishing-map/features/reports/areas/NewAreaReportModal.module.css similarity index 100% rename from apps/fishing-map/features/reports/areas/NewReportModal.module.css rename to apps/fishing-map/features/reports/areas/NewAreaReportModal.module.css diff --git a/apps/fishing-map/features/reports/areas/NewReportModal.tsx b/apps/fishing-map/features/reports/areas/NewAreaReportModal.tsx similarity index 97% rename from apps/fishing-map/features/reports/areas/NewReportModal.tsx rename to apps/fishing-map/features/reports/areas/NewAreaReportModal.tsx index 9ff346e347..8e4b1e67d4 100644 --- a/apps/fishing-map/features/reports/areas/NewReportModal.tsx +++ b/apps/fishing-map/features/reports/areas/NewAreaReportModal.tsx @@ -12,15 +12,15 @@ import { } from '@globalfishingwatch/api-types' import { useAppDispatch } from 'features/app/app.hooks' import { TrackCategory, trackEvent } from 'features/app/analytics.hooks' -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 { createReportThunk, updateReportThunk } from 'features/reports/areas/reports.slice' +import { createReportThunk, updateReportThunk } from 'features/reports/areas/area-reports.slice' import { selectPrivateDatasetsInWorkspace } from 'features/dataviews/selectors/dataviews.selectors' import { ROOT_DOM_ELEMENT } from 'data/config' import { selectWorkspaceWithCurrentState } from 'features/app/selectors/app.workspace.selectors' import { AsyncError } from 'utils/async-slice' import { getViewAccessOptions } from 'features/workspace/save/workspace-save.utils' -import styles from './NewReportModal.module.css' +import styles from './NewAreaReportModal.module.css' type NewReportModalProps = { title?: string diff --git a/apps/fishing-map/features/reports/areas/reports.config.selectors.ts b/apps/fishing-map/features/reports/areas/area-reports.config.selectors.ts similarity index 91% rename from apps/fishing-map/features/reports/areas/reports.config.selectors.ts rename to apps/fishing-map/features/reports/areas/area-reports.config.selectors.ts index abc6a1940f..f1a8dfd268 100644 --- a/apps/fishing-map/features/reports/areas/reports.config.selectors.ts +++ b/apps/fishing-map/features/reports/areas/area-reports.config.selectors.ts @@ -1,7 +1,7 @@ import { createSelector } from '@reduxjs/toolkit' import { selectLocationQuery } from 'routes/routes.selectors' -import { AreaReportState, AreaReportStateProperty } from './reports.types' -import { DEFAULT_AREA_REPORT_STATE } from './reports.config' +import { AreaReportState, AreaReportStateProperty } from './area-reports.types' +import { DEFAULT_AREA_REPORT_STATE } from './area-reports.config' type AreaReportProperty

= Required[P] function selectAreaReportStateProperty

(property: P) { diff --git a/apps/fishing-map/features/reports/areas/reports.config.ts b/apps/fishing-map/features/reports/areas/area-reports.config.ts similarity index 97% rename from apps/fishing-map/features/reports/areas/reports.config.ts rename to apps/fishing-map/features/reports/areas/area-reports.config.ts index 1d4c621e90..43175c5ce4 100644 --- a/apps/fishing-map/features/reports/areas/reports.config.ts +++ b/apps/fishing-map/features/reports/areas/area-reports.config.ts @@ -5,7 +5,7 @@ import { } from 'data/config' import { BufferUnit, BufferOperation } from 'types' import { Area, AreaGeometry } from 'features/areas/areas.slice' -import { AreaReportState } from './reports.types' +import { AreaReportState } from './area-reports.types' export const REPORT_BUFFER_FEATURE_ID: string = 'buffer' export const DEFAULT_BUFFER_VALUE: number = 50 diff --git a/apps/fishing-map/features/reports/areas/reports.hooks.ts b/apps/fishing-map/features/reports/areas/area-reports.hooks.ts similarity index 98% rename from apps/fishing-map/features/reports/areas/reports.hooks.ts rename to apps/fishing-map/features/reports/areas/area-reports.hooks.ts index ea1b9a477b..b7b2984f05 100644 --- a/apps/fishing-map/features/reports/areas/reports.hooks.ts +++ b/apps/fishing-map/features/reports/areas/area-reports.hooks.ts @@ -24,14 +24,17 @@ import { selectReportAreaIds, selectReportAreaStatus, selectReportDataviewsWithPermissions, -} from 'features/reports/areas/reports.selectors' +} from 'features/reports/areas/area-reports.selectors' import { useDeckMap } from 'features/map/map-context.hooks' import { Bbox } from 'types' import { useSetMapCoordinates, useMapViewState } from 'features/map/map-viewport.hooks' import { FIT_BOUNDS_REPORT_PADDING } from 'data/config' import { RFMO_DATAVIEW_SLUG } from 'data/workspaces' import { getMapCoordinatesFromBounds } from 'features/map/map-bounds.hooks' -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 { selectIsVesselGroupReportLocation, selectUrlTimeRange } from 'routes/routes.selectors' import { AsyncReducerStatus } from 'utils/async-slice' import { diff --git a/apps/fishing-map/features/reports/areas/reports.selectors.ts b/apps/fishing-map/features/reports/areas/area-reports.selectors.ts similarity index 96% rename from apps/fishing-map/features/reports/areas/reports.selectors.ts rename to apps/fishing-map/features/reports/areas/area-reports.selectors.ts index 96f228fc9d..91cec98518 100644 --- a/apps/fishing-map/features/reports/areas/reports.selectors.ts +++ b/apps/fishing-map/features/reports/areas/area-reports.selectors.ts @@ -18,10 +18,13 @@ import { getBufferedArea, getBufferedFeature, getReportCategoryFromDataview, -} from 'features/reports/areas/reports.utils' +} from 'features/reports/areas/area-reports.utils' import { createDeepEqualSelector } from 'utils/selectors' import { Area, AreaGeometry, selectAreas } from 'features/areas/areas.slice' -import { EMPTY_API_VALUES, ENTIRE_WORLD_REPORT_AREA } from 'features/reports/areas/reports.config' +import { + EMPTY_API_VALUES, + ENTIRE_WORLD_REPORT_AREA, +} from 'features/reports/areas/area-reports.config' import { selectDataviewInstancesResolved } from 'features/dataviews/selectors/dataviews.resolvers.selectors' import { selectActiveReportDataviews } from 'features/dataviews/selectors/dataviews.selectors' import { selectIsVesselGroupReportLocation } from 'routes/routes.selectors' @@ -29,8 +32,11 @@ import { selectReportVesselsData, selectReportPreviewBuffer, } from '../activity/reports-activity.slice' -import { selectReportActivityGraph, selectReportTimeComparison } from './reports.config.selectors' -import { ReportCategory } from './reports.types' +import { + selectReportActivityGraph, + selectReportTimeComparison, +} from './area-reports.config.selectors' +import { ReportCategory } from './area-reports.types' const EMPTY_ARRAY: [] = [] diff --git a/apps/fishing-map/features/reports/areas/reports.slice.ts b/apps/fishing-map/features/reports/areas/area-reports.slice.ts similarity index 100% rename from apps/fishing-map/features/reports/areas/reports.slice.ts rename to apps/fishing-map/features/reports/areas/area-reports.slice.ts diff --git a/apps/fishing-map/features/reports/areas/reports.types.ts b/apps/fishing-map/features/reports/areas/area-reports.types.ts similarity index 100% rename from apps/fishing-map/features/reports/areas/reports.types.ts rename to apps/fishing-map/features/reports/areas/area-reports.types.ts diff --git a/apps/fishing-map/features/reports/areas/reports.utils.ts b/apps/fishing-map/features/reports/areas/area-reports.utils.ts similarity index 98% rename from apps/fishing-map/features/reports/areas/reports.utils.ts rename to apps/fishing-map/features/reports/areas/area-reports.utils.ts index ce1f272469..5d2c916cfa 100644 --- a/apps/fishing-map/features/reports/areas/reports.utils.ts +++ b/apps/fishing-map/features/reports/areas/area-reports.utils.ts @@ -28,9 +28,9 @@ import { DEFAULT_POINT_BUFFER_VALUE, DIFFERENCE, REPORT_BUFFER_FEATURE_ID, -} from './reports.config' -import { ReportVesselWithDatasets } from './reports.selectors' -import { ReportCategory } from './reports.types' +} from './area-reports.config' +import { ReportVesselWithDatasets } from './area-reports.selectors' +import { ReportCategory } from './area-reports.types' const ALWAYS_SHOWN_FILTERS = ['vessel-groups'] diff --git a/apps/fishing-map/features/reports/areas/summary/ReportSummary.tsx b/apps/fishing-map/features/reports/areas/summary/ReportSummary.tsx index 09123b98eb..be6e94ab12 100644 --- a/apps/fishing-map/features/reports/areas/summary/ReportSummary.tsx +++ b/apps/fishing-map/features/reports/areas/summary/ReportSummary.tsx @@ -8,8 +8,8 @@ import { Locale } from '@globalfishingwatch/api-types' import { formatI18nDate } from 'features/i18n/i18nDate' import { selectReportCategory } from 'features/app/selectors/app.reports.selector' import ReportSummaryTags from 'features/reports/areas/summary/ReportSummaryTags' -import { FIELDS, getCommonProperties } from 'features/reports/areas/reports.utils' -import { ReportActivityUnit } from 'features/reports/areas/Report' +import { FIELDS, getCommonProperties } from 'features/reports/areas/area-reports.utils' +import { ReportActivityUnit } from 'features/reports/areas/AreaReport' import { getDatasetTitleByDataview } from 'features/datasets/datasets.utils' import { useReportFilteredTimeSeries, @@ -33,8 +33,8 @@ import { selectReportVesselsHours, selectReportVesselsNumber, } from 'features/reports/activity/vessels/report-activity-vessels.selectors' -import { selectReportTimeComparison } from '../reports.config.selectors' -import { ReportCategory } from '../reports.types' +import { selectReportTimeComparison } from '../area-reports.config.selectors' +import { ReportCategory } from '../area-reports.types' import styles from './ReportSummary.module.css' type ReportSummaryProps = { diff --git a/apps/fishing-map/features/reports/areas/title/BufferButonTooltip.tsx b/apps/fishing-map/features/reports/areas/title/BufferButonTooltip.tsx index 4287c14e56..fd63f62092 100644 --- a/apps/fishing-map/features/reports/areas/title/BufferButonTooltip.tsx +++ b/apps/fishing-map/features/reports/areas/title/BufferButonTooltip.tsx @@ -8,10 +8,10 @@ import { NAUTICAL_MILES, DISSOLVE, DIFFERENCE, -} from 'features/reports/areas/reports.config' +} from 'features/reports/areas/area-reports.config' import { BufferOperation, BufferUnit } from 'types' import { BUFFER_PREVIEW_COLOR } from 'data/config' -import { selectReportPreviewBufferFeature } from 'features/reports/areas/reports.selectors' +import { selectReportPreviewBufferFeature } from 'features/reports/areas/area-reports.selectors' import styles from './ReportTitle.module.css' type BufferButonTooltipProps = { diff --git a/apps/fishing-map/features/reports/areas/title/ReportTitle.tsx b/apps/fishing-map/features/reports/areas/title/ReportTitle.tsx index c71d34591f..f089f769a2 100644 --- a/apps/fishing-map/features/reports/areas/title/ReportTitle.tsx +++ b/apps/fishing-map/features/reports/areas/title/ReportTitle.tsx @@ -14,7 +14,7 @@ import { DEFAULT_BUFFER_OPERATION, DEFAULT_BUFFER_VALUE, NAUTICAL_MILES, -} from 'features/reports/areas/reports.config' +} from 'features/reports/areas/area-reports.config' import { resetReportData, selectReportPreviewBuffer, @@ -24,7 +24,7 @@ import { selectReportArea, selectReportAreaDataviews, selectReportAreaStatus, -} from 'features/reports/areas/reports.selectors' +} from 'features/reports/areas/area-reports.selectors' import ReportTitlePlaceholder from 'features/reports/areas/placeholders/ReportTitlePlaceholder' import { TrackCategory, trackEvent } from 'features/app/analytics.hooks' import { @@ -39,7 +39,7 @@ import { cleanCurrentWorkspaceStateBufferParams } from 'features/workspace/works import { AsyncReducerStatus } from 'utils/async-slice' import { formatI18nNumber } from 'features/i18n/i18nNumber' import { useReportFeaturesLoading } from 'features/reports/activity/reports-activity-timeseries.hooks' -import { useHighlightReportArea } from '../reports.hooks' +import { useHighlightReportArea } from '../area-reports.hooks' import { BufferButtonTooltip } from './BufferButonTooltip' import styles from './ReportTitle.module.css' diff --git a/apps/fishing-map/features/reports/events/VGREventsGraph.tsx b/apps/fishing-map/features/reports/events/VGREventsGraph.tsx index 8a0d88f157..551e44b605 100644 --- a/apps/fishing-map/features/reports/events/VGREventsGraph.tsx +++ b/apps/fishing-map/features/reports/events/VGREventsGraph.tsx @@ -16,7 +16,7 @@ import { FourwingsInterval } from '@globalfishingwatch/deck-loaders' import i18n from 'features/i18n/i18n' import { formatDateForInterval, getUTCDateTime } from 'utils/dates' import { formatI18nNumber } from 'features/i18n/i18nNumber' -import { tickFormatter } from 'features/reports/areas/reports.utils' +import { tickFormatter } from 'features/reports/areas/area-reports.utils' import { COLOR_PRIMARY_BLUE } from 'features/app/app.config' import styles from './VGREventsGraph.module.css' diff --git a/apps/fishing-map/features/reports/events/vgr-events.selectors.ts b/apps/fishing-map/features/reports/events/vgr-events.selectors.ts index 629ced9e44..f8f25a0444 100644 --- a/apps/fishing-map/features/reports/events/vgr-events.selectors.ts +++ b/apps/fishing-map/features/reports/events/vgr-events.selectors.ts @@ -13,7 +13,7 @@ import { selectVGREventsVesselFilter, selectVGREventsVesselPage, } from 'features/reports/vessel-groups/vessel-group.config.selectors' -import { getVesselsFiltered } from 'features/reports/areas/reports.utils' +import { getVesselsFiltered } from 'features/reports/areas/area-reports.utils' import { REPORT_FILTER_PROPERTIES } from 'features/reports/vessel-groups/vessels/vessel-group-report-vessels.selectors' import { selectVGREventsSubsectionDataview } from 'features/reports/vessel-groups/vessel-group-report.selectors' diff --git a/apps/fishing-map/features/reports/vessel-groups/VesselGroupReport.tsx b/apps/fishing-map/features/reports/vessel-groups/VesselGroupReport.tsx index 3e3f088619..15e12c74a9 100644 --- a/apps/fishing-map/features/reports/vessel-groups/VesselGroupReport.tsx +++ b/apps/fishing-map/features/reports/vessel-groups/VesselGroupReport.tsx @@ -14,7 +14,7 @@ import { } from 'features/timebar/timebar.hooks' import VGREvents from 'features/reports/events/VGREvents' import VGRActivity from 'features/reports/vessel-groups/activity/VGRActivity' -import { useFitAreaInViewport } from '../areas/reports.hooks' +import { useFitAreaInViewport } from '../areas/area-reports.hooks' import { useFetchVesselGroupReport } from './vessel-group-report.hooks' import { selectVGRData, selectVGRStatus } from './vessel-group-report.slice' import VesselGroupReportTitle from './VesselGroupReportTitle' diff --git a/apps/fishing-map/features/reports/vessel-groups/activity/VGRActivitySubsectionSelector.tsx.tsx b/apps/fishing-map/features/reports/vessel-groups/activity/VGRActivitySubsectionSelector.tsx.tsx index 33330f6c54..76fa79aaad 100644 --- a/apps/fishing-map/features/reports/vessel-groups/activity/VGRActivitySubsectionSelector.tsx.tsx +++ b/apps/fishing-map/features/reports/vessel-groups/activity/VGRActivitySubsectionSelector.tsx.tsx @@ -5,7 +5,7 @@ import { useLocationConnect } from 'routes/routes.hook' import { VGRActivitySubsection } from 'features/vessel-groups/vessel-groups.types' import { selectVGRActivitySubsection } from 'features/reports/vessel-groups/vessel-group.config.selectors' import { useReportFeaturesLoading } from 'features/reports/activity/reports-activity-timeseries.hooks' -import { useFitAreaInViewport } from 'features/reports/areas/reports.hooks' +import { useFitAreaInViewport } from 'features/reports/areas/area-reports.hooks' import { resetReportData } from 'features/reports/activity/reports-activity.slice' import { useAppDispatch } from 'features/app/app.hooks' diff --git a/apps/fishing-map/features/reports/vessel-groups/vessels/VesselGroupReportVesselsGraph.tsx b/apps/fishing-map/features/reports/vessel-groups/vessels/VesselGroupReportVesselsGraph.tsx index c5d66cd70d..29540a1c64 100644 --- a/apps/fishing-map/features/reports/vessel-groups/vessels/VesselGroupReportVesselsGraph.tsx +++ b/apps/fishing-map/features/reports/vessel-groups/vessels/VesselGroupReportVesselsGraph.tsx @@ -4,7 +4,7 @@ import { BarChart, Bar, XAxis, Tooltip, ResponsiveContainer, LabelList } from 'r import { useTranslation } from 'react-i18next' import { VesselGroupEventsStatsResponseGroups } from 'queries/vessel-group-events-stats-api' import I18nNumber, { formatI18nNumber } from 'features/i18n/i18nNumber' -import { EMPTY_API_VALUES, OTHERS_CATEGORY_LABEL } from 'features/reports/areas/reports.config' +import { EMPTY_API_VALUES, OTHERS_CATEGORY_LABEL } from 'features/reports/areas/area-reports.config' import { formatInfoField } from 'utils/info' import { useLocationConnect } from 'routes/routes.hook' import { diff --git a/apps/fishing-map/features/reports/vessel-groups/vessels/VesselGroupReportVesselsTable.tsx b/apps/fishing-map/features/reports/vessel-groups/vessels/VesselGroupReportVesselsTable.tsx index 6de396764b..9112fd45c8 100644 --- a/apps/fishing-map/features/reports/vessel-groups/vessels/VesselGroupReportVesselsTable.tsx +++ b/apps/fishing-map/features/reports/vessel-groups/vessels/VesselGroupReportVesselsTable.tsx @@ -9,7 +9,7 @@ import { getDatasetsReportNotSupported } from 'features/datasets/datasets.utils' import { selectActiveReportDataviews } from 'features/dataviews/selectors/dataviews.selectors' import { selectUserData } from 'features/user/selectors/user.selectors' import DatasetLabel from 'features/datasets/DatasetLabel' -import { EMPTY_API_VALUES } from 'features/reports/areas/reports.config' +import { EMPTY_API_VALUES } from 'features/reports/areas/area-reports.config' import VesselLink from 'features/vessel/VesselLink' import VesselPin from 'features/vessel/VesselPin' import { selectWorkspaceStatus } from 'features/workspace/workspace.selectors' diff --git a/apps/fishing-map/features/reports/vessel-groups/vessels/vessel-group-report-vessels.selectors.ts b/apps/fishing-map/features/reports/vessel-groups/vessels/vessel-group-report-vessels.selectors.ts index 16b8c66ff5..f585ada653 100644 --- a/apps/fishing-map/features/reports/vessel-groups/vessels/vessel-group-report-vessels.selectors.ts +++ b/apps/fishing-map/features/reports/vessel-groups/vessels/vessel-group-report-vessels.selectors.ts @@ -14,7 +14,7 @@ import { FILTER_PROPERTIES, FilterProperty, getVesselsFiltered, -} from 'features/reports/areas/reports.utils' +} from 'features/reports/areas/area-reports.utils' import { selectVGRVesselsOrderDirection, selectVGRVesselsOrderProperty, diff --git a/apps/fishing-map/features/sidebar/Sidebar.tsx b/apps/fishing-map/features/sidebar/Sidebar.tsx index 13555de2e7..d5e8c59962 100644 --- a/apps/fishing-map/features/sidebar/Sidebar.tsx +++ b/apps/fishing-map/features/sidebar/Sidebar.tsx @@ -26,7 +26,7 @@ import CategoryTabs from './CategoryTabs' import SidebarHeader from './SidebarHeader' const AreaReport = dynamic( - () => import(/* webpackChunkName: "Report" */ 'features/reports/areas/Report') + () => import(/* webpackChunkName: "Report" */ 'features/reports/areas/AreaReport') ) const VesselGroupReport = dynamic( () => import(/* webpackChunkName: "Report" */ 'features/reports/vessel-groups/VesselGroupReport') diff --git a/apps/fishing-map/features/sidebar/SidebarHeader.tsx b/apps/fishing-map/features/sidebar/SidebarHeader.tsx index 605d345c5c..1c8afccc51 100644 --- a/apps/fishing-map/features/sidebar/SidebarHeader.tsx +++ b/apps/fishing-map/features/sidebar/SidebarHeader.tsx @@ -50,13 +50,13 @@ import { resetSidebarScroll } from 'features/sidebar/sidebar.utils' import { useAppDispatch } from 'features/app/app.hooks' import { resetReportData } from 'features/reports/activity/reports-activity.slice' import { TrackCategory, trackEvent } from 'features/app/analytics.hooks' -import { selectReportsStatus } from 'features/reports/areas/reports.slice' +import { selectReportsStatus } from 'features/reports/areas/area-reports.slice' import { selectCurrentReport } from 'features/app/selectors/app.reports.selector' import { useLocationConnect } from 'routes/routes.hook' import { HOME, REPORT, ROUTE_TYPES, WORKSPACE } from 'routes/routes' import { EMPTY_FILTERS, IMO_LENGTH, SSVID_LENGTH, SearchType } from 'features/search/search.config' import { resetAreaDetail } from 'features/areas/areas.slice' -import { selectReportAreaIds } from 'features/reports/areas/reports.selectors' +import { selectReportAreaIds } from 'features/reports/areas/area-reports.selectors' import { useSearchFiltersConnect } from 'features/search/search.hook' import { resetVesselState } from 'features/vessel/vessel.slice' import { cleanVesselSearchResults } from 'features/search/search.slice' @@ -65,13 +65,14 @@ import LanguageToggle from 'features/i18n/LanguageToggle' import { DEFAULT_VESSEL_STATE } from 'features/vessel/vessel.config' import { isPrivateWorkspaceNotAllowed } from 'features/workspace/workspace.utils' import { setModalOpen } from 'features/modals/modals.slice' -import { useHighlightReportArea } from 'features/reports/areas/reports.hooks' +import { useHighlightReportArea } from 'features/reports/areas/area-reports.hooks' import { resetVesselGroupReportData } from 'features/reports/vessel-groups/vessel-group-report.slice' import { useClipboardNotification } from './sidebar.hooks' import styles from './SidebarHeader.module.css' const NewReportModal = dynamic( - () => import(/* webpackChunkName: "NewWorkspaceModal" */ 'features/reports/areas/NewReportModal') + () => + import(/* webpackChunkName: "NewWorkspaceModal" */ 'features/reports/areas/NewAreaReportModal') ) function SaveReportButton() { diff --git a/apps/fishing-map/features/timebar/Timebar.tsx b/apps/fishing-map/features/timebar/Timebar.tsx index 94cc7b53c5..16d161d5ab 100644 --- a/apps/fishing-map/features/timebar/Timebar.tsx +++ b/apps/fishing-map/features/timebar/Timebar.tsx @@ -29,7 +29,7 @@ import { TimebarGraphs, TimebarVisualisations } from 'types' import { selectLatestAvailableDataDate } from 'features/app/selectors/app.selectors' import { getEventLabel } from 'utils/analytics' import { upperFirst } from 'utils/info' -import { selectShowTimeComparison } from 'features/reports/areas/reports.selectors' +import { selectShowTimeComparison } from 'features/reports/areas/area-reports.selectors' import Hint from 'features/help/Hint' import { MAX_TIMEBAR_VESSELS } from 'features/timebar/timebar.config' import { useAppDispatch } from 'features/app/app.hooks' diff --git a/apps/fishing-map/features/timebar/timebar.hooks.ts b/apps/fishing-map/features/timebar/timebar.hooks.ts index a75ae9d0fd..d592c411b7 100644 --- a/apps/fishing-map/features/timebar/timebar.hooks.ts +++ b/apps/fishing-map/features/timebar/timebar.hooks.ts @@ -20,7 +20,7 @@ import { updateUrlTimerange } from 'routes/routes.actions' import { selectIsAnyReportLocation } from 'routes/routes.selectors' import { selectHintsDismissed, setHintDismissed } from 'features/help/hints.slice' import { useAppDispatch } from 'features/app/app.hooks' -import { useFitAreaInViewport } from 'features/reports/areas/reports.hooks' +import { useFitAreaInViewport } from 'features/reports/areas/area-reports.hooks' import { DEFAULT_TIME_RANGE } from 'data/config' import { selectActiveTrackDataviews } from 'features/dataviews/selectors/dataviews.instances.selectors' import { selectIsWorkspaceMapReady } from 'features/workspace/workspace.selectors' diff --git a/apps/fishing-map/features/timebar/timebar.selectors.ts b/apps/fishing-map/features/timebar/timebar.selectors.ts index 5e80400504..2948509bf3 100644 --- a/apps/fishing-map/features/timebar/timebar.selectors.ts +++ b/apps/fishing-map/features/timebar/timebar.selectors.ts @@ -19,7 +19,7 @@ import { selectActivityVisualizationMode, selectDetectionsVisualizationMode, } from 'features/app/selectors/app.selectors' -import { getReportCategoryFromDataview } from 'features/reports/areas/reports.utils' +import { getReportCategoryFromDataview } from 'features/reports/areas/area-reports.utils' import { selectIsAnyReportLocation } from 'routes/routes.selectors' import { selectReportCategory } from 'features/app/selectors/app.reports.selector' import { diff --git a/apps/fishing-map/features/user/UserReports.tsx b/apps/fishing-map/features/user/UserReports.tsx index 92aa8d145a..630d315a30 100644 --- a/apps/fishing-map/features/user/UserReports.tsx +++ b/apps/fishing-map/features/user/UserReports.tsx @@ -12,7 +12,7 @@ import { fetchReportsThunk, selectReportsStatus, selectReportsStatusId, -} from 'features/reports/areas/reports.slice' +} from 'features/reports/areas/area-reports.slice' import { REPORT } from 'routes/routes' import { selectUserReports } from 'features/user/selectors/user.permissions.selectors' import { resetReportData } from 'features/reports/activity/reports-activity.slice' diff --git a/apps/fishing-map/features/user/selectors/user.permissions.selectors.ts b/apps/fishing-map/features/user/selectors/user.permissions.selectors.ts index 31185db4d7..7cc148dad7 100644 --- a/apps/fishing-map/features/user/selectors/user.permissions.selectors.ts +++ b/apps/fishing-map/features/user/selectors/user.permissions.selectors.ts @@ -9,7 +9,7 @@ import { selectAllVesselGroups, selectWorkspaceVesselGroups, } from 'features/vessel-groups/vessel-groups.slice' -import { selectAllReports } from 'features/reports/areas/reports.slice' +import { selectAllReports } from 'features/reports/areas/area-reports.slice' import { selectUserData } from 'features/user/selectors/user.selectors' import { DEFAULT_GROUP_ID } from 'features/user/user.config' import { USER_GROUP_WORKSPACE } from '../user.slice' diff --git a/apps/fishing-map/features/vessel-groups/vessel-groups.hooks.ts b/apps/fishing-map/features/vessel-groups/vessel-groups.hooks.ts index dcb3ed938d..8752c88475 100644 --- a/apps/fishing-map/features/vessel-groups/vessel-groups.hooks.ts +++ b/apps/fishing-map/features/vessel-groups/vessel-groups.hooks.ts @@ -8,7 +8,7 @@ import { getVesselGroupLabel } from 'features/vessel-groups/vessel-groups.utils' import { IdentityVesselData } from 'features/vessel/vessel.slice' import { getCurrentIdentityVessel } from 'features/vessel/vessel.utils' import { VesselLastIdentity } from 'features/search/search.slice' -import { ReportVesselWithDatasets } from 'features/reports/areas/reports.selectors' +import { ReportVesselWithDatasets } from 'features/reports/areas/area-reports.selectors' import { useAppDispatch } from 'features/app/app.hooks' import { selectVesselGroupsStatusId, diff --git a/apps/fishing-map/features/workspace/workspace.slice.ts b/apps/fishing-map/features/workspace/workspace.slice.ts index d671523bc5..e444421fec 100644 --- a/apps/fishing-map/features/workspace/workspace.slice.ts +++ b/apps/fishing-map/features/workspace/workspace.slice.ts @@ -48,12 +48,12 @@ import { AppWorkspace } from 'features/workspaces-list/workspaces-list.slice' import { getVesselDataviewInstanceDatasetConfig } from 'features/dataviews/dataviews.utils' import { mergeDataviewIntancesToUpsert } from 'features/workspace/workspace.hook' import { getUTCDateTime } from 'utils/dates' -import { fetchReportsThunk } from 'features/reports/areas/reports.slice' +import { fetchReportsThunk } from 'features/reports/areas/area-reports.slice' import { AppDispatch } from 'store' import { LIBRARY_LAYERS } from 'data/layer-library' import { selectPrivateUserGroups } from 'features/user/selectors/user.groups.selectors' import { PRIVATE_SEARCH_DATASET_BY_GROUP } from 'features/user/user.config' -import { DEFAULT_AREA_REPORT_STATE } from 'features/reports/areas/reports.config' +import { DEFAULT_AREA_REPORT_STATE } from 'features/reports/areas/area-reports.config' import { DEFAULT_VESSEL_GROUP_REPORT_STATE } from 'features/reports/vessel-groups/vessel-group-report.config' import { fetchVesselGroupsThunk } from 'features/vessel-groups/vessel-groups.slice' import { diff --git a/apps/fishing-map/reducers.ts b/apps/fishing-map/reducers.ts index 3409029c1c..5cf15acb8a 100644 --- a/apps/fishing-map/reducers.ts +++ b/apps/fishing-map/reducers.ts @@ -20,7 +20,7 @@ import mapReducer from 'features/map/map.slice' import modalsReducer from 'features/modals/modals.slice' import regionsReducer from 'features/regions/regions.slice' import reportReducer from 'features/reports/activity/reports-activity.slice' -import reportsReducer from 'features/reports/areas/reports.slice' +import reportsReducer from 'features/reports/areas/area-reports.slice' import resourcesReducer from 'features/resources/resources.slice' import searchReducer from 'features/search/search.slice' import timebarReducer from 'features/timebar/timebar.slice' diff --git a/apps/fishing-map/types/index.ts b/apps/fishing-map/types/index.ts index e8807282d4..3c7ad8a575 100644 --- a/apps/fishing-map/types/index.ts +++ b/apps/fishing-map/types/index.ts @@ -8,7 +8,7 @@ import { RulerData, } from '@globalfishingwatch/deck-layers' import { MapAnnotation } from 'features/map/overlays/annotations/annotations.types' -import { AreaReportState, AreaReportStateProperty } from 'features/reports/areas/reports.types' +import { AreaReportState, AreaReportStateProperty } from 'features/reports/areas/area-reports.types' import { VesselProfileState, VesselProfileStateProperty } from 'features/vessel/vessel.types' import { VesselGroupReportState,