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

chore: AnalyticsReports visual adequacy #30617

Merged
merged 2 commits into from
Oct 11, 2023
Merged

chore: AnalyticsReports visual adequacy #30617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8672f9c
chore: design issues
dougfabris Oct 10, 2023
e5434d3
Merge branch 'develop' into chore/reportsPage-misaligned
rique223 Oct 11, 2023
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
27 changes: 12 additions & 15 deletions apps/meteor/client/views/admin/viewLogs/AnalyticsReports.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Box, Icon, Skeleton } from '@rocket.chat/fuselage';
import { Box, Icon, Skeleton, Scrollable } from '@rocket.chat/fuselage';
import { useTranslation } from '@rocket.chat/ui-contexts';
import React from 'react';

Expand All @@ -10,8 +10,8 @@ const AnalyticsReports = () => {
const { data, isLoading, isSuccess, isError } = useAnalyticsObject();

return (
<>
<Box p={20} pbe={28} mbe={24}>
<Box display='flex' flexDirection='column' overflow='hidden' height='100%'>
<Box backgroundColor='light' p={20} pbe={28} mbe={16} borderRadius={4}>
<Box display='flex' flexDirection='row' alignItems='center' mbe={20}>
<Box display='flex' justifyContent='center' alignItems='center' borderRadius={2} p={4} mie={8} bg='status-background-info'>
<Icon name='info' size={20} color='info' />
Expand All @@ -23,18 +23,15 @@ const AnalyticsReports = () => {
</Box>
<Box fontScale='p1'>{t('Analytics_page_briefing_second_paragraph')}</Box>
</Box>
<Box display='flex' flexDirection='column' padding={8} flexGrow={1} color='default' bg='neutral' borderRadius={4} overflow='scroll'>
{isSuccess && <pre>{JSON.stringify(data, null, '\t')}</pre>}
{isError && t('Something_went_wrong_try_again_later')}
{isLoading && (
<>
<Skeleton />
<Skeleton />
<Skeleton />
</>
)}
</Box>
</>
<Scrollable vertical>
<Box mbe={8} padding={8} bg='neutral' borderRadius={4} height='100%'>
{isSuccess && <pre>{JSON.stringify(data, null, '\t')}</pre>}
{isError && t('Something_went_wrong_try_again_later')}
{isLoading && Array.from({ length: 10 }).map((_, index) => <Skeleton key={index} />)}
<></>
</Box>
</Scrollable>
</Box>
);
};

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/viewLogs/ServerLogs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ const ServerLogs = (): ReactElement => {
}, [sendToBottomIfNecessary]);

return (
<Box width='full' height='full' overflow='hidden' position='relative' display='flex' marginBlock={8}>
<Box width='full' height='full' overflow='hidden' position='relative' display='flex' mbe={8}>
<Scrollable vertical>
<Box
ref={wrapperRef}
Expand Down
13 changes: 6 additions & 7 deletions apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Tabs } from '@rocket.chat/fuselage';
import { Margins, Tabs } from '@rocket.chat/fuselage';
import { useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import React, { useState } from 'react';
Expand All @@ -9,23 +9,22 @@ import ServerLogs from './ServerLogs';

const ViewLogsPage = (): ReactElement => {
const t = useTranslation();

const [tab, setTab] = useState('Logs');

return (
<Page>
<Page background='tint'>
<Page.Header title={t('Reports')} />
<Page.Content>
<Tabs mbe={24}>
<Margins blockEnd={24}>
<Tabs>
<Tabs.Item onClick={() => setTab('Logs')} selected={tab === 'Logs'}>
{t('Logs')}
</Tabs.Item>
<Tabs.Item onClick={() => setTab('Analytics')} selected={tab === 'Analytics'}>
{t('Analytic_reports')}
</Tabs.Item>
</Tabs>
{tab === 'Logs' ? <ServerLogs /> : <AnalyticsReports />}
</Page.Content>
</Margins>
<Page.Content>{tab === 'Logs' ? <ServerLogs /> : <AnalyticsReports />}</Page.Content>
</Page>
);
};
Expand Down
Loading