From f99a16bf5a744c439a9350363944edf638d34702 Mon Sep 17 00:00:00 2001 From: Tasso Evangelista Date: Fri, 27 May 2022 00:09:47 -0300 Subject: [PATCH 1/3] Fix odd typechecking issues with JSON modules --- packages/ui-contexts/tsconfig.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/ui-contexts/tsconfig.json b/packages/ui-contexts/tsconfig.json index 455edb8149c4..010aef9ff7de 100644 --- a/packages/ui-contexts/tsconfig.json +++ b/packages/ui-contexts/tsconfig.json @@ -2,7 +2,9 @@ "extends": "../../tsconfig.base.json", "compilerOptions": { "rootDir": "./src", - "outDir": "./dist" + "outDir": "./dist", + "resolveJsonModule": true, + "esModuleInterop": true, }, "include": ["./src/**/*"] } From f07fd781d0286a164476e596fe16923b5448f334 Mon Sep 17 00:00:00 2001 From: Tasso Evangelista Date: Fri, 27 May 2022 00:10:09 -0300 Subject: [PATCH 2/3] Avoid `data` as directory for modules --- .../client/components/{data => dataView}/Counter.stories.tsx | 0 apps/meteor/client/components/{data => dataView}/Counter.tsx | 0 .../client/components/{data => dataView}/CounterSet.stories.tsx | 0 apps/meteor/client/components/{data => dataView}/CounterSet.tsx | 0 .../client/components/{data => dataView}/Growth.stories.tsx | 0 apps/meteor/client/components/{data => dataView}/Growth.tsx | 0 .../{data => dataView}/NegativeGrowthSymbol.stories.tsx | 0 .../components/{data => dataView}/NegativeGrowthSymbol.tsx | 0 .../{data => dataView}/PositiveGrowthSymbol.stories.tsx | 0 .../components/{data => dataView}/PositiveGrowthSymbol.tsx | 0 .../client/views/admin/federationDashboard/OverviewSection.tsx | 2 +- .../views/admin/engagementDashboard/channels/ChannelsTab.tsx | 2 +- .../admin/engagementDashboard/messages/MessagesSentSection.tsx | 2 +- .../admin/engagementDashboard/users/ActiveUsersSection.tsx | 2 +- .../views/admin/engagementDashboard/users/NewUsersSection.tsx | 2 +- yarn.lock | 2 +- 16 files changed, 6 insertions(+), 6 deletions(-) rename apps/meteor/client/components/{data => dataView}/Counter.stories.tsx (100%) rename apps/meteor/client/components/{data => dataView}/Counter.tsx (100%) rename apps/meteor/client/components/{data => dataView}/CounterSet.stories.tsx (100%) rename apps/meteor/client/components/{data => dataView}/CounterSet.tsx (100%) rename apps/meteor/client/components/{data => dataView}/Growth.stories.tsx (100%) rename apps/meteor/client/components/{data => dataView}/Growth.tsx (100%) rename apps/meteor/client/components/{data => dataView}/NegativeGrowthSymbol.stories.tsx (100%) rename apps/meteor/client/components/{data => dataView}/NegativeGrowthSymbol.tsx (100%) rename apps/meteor/client/components/{data => dataView}/PositiveGrowthSymbol.stories.tsx (100%) rename apps/meteor/client/components/{data => dataView}/PositiveGrowthSymbol.tsx (100%) diff --git a/apps/meteor/client/components/data/Counter.stories.tsx b/apps/meteor/client/components/dataView/Counter.stories.tsx similarity index 100% rename from apps/meteor/client/components/data/Counter.stories.tsx rename to apps/meteor/client/components/dataView/Counter.stories.tsx diff --git a/apps/meteor/client/components/data/Counter.tsx b/apps/meteor/client/components/dataView/Counter.tsx similarity index 100% rename from apps/meteor/client/components/data/Counter.tsx rename to apps/meteor/client/components/dataView/Counter.tsx diff --git a/apps/meteor/client/components/data/CounterSet.stories.tsx b/apps/meteor/client/components/dataView/CounterSet.stories.tsx similarity index 100% rename from apps/meteor/client/components/data/CounterSet.stories.tsx rename to apps/meteor/client/components/dataView/CounterSet.stories.tsx diff --git a/apps/meteor/client/components/data/CounterSet.tsx b/apps/meteor/client/components/dataView/CounterSet.tsx similarity index 100% rename from apps/meteor/client/components/data/CounterSet.tsx rename to apps/meteor/client/components/dataView/CounterSet.tsx diff --git a/apps/meteor/client/components/data/Growth.stories.tsx b/apps/meteor/client/components/dataView/Growth.stories.tsx similarity index 100% rename from apps/meteor/client/components/data/Growth.stories.tsx rename to apps/meteor/client/components/dataView/Growth.stories.tsx diff --git a/apps/meteor/client/components/data/Growth.tsx b/apps/meteor/client/components/dataView/Growth.tsx similarity index 100% rename from apps/meteor/client/components/data/Growth.tsx rename to apps/meteor/client/components/dataView/Growth.tsx diff --git a/apps/meteor/client/components/data/NegativeGrowthSymbol.stories.tsx b/apps/meteor/client/components/dataView/NegativeGrowthSymbol.stories.tsx similarity index 100% rename from apps/meteor/client/components/data/NegativeGrowthSymbol.stories.tsx rename to apps/meteor/client/components/dataView/NegativeGrowthSymbol.stories.tsx diff --git a/apps/meteor/client/components/data/NegativeGrowthSymbol.tsx b/apps/meteor/client/components/dataView/NegativeGrowthSymbol.tsx similarity index 100% rename from apps/meteor/client/components/data/NegativeGrowthSymbol.tsx rename to apps/meteor/client/components/dataView/NegativeGrowthSymbol.tsx diff --git a/apps/meteor/client/components/data/PositiveGrowthSymbol.stories.tsx b/apps/meteor/client/components/dataView/PositiveGrowthSymbol.stories.tsx similarity index 100% rename from apps/meteor/client/components/data/PositiveGrowthSymbol.stories.tsx rename to apps/meteor/client/components/dataView/PositiveGrowthSymbol.stories.tsx diff --git a/apps/meteor/client/components/data/PositiveGrowthSymbol.tsx b/apps/meteor/client/components/dataView/PositiveGrowthSymbol.tsx similarity index 100% rename from apps/meteor/client/components/data/PositiveGrowthSymbol.tsx rename to apps/meteor/client/components/dataView/PositiveGrowthSymbol.tsx diff --git a/apps/meteor/client/views/admin/federationDashboard/OverviewSection.tsx b/apps/meteor/client/views/admin/federationDashboard/OverviewSection.tsx index 2c0407ca9507..618ad33f18e1 100644 --- a/apps/meteor/client/views/admin/federationDashboard/OverviewSection.tsx +++ b/apps/meteor/client/views/admin/federationDashboard/OverviewSection.tsx @@ -2,7 +2,7 @@ import { Box, Skeleton } from '@rocket.chat/fuselage'; import { useTranslation } from '@rocket.chat/ui-contexts'; import React, { ReactElement, useMemo } from 'react'; -import CounterSet from '../../../components/data/CounterSet'; +import CounterSet from '../../../components/dataView/CounterSet'; import { AsyncStatePhase } from '../../../hooks/useAsyncState'; import { usePolledMethodData } from '../../../hooks/usePolledMethodData'; diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx index 94482ee8d4b8..a725dfcc4b8f 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx @@ -3,7 +3,7 @@ import { useTranslation } from '@rocket.chat/ui-contexts'; import moment from 'moment'; import React, { ReactElement, useMemo, useState } from 'react'; -import Growth from '../../../../../../client/components/data/Growth'; +import Growth from '../../../../../../client/components/dataView/Growth'; import Section from '../Section'; import DownloadDataButton from '../data/DownloadDataButton'; import PeriodSelector from '../data/PeriodSelector'; diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx index 451fde81cb9e..315da8a1692d 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx @@ -5,7 +5,7 @@ import { useTranslation } from '@rocket.chat/ui-contexts'; import moment from 'moment'; import React, { ReactElement, useMemo } from 'react'; -import CounterSet from '../../../../../../client/components/data/CounterSet'; +import CounterSet from '../../../../../../client/components/dataView/CounterSet'; import Section from '../Section'; import DownloadDataButton from '../data/DownloadDataButton'; import PeriodSelector from '../data/PeriodSelector'; diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx index 221c0090bffc..5a7d867a4caf 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx @@ -5,7 +5,7 @@ import { useTranslation } from '@rocket.chat/ui-contexts'; import moment from 'moment'; import React, { ReactElement, useMemo } from 'react'; -import CounterSet from '../../../../../../client/components/data/CounterSet'; +import CounterSet from '../../../../../../client/components/dataView/CounterSet'; import { useFormatDate } from '../../../../../../client/hooks/useFormatDate'; import Section from '../Section'; import DownloadDataButton from '../data/DownloadDataButton'; diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/NewUsersSection.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/users/NewUsersSection.tsx index 5c37592abf82..9871fd46f910 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/NewUsersSection.tsx +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/NewUsersSection.tsx @@ -6,7 +6,7 @@ import { useTranslation } from '@rocket.chat/ui-contexts'; import moment from 'moment'; import React, { ReactElement, useMemo } from 'react'; -import CounterSet from '../../../../../../client/components/data/CounterSet'; +import CounterSet from '../../../../../../client/components/dataView/CounterSet'; import { useFormatDate } from '../../../../../../client/hooks/useFormatDate'; import Section from '../Section'; import DownloadDataButton from '../data/DownloadDataButton'; diff --git a/yarn.lock b/yarn.lock index 48978808ce2e..63cd87e1fd09 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8607,7 +8607,7 @@ __metadata: human-interval: ~1.0.0 moment-timezone: ~0.5.27 mongodb: ~3.5.0 - checksum: f5f68008298f9482631f1f494e392cd6b8ba7971a3b0ece81ae2abe60f53d67973ff4476156fa5c9c41b8b58c4ccd284e95c545e0523996dfd05f9a80b843e07 + checksum: acb4ebb7e7356f6e53e810d821eb6aa3d88bbfb9e85183e707517bee6d1eea1f189f38bdf0dd2b91360492ab7643134d510c320d2523d86596498ab98e59735b languageName: node linkType: hard From 0327029c42ef2cadbad5341b6cc3258e29c52351 Mon Sep 17 00:00:00 2001 From: gabriellsh Date: Fri, 27 May 2022 16:30:40 -0300 Subject: [PATCH 3/3] rename other `data` folder --- .../admin/engagementDashboard/channels/ChannelsTab.tsx | 6 +++--- .../admin/engagementDashboard/channels/useChannelsList.ts | 2 +- .../{data => dataView}/DownloadDataButton.tsx | 3 +-- .../{data => dataView}/LegendSymbol.stories.tsx | 0 .../{data => dataView}/LegendSymbol.tsx | 0 .../{data => dataView}/PeriodSelector.tsx | 2 +- .../engagementDashboard/{data => dataView}/colors.ts | 0 .../engagementDashboard/{data => dataView}/periods.ts | 3 +-- .../{data => dataView}/usePeriodLabel.ts | 2 +- .../{data => dataView}/usePeriodSelectorState.ts | 0 .../messages/MessagesPerChannelSection.tsx | 8 ++++---- .../engagementDashboard/messages/MessagesSentSection.tsx | 8 ++++---- .../engagementDashboard/messages/useMessageOrigins.ts | 2 +- .../admin/engagementDashboard/messages/useMessagesSent.ts | 2 +- .../messages/useTopFivePopularChannels.ts | 2 +- .../engagementDashboard/users/ActiveUsersSection.tsx | 4 ++-- .../admin/engagementDashboard/users/NewUsersSection.tsx | 8 ++++---- .../users/UsersByTimeOfTheDaySection.tsx | 6 +++--- .../admin/engagementDashboard/users/useActiveUsers.ts | 2 +- .../views/admin/engagementDashboard/users/useNewUsers.ts | 2 +- .../engagementDashboard/users/useUsersByTimeOfTheDay.ts | 2 +- yarn.lock | 2 +- 22 files changed, 32 insertions(+), 34 deletions(-) rename apps/meteor/ee/client/views/admin/engagementDashboard/{data => dataView}/DownloadDataButton.tsx (91%) rename apps/meteor/ee/client/views/admin/engagementDashboard/{data => dataView}/LegendSymbol.stories.tsx (100%) rename apps/meteor/ee/client/views/admin/engagementDashboard/{data => dataView}/LegendSymbol.tsx (100%) rename apps/meteor/ee/client/views/admin/engagementDashboard/{data => dataView}/PeriodSelector.tsx (92%) rename apps/meteor/ee/client/views/admin/engagementDashboard/{data => dataView}/colors.ts (100%) rename apps/meteor/ee/client/views/admin/engagementDashboard/{data => dataView}/periods.ts (96%) rename apps/meteor/ee/client/views/admin/engagementDashboard/{data => dataView}/usePeriodLabel.ts (80%) rename apps/meteor/ee/client/views/admin/engagementDashboard/{data => dataView}/usePeriodSelectorState.ts (100%) diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx index a725dfcc4b8f..58605505ec1b 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx @@ -5,9 +5,9 @@ import React, { ReactElement, useMemo, useState } from 'react'; import Growth from '../../../../../../client/components/dataView/Growth'; import Section from '../Section'; -import DownloadDataButton from '../data/DownloadDataButton'; -import PeriodSelector from '../data/PeriodSelector'; -import { usePeriodSelectorState } from '../data/usePeriodSelectorState'; +import DownloadDataButton from '../dataView/DownloadDataButton'; +import PeriodSelector from '../dataView/PeriodSelector'; +import { usePeriodSelectorState } from '../dataView/usePeriodSelectorState'; import { useChannelsList } from './useChannelsList'; const ChannelsTab = (): ReactElement => { diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/useChannelsList.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/channels/useChannelsList.ts index 955f8834427c..21d1f0b575b0 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/useChannelsList.ts +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/channels/useChannelsList.ts @@ -1,7 +1,7 @@ import { useQuery } from 'react-query'; import { getFromRestApi } from '../../../../lib/getFromRestApi'; -import { getPeriodRange, Period } from '../data/periods'; +import { getPeriodRange, Period } from '../dataView/periods'; type UseChannelsListOptions = { period: Period['key']; diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/data/DownloadDataButton.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/DownloadDataButton.tsx similarity index 91% rename from apps/meteor/ee/client/views/admin/engagementDashboard/data/DownloadDataButton.tsx rename to apps/meteor/ee/client/views/admin/engagementDashboard/dataView/DownloadDataButton.tsx index 4c40a16f3da6..ee6ec34c9a6b 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/data/DownloadDataButton.tsx +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/DownloadDataButton.tsx @@ -1,8 +1,7 @@ import { Box, ActionButton } from '@rocket.chat/fuselage'; +import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts'; import React, { ComponentProps, ReactElement } from 'react'; -import { useToastMessageDispatch } from '@rocket.chat/ui-contexts'; -import { useTranslation } from '@rocket.chat/ui-contexts' import { downloadCsvAs } from '../../../../../../client/lib/download'; type RowFor = readonly unknown[] & { diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/data/LegendSymbol.stories.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/LegendSymbol.stories.tsx similarity index 100% rename from apps/meteor/ee/client/views/admin/engagementDashboard/data/LegendSymbol.stories.tsx rename to apps/meteor/ee/client/views/admin/engagementDashboard/dataView/LegendSymbol.stories.tsx diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/data/LegendSymbol.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/LegendSymbol.tsx similarity index 100% rename from apps/meteor/ee/client/views/admin/engagementDashboard/data/LegendSymbol.tsx rename to apps/meteor/ee/client/views/admin/engagementDashboard/dataView/LegendSymbol.tsx diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/data/PeriodSelector.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/PeriodSelector.tsx similarity index 92% rename from apps/meteor/ee/client/views/admin/engagementDashboard/data/PeriodSelector.tsx rename to apps/meteor/ee/client/views/admin/engagementDashboard/dataView/PeriodSelector.tsx index 46a39eb731f8..80447ad4ec31 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/data/PeriodSelector.tsx +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/PeriodSelector.tsx @@ -1,7 +1,7 @@ import { Select } from '@rocket.chat/fuselage'; +import { useTranslation } from '@rocket.chat/ui-contexts'; import React, { ReactElement, useMemo } from 'react'; -import { useTranslation } from '@rocket.chat/ui-contexts' import { getPeriod, Period } from './periods'; type PeriodSelectorProps = { diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/data/colors.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/colors.ts similarity index 100% rename from apps/meteor/ee/client/views/admin/engagementDashboard/data/colors.ts rename to apps/meteor/ee/client/views/admin/engagementDashboard/dataView/colors.ts diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/data/periods.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/periods.ts similarity index 96% rename from apps/meteor/ee/client/views/admin/engagementDashboard/data/periods.ts rename to apps/meteor/ee/client/views/admin/engagementDashboard/dataView/periods.ts index 62795208f4dd..f84856e75867 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/data/periods.ts +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/periods.ts @@ -1,7 +1,6 @@ +import { TranslationKey } from '@rocket.chat/ui-contexts'; import moment from 'moment'; -import { TranslationKey } from '@rocket.chat/ui-contexts' - const label = ( translationKey: TranslationKey, ...replacements: unknown[] diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/data/usePeriodLabel.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/usePeriodLabel.ts similarity index 80% rename from apps/meteor/ee/client/views/admin/engagementDashboard/data/usePeriodLabel.ts rename to apps/meteor/ee/client/views/admin/engagementDashboard/dataView/usePeriodLabel.ts index 3a544a33cfcd..837864479acf 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/data/usePeriodLabel.ts +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/usePeriodLabel.ts @@ -1,6 +1,6 @@ +import { useTranslation } from '@rocket.chat/ui-contexts'; import { useMemo } from 'react'; -import { useTranslation } from '@rocket.chat/ui-contexts' import { getPeriod, Period } from './periods'; export const usePeriodLabel = (period: Period['key']): string => { diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/data/usePeriodSelectorState.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/usePeriodSelectorState.ts similarity index 100% rename from apps/meteor/ee/client/views/admin/engagementDashboard/data/usePeriodSelectorState.ts rename to apps/meteor/ee/client/views/admin/engagementDashboard/dataView/usePeriodSelectorState.ts diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx index 2138bf5884aa..38eea9598efe 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx @@ -5,10 +5,10 @@ import { useTranslation } from '@rocket.chat/ui-contexts'; import React, { ReactElement, useMemo } from 'react'; import Section from '../Section'; -import DownloadDataButton from '../data/DownloadDataButton'; -import LegendSymbol from '../data/LegendSymbol'; -import PeriodSelector from '../data/PeriodSelector'; -import { usePeriodSelectorState } from '../data/usePeriodSelectorState'; +import DownloadDataButton from '../dataView/DownloadDataButton'; +import LegendSymbol from '../dataView/LegendSymbol'; +import PeriodSelector from '../dataView/PeriodSelector'; +import { usePeriodSelectorState } from '../dataView/usePeriodSelectorState'; import { useMessageOrigins } from './useMessageOrigins'; import { useTopFivePopularChannels } from './useTopFivePopularChannels'; diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx index 315da8a1692d..c49b69d8a5e5 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx @@ -7,10 +7,10 @@ import React, { ReactElement, useMemo } from 'react'; import CounterSet from '../../../../../../client/components/dataView/CounterSet'; import Section from '../Section'; -import DownloadDataButton from '../data/DownloadDataButton'; -import PeriodSelector from '../data/PeriodSelector'; -import { usePeriodLabel } from '../data/usePeriodLabel'; -import { usePeriodSelectorState } from '../data/usePeriodSelectorState'; +import DownloadDataButton from '../dataView/DownloadDataButton'; +import PeriodSelector from '../dataView/PeriodSelector'; +import { usePeriodLabel } from '../dataView/usePeriodLabel'; +import { usePeriodSelectorState } from '../dataView/usePeriodSelectorState'; import { useMessagesSent } from './useMessagesSent'; const MessagesSentSection = (): ReactElement => { diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts index edb5e9d0eb59..2e787c6df709 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts @@ -1,7 +1,7 @@ import { useQuery } from 'react-query'; import { getFromRestApi } from '../../../../lib/getFromRestApi'; -import { getPeriodRange, Period } from '../data/periods'; +import { getPeriodRange, Period } from '../dataView/periods'; type UseMessageOriginsOptions = { period: Period['key'] }; diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessagesSent.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessagesSent.ts index 6612109bcd43..539de3bde6ab 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessagesSent.ts +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessagesSent.ts @@ -1,7 +1,7 @@ import { useQuery } from 'react-query'; import { getFromRestApi } from '../../../../lib/getFromRestApi'; -import { getPeriodRange, Period } from '../data/periods'; +import { getPeriodRange, Period } from '../dataView/periods'; type UseMessagesSentOptions = { period: Period['key'] }; diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts index dbbc0f431f5d..fb74732c2076 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts @@ -1,7 +1,7 @@ import { useQuery } from 'react-query'; import { getFromRestApi } from '../../../../lib/getFromRestApi'; -import { getPeriodRange, Period } from '../data/periods'; +import { getPeriodRange, Period } from '../dataView/periods'; type UseTopFivePopularChannelsOptions = { period: Period['key'] }; diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx index 5a7d867a4caf..c5ad784a2bd3 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx @@ -8,8 +8,8 @@ import React, { ReactElement, useMemo } from 'react'; import CounterSet from '../../../../../../client/components/dataView/CounterSet'; import { useFormatDate } from '../../../../../../client/hooks/useFormatDate'; import Section from '../Section'; -import DownloadDataButton from '../data/DownloadDataButton'; -import LegendSymbol from '../data/LegendSymbol'; +import DownloadDataButton from '../dataView/DownloadDataButton'; +import LegendSymbol from '../dataView/LegendSymbol'; import { useActiveUsers } from './useActiveUsers'; type ActiveUsersSectionProps = { diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/NewUsersSection.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/users/NewUsersSection.tsx index 9871fd46f910..926c5f861f8d 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/NewUsersSection.tsx +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/NewUsersSection.tsx @@ -9,10 +9,10 @@ import React, { ReactElement, useMemo } from 'react'; import CounterSet from '../../../../../../client/components/dataView/CounterSet'; import { useFormatDate } from '../../../../../../client/hooks/useFormatDate'; import Section from '../Section'; -import DownloadDataButton from '../data/DownloadDataButton'; -import PeriodSelector from '../data/PeriodSelector'; -import { usePeriodLabel } from '../data/usePeriodLabel'; -import { usePeriodSelectorState } from '../data/usePeriodSelectorState'; +import DownloadDataButton from '../dataView/DownloadDataButton'; +import PeriodSelector from '../dataView/PeriodSelector'; +import { usePeriodLabel } from '../dataView/usePeriodLabel'; +import { usePeriodSelectorState } from '../dataView/usePeriodSelectorState'; import { useNewUsers } from './useNewUsers'; const TICK_WIDTH = 45; diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx index cd800ac1fe4b..dff93b43dee8 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx @@ -6,9 +6,9 @@ import moment from 'moment'; import React, { ReactElement, useMemo } from 'react'; import Section from '../Section'; -import DownloadDataButton from '../data/DownloadDataButton'; -import PeriodSelector from '../data/PeriodSelector'; -import { usePeriodSelectorState } from '../data/usePeriodSelectorState'; +import DownloadDataButton from '../dataView/DownloadDataButton'; +import PeriodSelector from '../dataView/PeriodSelector'; +import { usePeriodSelectorState } from '../dataView/usePeriodSelectorState'; import { useUsersByTimeOfTheDay } from './useUsersByTimeOfTheDay'; type UsersByTimeOfTheDaySectionProps = { diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useActiveUsers.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/users/useActiveUsers.ts index 17bc28f4d8f0..a20a389e896d 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useActiveUsers.ts +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/useActiveUsers.ts @@ -2,7 +2,7 @@ import moment from 'moment'; import { useQuery } from 'react-query'; import { getFromRestApi } from '../../../../lib/getFromRestApi'; -import { getPeriodRange } from '../data/periods'; +import { getPeriodRange } from '../dataView/periods'; type UseActiveUsersOptions = { utc: boolean }; diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useNewUsers.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/users/useNewUsers.ts index 4fcbe5afb250..9a8cd65363b5 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useNewUsers.ts +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/useNewUsers.ts @@ -1,7 +1,7 @@ import { useQuery } from 'react-query'; import { getFromRestApi } from '../../../../lib/getFromRestApi'; -import { getPeriodRange, Period } from '../data/periods'; +import { getPeriodRange, Period } from '../dataView/periods'; type UseNewUsersOptions = { period: Period['key']; utc: boolean }; diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts index f3a9d5f64247..d2d3dc3c2e83 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts @@ -1,7 +1,7 @@ import { useQuery } from 'react-query'; import { getFromRestApi } from '../../../../lib/getFromRestApi'; -import { getPeriodRange, Period } from '../data/periods'; +import { getPeriodRange, Period } from '../dataView/periods'; type UseUsersByTimeOfTheDayOptions = { period: Period['key']; utc: boolean }; diff --git a/yarn.lock b/yarn.lock index 63cd87e1fd09..48978808ce2e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8607,7 +8607,7 @@ __metadata: human-interval: ~1.0.0 moment-timezone: ~0.5.27 mongodb: ~3.5.0 - checksum: acb4ebb7e7356f6e53e810d821eb6aa3d88bbfb9e85183e707517bee6d1eea1f189f38bdf0dd2b91360492ab7643134d510c320d2523d86596498ab98e59735b + checksum: f5f68008298f9482631f1f494e392cd6b8ba7971a3b0ece81ae2abe60f53d67973ff4476156fa5c9c41b8b58c4ccd284e95c545e0523996dfd05f9a80b843e07 languageName: node linkType: hard