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

pull/29858/head
Douglas Fabris 3 years ago committed by GitHub
parent 6f820d5fc0
commit 8eaaafd0be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      apps/meteor/app/cloud/server/methods.ts
  2. 5
      apps/meteor/client/sidebar/header/actions/hooks/useAdministrationItems.tsx
  3. 4
      apps/meteor/client/startup/startup.ts
  4. 25
      apps/meteor/client/views/admin/cloud/RegisterWorkspace.tsx

@ -40,6 +40,10 @@ declare module '@rocket.chat/ui-contexts' {
}
Meteor.methods<ServerMethods>({
/**
* @deprecated this method is deprecated and will be removed soon.
* Prefer using cloud.registrationStatus rest api.
*/
async 'cloud:checkRegisterStatus'() {
const uid = Meteor.userId();

@ -65,11 +65,6 @@ export const useAdministrationItems = (): GenericMenuItemProps[] => {
const isAdmin = useRole('admin');
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 workspaceRegistered = registrationStatusData?.registrationStatus?.workspaceRegistered ?? false;

@ -71,7 +71,9 @@ Meteor.startup(() => {
return;
}
const { connectToCloud, workspaceRegistered } = await sdk.call('cloud:checkRegisterStatus');
const {
registrationStatus: { connectToCloud, workspaceRegistered },
} = await sdk.rest.get('/v1/cloud.registrationStatus');
c.stop();
if (connectToCloud === true && workspaceRegistered !== true) {

@ -1,10 +1,9 @@
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 { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
import React from 'react';
import Page from '../../../components/Page';
import { useRegistrationStatus } from '../../../hooks/useRegistrationStatus';
import ManualWorkspaceRegistrationModal from './ManualWorkspaceRegistrationModal';
import RegisterWorkspaceCards from './components/RegisterWorkspaceCards';
import RegisterWorkspaceMenu from './components/RegisterWorkspaceMenu';
@ -15,30 +14,28 @@ const RegisterWorkspace = () => {
const t = useTranslation();
const setModal = useSetModal();
const checkCloudRegisterStatus = useMethod('cloud:checkRegisterStatus');
const result = useQuery(['admin/cloud/register-status'], async () => checkCloudRegisterStatus());
const reload = useMutableCallback(() => result.refetch());
const { data: registrationStatusData, isLoading, isError, refetch } = useRegistrationStatus();
const isWorkspaceRegistered = registrationStatusData?.registrationStatus?.workspaceRegistered ?? false;
const isConnectedToCloud = registrationStatusData?.registrationStatus?.connectToCloud ?? false;
if (result.isLoading || result.isError) {
if (isLoading || isError) {
return null;
}
const { connectToCloud: isConnectedToCloud, workspaceRegistered: isWorkspaceRegistered } = result.data;
const handleRegisterWorkspaceClick = (): void => {
const handleModalClose = (): void => {
setModal(null);
reload();
refetch();
};
if (isWorkspaceRegistered) {
setModal(<ConnectWorkspaceModal onClose={handleModalClose} onStatusChange={reload} />);
} else setModal(<RegisterWorkspaceModal onClose={handleModalClose} onStatusChange={reload} />);
setModal(<ConnectWorkspaceModal onClose={handleModalClose} onStatusChange={refetch} />);
} else setModal(<RegisterWorkspaceModal onClose={handleModalClose} onStatusChange={refetch} />);
};
const handleManualWorkspaceRegistrationButton = (): void => {
const handleModalClose = (): void => {
setModal(null);
reload();
refetch();
};
setModal(<ManualWorkspaceRegistrationModal onClose={handleModalClose} />);
};
@ -70,7 +67,7 @@ const RegisterWorkspace = () => {
isWorkspaceRegistered={isWorkspaceRegistered}
isConnectedToCloud={isConnectedToCloud}
onClick={handleRegisterWorkspaceClick}
onStatusChange={reload}
onStatusChange={refetch}
onClickOfflineRegistration={handleManualWorkspaceRegistrationButton}
/>
</Page.Header>

Loading…
Cancel
Save