Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 0 deletions .changeset/ninety-rocks-hope.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/rest-typings": patch
---

Adds deprecation warning on `livechat:removeAllClosedRooms` with new endpoint replacing it; `livechat/rooms.removeAllClosedRooms`
48 changes: 46 additions & 2 deletions apps/meteor/app/livechat/server/api/v1/room.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
import { Omnichannel } from '@rocket.chat/core-services';
import type { ILivechatAgent, IOmnichannelInquiryExtraData, IUser, SelectedAgent, TransferByData } from '@rocket.chat/core-typings';
import type {
ILivechatAgent,
IOmnichannelInquiryExtraData,
IOmnichannelRoom,
IUser,
SelectedAgent,
TransferByData,
} from '@rocket.chat/core-typings';
import { isOmnichannelRoom, OmnichannelSourceType } from '@rocket.chat/core-typings';
import { LivechatVisitors, Users, LivechatRooms, Messages } from '@rocket.chat/models';
import {
Expand All @@ -10,12 +17,15 @@ import {
isLiveChatRoomJoinProps,
isLiveChatRoomSaveInfoProps,
isPOSTLivechatRoomCloseByUserParams,
isPOSTLivechatRoomsCloseAll,
isPOSTLivechatRoomsCloseAllSuccessResponse,
} from '@rocket.chat/rest-typings';
import { check } from 'meteor/check';

import { callbacks } from '../../../../../lib/callbacks';
import { i18n } from '../../../../../server/lib/i18n';
import { API } from '../../../../api/server';
import type { ExtractRoutesFromAPI } from '../../../../api/server/ApiClass';
import { isWidget } from '../../../../api/server/helpers/isWidget';
import { canAccessRoomAsync } from '../../../../authorization/server';
import { hasPermissionAsync } from '../../../../authorization/server/functions/hasPermission';
Expand All @@ -27,7 +37,7 @@ import { closeRoom } from '../../lib/closeRoom';
import { saveGuest } from '../../lib/guests';
import type { CloseRoomParams } from '../../lib/localTypes';
import { livechatLogger } from '../../lib/logger';
import { createRoom, saveRoomInfo } from '../../lib/rooms';
import { createRoom, removeOmnichannelRoom, saveRoomInfo } from '../../lib/rooms';
import { transfer } from '../../lib/transfer';
import { findGuest, findRoom, settings, findAgent, onCheckRoomParams } from '../lib/livechat';

Expand Down Expand Up @@ -427,3 +437,37 @@ API.v1.addRoute(
},
},
);

const livechatRoomsEndpoints = API.v1.post(
'livechat/rooms.removeAllClosedRooms',
{
response: {
200: isPOSTLivechatRoomsCloseAllSuccessResponse,
},
authRequired: true,
permissionsRequired: ['remove-closed-livechat-rooms'],
body: isPOSTLivechatRoomsCloseAll,
},
async function action() {
livechatLogger.info(`User ${this.userId} is removing all closed rooms`);

const params = this.bodyParams;

const extraQuery = await callbacks.run('livechat.applyRoomRestrictions', {}, { userId: this.userId });
const promises: Promise<void>[] = [];
await LivechatRooms.findClosedRooms(params?.departmentIds, {}, extraQuery).forEach(({ _id }: IOmnichannelRoom) => {
promises.push(removeOmnichannelRoom(_id));
});
await Promise.all(promises);

livechatLogger.info(`User ${this.userId} removed ${promises.length} closed rooms`);
return API.v1.success({ removedRooms: promises.length });
},
);

type LivechatRoomsEndpoints = ExtractRoutesFromAPI<typeof livechatRoomsEndpoints>;

