Regression: Broken components on Federation and Engagement dashboards (…

…#25653) * Fix odd typechecking issues with JSON modules * Avoid `data` as directory for modules * rename other `data` folder Co-authored-by: gabriellsh <gabriel.henriques@rocket.chat>
RocketChat · May 30, 2022 · e9e10da · e9e10da
1 parent 9302ea7
commit e9e10da
Show file tree

Hide file tree

Showing 33 changed files with 39 additions and 39 deletions.
diff --git a/...lient/components/data/Counter.stories.tsx → ...t/components/dataView/Counter.stories.tsx b/...lient/components/data/Counter.stories.tsx → ...t/components/dataView/Counter.stories.tsx
diff --git a/...meteor/client/components/data/Counter.tsx → ...or/client/components/dataView/Counter.tsx b/...meteor/client/components/data/Counter.tsx → ...or/client/components/dataView/Counter.tsx
diff --git a/...nt/components/data/CounterSet.stories.tsx → ...omponents/dataView/CounterSet.stories.tsx b/...nt/components/data/CounterSet.stories.tsx → ...omponents/dataView/CounterSet.stories.tsx
diff --git a/...eor/client/components/data/CounterSet.tsx → ...client/components/dataView/CounterSet.tsx b/...eor/client/components/data/CounterSet.tsx → ...client/components/dataView/CounterSet.tsx
diff --git a/...client/components/data/Growth.stories.tsx → ...nt/components/dataView/Growth.stories.tsx b/...client/components/data/Growth.stories.tsx → ...nt/components/dataView/Growth.stories.tsx
diff --git a/.../meteor/client/components/data/Growth.tsx → ...eor/client/components/dataView/Growth.tsx b/.../meteor/client/components/data/Growth.tsx → ...eor/client/components/dataView/Growth.tsx
diff --git a/...nts/data/NegativeGrowthSymbol.stories.tsx → ...dataView/NegativeGrowthSymbol.stories.tsx b/...nts/data/NegativeGrowthSymbol.stories.tsx → ...dataView/NegativeGrowthSymbol.stories.tsx
diff --git a/.../components/data/NegativeGrowthSymbol.tsx → ...ponents/dataView/NegativeGrowthSymbol.tsx b/.../components/data/NegativeGrowthSymbol.tsx → ...ponents/dataView/NegativeGrowthSymbol.tsx
diff --git a/...nts/data/PositiveGrowthSymbol.stories.tsx → ...dataView/PositiveGrowthSymbol.stories.tsx b/...nts/data/PositiveGrowthSymbol.stories.tsx → ...dataView/PositiveGrowthSymbol.stories.tsx
diff --git a/.../components/data/PositiveGrowthSymbol.tsx → ...ponents/dataView/PositiveGrowthSymbol.tsx b/.../components/data/PositiveGrowthSymbol.tsx → ...ponents/dataView/PositiveGrowthSymbol.tsx
diff --git 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
@@ -3,11 +3,11 @@ 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';
-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
@@ -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/...mentDashboard/data/DownloadDataButton.tsx → ...Dashboard/dataView/DownloadDataButton.tsx b/...mentDashboard/data/DownloadDataButton.tsx → ...Dashboard/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<THeaders extends readonly string[]> = readonly unknown[] & {

diff --git a/...ntDashboard/data/LegendSymbol.stories.tsx → ...shboard/dataView/LegendSymbol.stories.tsx b/...ntDashboard/data/LegendSymbol.stories.tsx → ...shboard/dataView/LegendSymbol.stories.tsx
diff --git a/...engagementDashboard/data/LegendSymbol.tsx → ...gementDashboard/dataView/LegendSymbol.tsx b/...engagementDashboard/data/LegendSymbol.tsx → ...gementDashboard/dataView/LegendSymbol.tsx
diff --git a/...gagementDashboard/data/PeriodSelector.tsx → ...mentDashboard/dataView/PeriodSelector.tsx b/...gagementDashboard/data/PeriodSelector.tsx → ...mentDashboard/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<TPeriod extends Period['key']> = {

diff --git a/.../admin/engagementDashboard/data/colors.ts → ...in/engagementDashboard/dataView/colors.ts b/.../admin/engagementDashboard/data/colors.ts → ...in/engagementDashboard/dataView/colors.ts
diff --git a/...admin/engagementDashboard/data/periods.ts → ...n/engagementDashboard/dataView/periods.ts b/...admin/engagementDashboard/data/periods.ts → ...n/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/...ngagementDashboard/data/usePeriodLabel.ts → ...ementDashboard/dataView/usePeriodLabel.ts b/...ngagementDashboard/data/usePeriodLabel.ts → ...ementDashboard/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/...tDashboard/data/usePeriodSelectorState.ts → ...hboard/dataView/usePeriodSelectorState.ts b/...tDashboard/data/usePeriodSelectorState.ts → ...hboard/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
@@ -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
@@ -5,12 +5,12 @@ 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';
-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
@@ -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
@@ -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
@@ -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
@@ -5,11 +5,11 @@ 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';
-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
@@ -6,13 +6,13 @@ 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';
-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
@@ -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
@@ -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
@@ -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
@@ -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/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/**/*"]
 }