Skip to content

chore: Change Records page name to Reports #30513

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

Merged
kodiakhq merged 5 commits into from
Oct 9, 2023
Merged

chore: Change Records page name to Reports #30513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61b0ad7
refactor: :recycle: Change Records page name to Reports
rique223 Sep 27, 2023
bcf26bb
Merge branch 'develop' into refactor/records-page-reports
rique223 Sep 27, 2023
cb593f3
Merge branch 'develop' into refactor/records-page-reports
kodiakhq[bot] Sep 28, 2023
3e339f5
Merge branch 'develop' into refactor/records-page-reports
hugocostadev Sep 29, 2023
3e0f619
Merge branch 'develop' into refactor/records-page-reports
kodiakhq[bot] Oct 9, 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
6 changes: 3 additions & 3 deletions apps/meteor/client/views/admin/routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ declare module '@rocket.chat/ui-contexts' {
pattern: '/admin/registration/:page?';
};
'admin-view-logs': {
pathname: '/admin/records';
pattern: '/admin/records';
pathname: '/admin/reports';
pattern: '/admin/reports';
};
'federation-dashboard': {
pathname: '/admin/federation';
Expand Down Expand Up @@ -193,7 +193,7 @@ registerAdminRoute('/registration/:page?', {
component: lazy(() => import('./cloud/CloudRoute')),
});

registerAdminRoute('/records', {
registerAdminRoute('/reports', {
name: 'admin-view-logs',
component: lazy(() => import('./viewLogs/ViewLogsRoute')),
});
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/client/views/admin/sidebarItems.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ export const {
permissionGranted: (): boolean => hasPermission('run-import'),
},
{
href: '/admin/records',
i18nLabel: 'Records',
href: '/admin/reports',
i18nLabel: 'Reports',
icon: 'post',
permissionGranted: (): boolean => hasPermission('view-logs'),
},
Expand Down
5 changes: 4 additions & 1 deletion apps/meteor/client/views/admin/viewLogs/AnalyticsReports.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ const AnalyticsReports = () => {
</Box>
<Box fontScale='h4'>{t('How_and_why_we_collect_usage_data')}</Box>
</Box>
<Box fontScale='p1'>{t('Analytics_page_briefing')}</Box>
<Box fontScale='p1' mbe={16}>
{t('Analytics_page_briefing_first_paragraph')}
</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>}
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const ViewLogsPage = (): ReactElement => {

return (
<Page>
<Page.Header title={t('Records')} />
<Page.Header title={t('Reports')} />
<Page.Content>
<Tabs mbe={24}>
<Tabs.Item onClick={() => setTab('Logs')} selected={tab === 'Logs'}>
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,8 @@
"Analytics_features_users_Description": "Tracks custom events related to actions related to users (password reset times, profile picture change, etc).",
"Analytics_Google": "Google Analytics",
"Analytics_Google_id": "Tracking ID",
"Analytics_page_briefing": "Rocket.Chat collects anonymous usage data to identify how many instances are deployed and to improve the product for all users. We take your privacy seriously, so the usage data is encrypted and stored securely.",
"Analytics_page_briefing_first_paragraph": "Rocket.Chat collects anonymous usage data, such as feature usage and session lengths, to improve the product for everyone.",
"Analytics_page_briefing_second_paragraph": "We protect your privacy by never collecting personal or sensitive data. This section shows what is collected, reinforcing our commitment to transparency and trust.",
"Analyze_practical_usage": "Analyze practical usage statistics about users, messages and channels",
"and": "and",
"And_more": "And {{length}} more",
Expand Down Expand Up @@ -2484,7 +2485,7 @@
"Hospitality_Businness": "Hospitality Business",
"hours": "hours",
"Hours": "Hours",
"How_and_why_we_collect_usage_data": "How and why we collect usage data",
"How_and_why_we_collect_usage_data": "How and why usage data is collected",
"How_friendly_was_the_chat_agent": "How friendly was the chat agent?",
"How_knowledgeable_was_the_chat_agent": "How knowledgeable was the chat agent?",
"How_long_to_wait_after_agent_goes_offline": "How Long to Wait After Agent Goes Offline",
Expand Down Expand Up @@ -4182,7 +4183,6 @@
"Receive_Login_Detection_Emails_Description": "Receive an email each time a new login is detected on your account.",
"Recent_Import_History": "Recent Import History",
"Record": "Record",
"Records": "Records",
"recording": "recording",
"Redirect_URI": "Redirect URI",
"Redirect_URL_does_not_match": "Redirect URL does not match",
Expand Down