declare module '@rocket.chat/rest-typings' {
// eslint-disable-next-line @typescript-eslint/naming-convention, @typescript-eslint/no-empty-interface
interface Endpoints extends LivechatRoomsEndpoints {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Meteor } from 'meteor/meteor';

import { callbacks } from '../../../../lib/callbacks';
import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
import { methodDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
import { removeOmnichannelRoom } from '../lib/rooms';

declare module '@rocket.chat/ddp-client' {
Expand All @@ -17,6 +18,7 @@ declare module '@rocket.chat/ddp-client' {

Meteor.methods<ServerMethods>({
async 'livechat:removeAllClosedRooms'(departmentIds) {
methodDeprecationLogger.method('livechat:removeAllClosedRooms', '8.0.0', '/v1/livechat/rooms.removeAllClosedRooms');
const logger = new Logger('livechat:removeAllClosedRooms');
const user = Meteor.userId();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { TextInput, Box, Select, InputBox } from '@rocket.chat/fuselage';
import { useEffectEvent, useLocalStorage } from '@rocket.chat/fuselage-hooks';
import { GenericModal } from '@rocket.chat/ui-client';
import { useSetModal, useToastMessageDispatch, useMethod } from '@rocket.chat/ui-contexts';
import { useSetModal, useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
import moment from 'moment';
import type { Dispatch, FormEvent, Key, SetStateAction } from 'react';
import { useEffect } from 'react';
Expand Down Expand Up @@ -81,12 +81,12 @@ const FilterByText = ({ setFilter, reload, customFields, setCustomFields, hasCus
reset();
});

const removeClosedChats = useMethod('livechat:removeAllClosedRooms');
const removeClosedRooms = useEndpoint('POST', '/v1/livechat/rooms.removeAllClosedRooms');

const handleRemoveClosed = useEffectEvent(async () => {
const onDeleteAll = async (): Promise<void> => {
try {
await removeClosedChats();
await removeClosedRooms();
reload?.();
dispatchToastMessage({ type: 'success', message: t('Chat_removed') });
} catch (error) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Box, Button, Chip } from '@rocket.chat/fuselage';
import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
import { GenericMenu, GenericModal } from '@rocket.chat/ui-client';
import { useMethod, useRoute, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
import { useEndpoint, useRoute, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
import { useQueryClient } from '@tanstack/react-query';
import { useTranslation } from 'react-i18next';

Expand All @@ -13,15 +13,15 @@ const ChatsTableFilter = () => {
const setModal = useSetModal();
const dispatchToastMessage = useToastMessageDispatch();
const directoryRoute = useRoute('omnichannel-directory');
const removeClosedChats = useMethod('livechat:removeAllClosedRooms');
const queryClient = useQueryClient();
const removeClosedRooms = useEndpoint('POST', '/v1/livechat/rooms.removeAllClosedRooms');

const { filtersQuery, displayFilters, setFiltersQuery, removeFilter, textInputRef } = useChatsContext();

const handleRemoveAllClosed = useEffectEvent(async () => {
const onDeleteAll = async () => {
try {
await removeClosedChats();
await removeClosedRooms();
queryClient.invalidateQueries({ queryKey: ['current-chats'] });
dispatchToastMessage({ type: 'success', message: t('Chat_removed') });
} catch (error) {
Expand Down
43 changes: 43 additions & 0 deletions packages/rest-typings/src/v1/omnichannel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3946,6 +3946,49 @@ const LivechatTriggerWebhookCallParamsSchema = {

export const isLivechatTriggerWebhookCallParams = ajv.compile<LivechatTriggerWebhookCallParams>(LivechatTriggerWebhookCallParamsSchema);

type POSTLivechatRoomsCloseAll =
| {
departmentIds?: string[];
}
| undefined;

const POSTLivechatRoomsCloseAllSchema = {
type: 'object',
properties: {
departmentIds: {
type: 'array',
items: {
type: 'string',
},
nullable: true,
},
},
required: [],
nullable: true,
additionalProperties: false,
};

export const isPOSTLivechatRoomsCloseAll = ajv.compile<POSTLivechatRoomsCloseAll>(POSTLivechatRoomsCloseAllSchema);

const POSTLivechatRoomsCloseAllSuccessResponseSchema = {
type: 'object',
properties: {
removedRooms: {
type: 'number',
},
success: {
type: 'boolean',
enum: [true],
},
},
required: ['removedRooms'],
additionalProperties: false,
};

export const isPOSTLivechatRoomsCloseAllSuccessResponse = ajv.compile<{ removedRooms: number }>(
POSTLivechatRoomsCloseAllSuccessResponseSchema,
);

export type ILivechatContactWithManagerData = Omit<ILivechatContact, 'contactManager'> & {
contactManager?: Pick<IUser, '_id' | 'name' | 'username'>;
};
Expand Down
Loading