From aa30c8581626409881df237da8f98f58b747f061 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Mon, 2 Oct 2023 16:32:26 -0300
Subject: [PATCH] chore: Delete Trigger Endpoint (#30533)

---
 apps/meteor/app/livechat/imports/server/rest/triggers.ts | 9 ++++++++-
 apps/meteor/app/livechat/server/api/lib/triggers.ts      | 4 ++++
 apps/meteor/app/livechat/server/methods/removeTrigger.ts | 3 +++
 .../client/views/omnichannel/triggers/TriggersRow.tsx    | 6 +++---
 packages/rest-typings/src/v1/omnichannel.ts              | 1 +
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/apps/meteor/app/livechat/imports/server/rest/triggers.ts b/apps/meteor/app/livechat/imports/server/rest/triggers.ts
index a12d4a988281..a7660827b0ce 100644
--- a/apps/meteor/app/livechat/imports/server/rest/triggers.ts
+++ b/apps/meteor/app/livechat/imports/server/rest/triggers.ts
@@ -3,7 +3,7 @@ import { isGETLivechatTriggersParams, isPOSTLivechatTriggersParams } from '@rock
 
 import { API } from '../../../../api/server';
 import { getPaginationItems } from '../../../../api/server/helpers/getPaginationItems';
-import { findTriggers, findTriggerById } from '../../../server/api/lib/triggers';
+import { findTriggers, findTriggerById, deleteTrigger } from '../../../server/api/lib/triggers';
 
 API.v1.addRoute(
 	'livechat/triggers',
@@ -57,5 +57,12 @@ API.v1.addRoute(
 				trigger,
 			});
 		},
+		async delete() {
+			await deleteTrigger({
+				triggerId: this.urlParams._id,
+			});
+
+			return API.v1.success();
+		},
 	},
 );
diff --git a/apps/meteor/app/livechat/server/api/lib/triggers.ts b/apps/meteor/app/livechat/server/api/lib/triggers.ts
index dbb6f8a6633a..4cbafcb0dc73 100644
--- a/apps/meteor/app/livechat/server/api/lib/triggers.ts
+++ b/apps/meteor/app/livechat/server/api/lib/triggers.ts
@@ -29,3 +29,7 @@ export async function findTriggers({
 export async function findTriggerById({ triggerId }: { triggerId: string }): Promise<ILivechatTrigger | null> {
 	return LivechatTrigger.findOneById(triggerId);
 }
+
+export async function deleteTrigger({ triggerId }: { triggerId: string }): Promise<void> {
+	await LivechatTrigger.removeById(triggerId);
+}
diff --git a/apps/meteor/app/livechat/server/methods/removeTrigger.ts b/apps/meteor/app/livechat/server/methods/removeTrigger.ts
index c403dcd3edac..69f3a4a2d80c 100644
--- a/apps/meteor/app/livechat/server/methods/removeTrigger.ts
+++ b/apps/meteor/app/livechat/server/methods/removeTrigger.ts
@@ -4,6 +4,7 @@ import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
+import { methodDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
 
 declare module '@rocket.chat/ui-contexts' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -14,6 +15,8 @@ declare module '@rocket.chat/ui-contexts' {
 
 Meteor.methods<ServerMethods>({
 	async 'livechat:removeTrigger'(triggerId) {
+		methodDeprecationLogger.method('livechat:removeTrigger', '7.0.0');
+
 		const uid = Meteor.userId();
 		if (!uid || !(await hasPermissionAsync(uid, 'view-livechat-manager'))) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', {
diff --git a/apps/meteor/client/views/omnichannel/triggers/TriggersRow.tsx b/apps/meteor/client/views/omnichannel/triggers/TriggersRow.tsx
index 8a1a81d9f64a..5ade384582c2 100644
--- a/apps/meteor/client/views/omnichannel/triggers/TriggersRow.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/TriggersRow.tsx
@@ -1,7 +1,7 @@
 import type { ILivechatTrigger } from '@rocket.chat/core-typings';
 import { IconButton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useRoute, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useRoute, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
 
 import GenericModal from '../../../components/GenericModal';
@@ -13,7 +13,7 @@ const TriggersRow = ({ _id, name, description, enabled, reload }: TriggersRowPro
 	const t = useTranslation();
 	const setModal = useSetModal();
 	const triggersRoute = useRoute('omnichannel-triggers');
-	const deleteTrigger = useMethod('livechat:removeTrigger');
+	const deleteTrigger = useEndpoint('DELETE', '/v1/livechat/triggers/:_id', { _id });
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const handleClick = useMutableCallback(() => {
@@ -35,7 +35,7 @@ const TriggersRow = ({ _id, name, description, enabled, reload }: TriggersRowPro
 		e.stopPropagation();
 		const onDeleteTrigger = async () => {
 			try {
-				await deleteTrigger(_id);
+				await deleteTrigger();
 				dispatchToastMessage({ type: 'success', message: t('Trigger_removed') });
 				reload();
 			} catch (error) {
diff --git a/packages/rest-typings/src/v1/omnichannel.ts b/packages/rest-typings/src/v1/omnichannel.ts
index 31d004ba39c4..bebea2856861 100644
--- a/packages/rest-typings/src/v1/omnichannel.ts
+++ b/packages/rest-typings/src/v1/omnichannel.ts
@@ -3596,6 +3596,7 @@ export type OmnichannelEndpoints = {
 	};
 	'/v1/livechat/triggers/:_id': {
 		GET: () => { trigger: ILivechatTrigger | null };
+		DELETE: () => void;
 	};
 	'/v1/livechat/rooms': {
 		GET: (params: GETLivechatRoomsParams) => PaginatedResult<{ rooms: IOmnichannelRoom[] }>;