Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Regression: Broken components on Federation and Engagement dashboards #25653

Merged
merged 3 commits into from
May 30, 2022
Merged

Regression: Broken components on Federation and Engagement dashboards #25653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f99a16b
Fix odd typechecking issues with JSON modules
tassoevan May 27, 2022
f07fd78
Avoid `data` as directory for modules
tassoevan May 27, 2022
0327029
rename other `data` folder
gabriellsh May 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...lient/components/data/Counter.stories.tsx → ...t/components/dataView/Counter.stories.tsx
View file
Open in desktop
File renamed without changes.
0 ...meteor/client/components/data/Counter.tsx → ...or/client/components/dataView/Counter.tsx
View file
Open in desktop
File renamed without changes.
0 ...nt/components/data/CounterSet.stories.tsx → ...omponents/dataView/CounterSet.stories.tsx
View file
Open in desktop
File renamed without changes.
0 ...eor/client/components/data/CounterSet.tsx → ...client/components/dataView/CounterSet.tsx
View file
Open in desktop
File renamed without changes.
0 ...client/components/data/Growth.stories.tsx → ...nt/components/dataView/Growth.stories.tsx
View file
Open in desktop
File renamed without changes.
0 .../meteor/client/components/data/Growth.tsx → ...eor/client/components/dataView/Growth.tsx
View file
Open in desktop
File renamed without changes.
0 ...nts/data/NegativeGrowthSymbol.stories.tsx → ...dataView/NegativeGrowthSymbol.stories.tsx
View file
Open in desktop
File renamed without changes.
0 .../components/data/NegativeGrowthSymbol.tsx → ...ponents/dataView/NegativeGrowthSymbol.tsx
View file
Open in desktop
File renamed without changes.
0 ...nts/data/PositiveGrowthSymbol.stories.tsx → ...dataView/PositiveGrowthSymbol.stories.tsx
View file
Open in desktop
File renamed without changes.
0 .../components/data/PositiveGrowthSymbol.tsx → ...ponents/dataView/PositiveGrowthSymbol.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/federationDashboard/OverviewSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
8 changes: 4 additions & 4 deletions apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/client/views/admin/engagementDashboard/channels/useChannelsList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'];
Expand Down
3 changes: 1 addition & 2 deletions ...mentDashboard/data/DownloadDataButton.tsx → ...Dashboard/dataView/DownloadDataButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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[] & {
Expand Down
0 ...ntDashboard/data/LegendSymbol.stories.tsx → ...shboard/dataView/LegendSymbol.stories.tsx
View file
Open in desktop
File renamed without changes.
0 ...engagementDashboard/data/LegendSymbol.tsx → ...gementDashboard/dataView/LegendSymbol.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...gagementDashboard/data/PeriodSelector.tsx → ...mentDashboard/dataView/PeriodSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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']> = {
Expand Down
0 .../admin/engagementDashboard/data/colors.ts → ...in/engagementDashboard/dataView/colors.ts
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions ...admin/engagementDashboard/data/periods.ts → ...n/engagementDashboard/dataView/periods.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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[]
Expand Down
2 changes: 1 addition & 1 deletion ...ngagementDashboard/data/usePeriodLabel.ts → ...ementDashboard/dataView/usePeriodLabel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 => {
Expand Down
0 ...tDashboard/data/usePeriodSelectorState.ts → ...hboard/dataView/usePeriodSelectorState.ts
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
10 changes: 5 additions & 5 deletions apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'] };

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessagesSent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'] };

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'] };

Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
10 changes: 5 additions & 5 deletions apps/meteor/ee/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/client/views/admin/engagementDashboard/users/useActiveUsers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 };

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/client/views/admin/engagementDashboard/users/useNewUsers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 };

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 };

Expand Down
4 changes: 3 additions & 1 deletion packages/ui-contexts/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./dist"
"outDir": "./dist",
"resolveJsonModule": true,
"esModuleInterop": true,
},
"include": ["./src/**/*"]
}