Skip to content
Snippets Groups Projects
Unverified Commit 8eaaafd0 authored by Douglas Fabris's avatar Douglas Fabris Committed by GitHub
Browse files

chore: Deprecate `cloud:checkRegisterStatus` method (#29853)

parent 6f820d5f
No related branches found
No related tags found
No related merge requests found
...@@ -40,6 +40,10 @@ declare module '@rocket.chat/ui-contexts' { ...@@ -40,6 +40,10 @@ declare module '@rocket.chat/ui-contexts' {
} }
Meteor.methods<ServerMethods>({ Meteor.methods<ServerMethods>({
/**
* @deprecated this method is deprecated and will be removed soon.
* Prefer using cloud.registrationStatus rest api.
*/
async 'cloud:checkRegisterStatus'() { async 'cloud:checkRegisterStatus'() {
const uid = Meteor.userId(); const uid = Meteor.userId();
......
...@@ -65,11 +65,6 @@ export const useAdministrationItems = (): GenericMenuItemProps[] => { ...@@ -65,11 +65,6 @@ export const useAdministrationItems = (): GenericMenuItemProps[] => {
const isAdmin = useRole('admin'); const isAdmin = useRole('admin');
const setModal = useSetModal(); const setModal = useSetModal();
// TODO: DEPRECATE IT
// const checkCloudRegisterStatus = useMethod('cloud:checkRegisterStatus');
// const result = useQuery(['admin/cloud/register-status'], async () => checkCloudRegisterStatus());
// const { workspaceRegistered } = result.data || {};
const { data: registrationStatusData } = useRegistrationStatus(); const { data: registrationStatusData } = useRegistrationStatus();
const workspaceRegistered = registrationStatusData?.registrationStatus?.workspaceRegistered ?? false; const workspaceRegistered = registrationStatusData?.registrationStatus?.workspaceRegistered ?? false;
......
...@@ -71,7 +71,9 @@ Meteor.startup(() => { ...@@ -71,7 +71,9 @@ Meteor.startup(() => {
return; return;
} }
const { connectToCloud, workspaceRegistered } = await sdk.call('cloud:checkRegisterStatus'); const {
registrationStatus: { connectToCloud, workspaceRegistered },
} = await sdk.rest.get('/v1/cloud.registrationStatus');
c.stop(); c.stop();
if (connectToCloud === true && workspaceRegistered !== true) { if (connectToCloud === true && workspaceRegistered !== true) {
......
import { Box, Tag } from '@rocket.chat/fuselage'; import { Box, Tag } from '@rocket.chat/fuselage';
import { useMutableCallback } from '@rocket.chat/fuselage-hooks'; import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
import { useSetModal, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
import { useQuery } from '@tanstack/react-query';
import React from 'react'; import React from 'react';
import Page from '../../../components/Page'; import Page from '../../../components/Page';
import { useRegistrationStatus } from '../../../hooks/useRegistrationStatus';
import ManualWorkspaceRegistrationModal from './ManualWorkspaceRegistrationModal'; import ManualWorkspaceRegistrationModal from './ManualWorkspaceRegistrationModal';
import RegisterWorkspaceCards from './components/RegisterWorkspaceCards'; import RegisterWorkspaceCards from './components/RegisterWorkspaceCards';
import RegisterWorkspaceMenu from './components/RegisterWorkspaceMenu'; import RegisterWorkspaceMenu from './components/RegisterWorkspaceMenu';
...@@ -15,30 +14,28 @@ const RegisterWorkspace = () => { ...@@ -15,30 +14,28 @@ const RegisterWorkspace = () => {
const t = useTranslation(); const t = useTranslation();
const setModal = useSetModal(); const setModal = useSetModal();
const checkCloudRegisterStatus = useMethod('cloud:checkRegisterStatus'); const { data: registrationStatusData, isLoading, isError, refetch } = useRegistrationStatus();
const result = useQuery(['admin/cloud/register-status'], async () => checkCloudRegisterStatus()); const isWorkspaceRegistered = registrationStatusData?.registrationStatus?.workspaceRegistered ?? false;
const reload = useMutableCallback(() => result.refetch()); const isConnectedToCloud = registrationStatusData?.registrationStatus?.connectToCloud ?? false;
if (result.isLoading || result.isError) { if (isLoading || isError) {
return null; return null;
} }
const { connectToCloud: isConnectedToCloud, workspaceRegistered: isWorkspaceRegistered } = result.data;
const handleRegisterWorkspaceClick = (): void => { const handleRegisterWorkspaceClick = (): void => {
const handleModalClose = (): void => { const handleModalClose = (): void => {
setModal(null); setModal(null);
reload(); refetch();
}; };
if (isWorkspaceRegistered) { if (isWorkspaceRegistered) {
setModal(<ConnectWorkspaceModal onClose={handleModalClose} onStatusChange={reload} />); setModal(<ConnectWorkspaceModal onClose={handleModalClose} onStatusChange={refetch} />);
} else setModal(<RegisterWorkspaceModal onClose={handleModalClose} onStatusChange={reload} />); } else setModal(<RegisterWorkspaceModal onClose={handleModalClose} onStatusChange={refetch} />);
}; };
const handleManualWorkspaceRegistrationButton = (): void => { const handleManualWorkspaceRegistrationButton = (): void => {
const handleModalClose = (): void => { const handleModalClose = (): void => {
setModal(null); setModal(null);
reload(); refetch();
}; };
setModal(<ManualWorkspaceRegistrationModal onClose={handleModalClose} />); setModal(<ManualWorkspaceRegistrationModal onClose={handleModalClose} />);
}; };
...@@ -70,7 +67,7 @@ const RegisterWorkspace = () => { ...@@ -70,7 +67,7 @@ const RegisterWorkspace = () => {
isWorkspaceRegistered={isWorkspaceRegistered} isWorkspaceRegistered={isWorkspaceRegistered}
isConnectedToCloud={isConnectedToCloud} isConnectedToCloud={isConnectedToCloud}
onClick={handleRegisterWorkspaceClick} onClick={handleRegisterWorkspaceClick}
onStatusChange={reload} onStatusChange={refetch}
onClickOfflineRegistration={handleManualWorkspaceRegistrationButton} onClickOfflineRegistration={handleManualWorkspaceRegistrationButton}
/> />
</Page.Header> </Page.Header>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment