Skip to content

chore: CloudRoute to typescript #29762

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
ggazzo merged 2 commits into from
Jul 7, 2023
Merged

chore: CloudRoute to typescript #29762

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
a59fc27
chore: `CloudRoute` to ts
dougfabris Jul 7, 2023
c1565db
chore: oops
dougfabris Jul 7, 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
2 changes: 1 addition & 1 deletion apps/meteor/app/emoji/client/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ export const updateRecent = (recentList: string[]) => {
const getEmojiRender = (emojiName: string) => {
const emojiPackageName = emoji.list[emojiName]?.emojiPackage;
const emojiPackage = emoji.packages[emojiPackageName];
return emojiPackage.render(emojiName);
return emojiPackage?.render(emojiName);
};

export const getFrequentEmoji = (frequentEmoji: string[]) => {
Expand Down
1 change: 1 addition & 0 deletions apps/meteor/client/lib/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export const USER_STATUS_TEXT_MAX_LENGTH = 120;
export const BIO_TEXT_MAX_LENGTH = 260;
export const VIDEOCONF_STACK_MAX_USERS = 6;
export const CLOUD_CONSOLE_URL = 'https://cloud.rocket.chat';
4 changes: 2 additions & 2 deletions ...or/client/views/admin/cloud/CloudRoute.js → ...r/client/views/admin/cloud/CloudRoute.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import React from 'react';
import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
import RegisterWorkspace from './RegisterWorkspace';

function CloudRoute() {
const CloudRoute = () => {
const canManageCloud = usePermission('manage-cloud');

if (!canManageCloud) {
return <NotAuthorizedPage />;
}

return <RegisterWorkspace />;
}
};

export default CloudRoute;
4 changes: 2 additions & 2 deletions apps/meteor/client/views/admin/cloud/CopyStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { FC } from 'react';
import React, { useEffect, useState, useRef } from 'react';

import MarkdownText from '../../../components/MarkdownText';
import { cloudConsoleUrl } from './constants';
import { CLOUD_CONSOLE_URL } from '../../../lib/constants';

type CopyStepProps = {
onNextButtonClick: () => void;
Expand Down Expand Up @@ -61,7 +61,7 @@ const CopyStep: FC<CopyStepProps> = ({ onNextButtonClick }) => {
<Icon name='copy' /> {t('Copy')}
</Button>
</Box>
<MarkdownText preserveHtml={true} content={t('Cloud_click_here', { cloudConsoleUrl })} />
<MarkdownText preserveHtml={true} content={t('Cloud_click_here', { CLOUD_CONSOLE_URL })} />
</Modal.Content>
<Modal.Footer>
<Modal.FooterControllers>
Expand Down
3 changes: 1 addition & 2 deletions apps/meteor/client/views/admin/cloud/RegisterWorkspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Box, Tag } from '@rocket.chat/fuselage';
import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
import { useSetModal, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
import { useQuery } from '@tanstack/react-query';
import type { ReactNode } from 'react';
import React from 'react';

import Page from '../../../components/Page';
Expand All @@ -12,7 +11,7 @@ import RegisterWorkspaceMenu from './components/RegisterWorkspaceMenu';
import ConnectWorkspaceModal from './modals/ConnectWorkspaceModal';
import RegisterWorkspaceModal from './modals/RegisterWorkspaceModal';

const RegisterWorkspace = (): ReactNode => {
const RegisterWorkspace = () => {
const t = useTranslation();
const setModal = useSetModal();

Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/client/views/admin/cloud/components/RegisterWorkspaceMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
import React from 'react';

import { useExternalLink } from '../../../../hooks/useExternalLink';
import { cloudConsoleUrl } from '../constants';
import { CLOUD_CONSOLE_URL } from '../../../../lib/constants';
import RegisteredWorkspaceModal from '../modals/RegisteredWorkspaceModal';

type RegisterWorkspaceMenuProps = {
Expand Down Expand Up @@ -35,7 +35,7 @@ const RegisterWorkspaceMenu = ({
<ButtonGroup>
{isWorkspaceRegistered && isConnectedToCloud && (
<>
<Button role='link' onClick={() => handleLinkClick(cloudConsoleUrl)}>
<Button role='link' onClick={() => handleLinkClick(CLOUD_CONSOLE_URL)}>
<Icon name='new-window' size='x20' pie={4} />
{t('Cloud')}
</Button>
Expand Down
1 change: 0 additions & 1 deletion apps/meteor/client/views/admin/cloud/constants.js
View file
Open in desktop

This file was deleted.