Fix Triggers (#18626)

RocketChat · Aug 21, 2020 · 88649be · 88649be
1 parent ec113f0
commit 88649be
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/client/omnichannel/triggers/EditTriggerPage.js b/client/omnichannel/triggers/EditTriggerPage.js
@@ -34,15 +34,15 @@ const getInitialValues = ({
 	enabled,
 	runOnce,
 	conditions: [{
-		condName,
-		condValue,
+		name: condName,
+		value: condValue,
 	}],
 	actions: [{
-		actName,
+		action: actName,
 		params: {
-			actSender,
-			actMsg,
-			actSenderName,
+			sender: actSender,
+			msg: actMsg,
+			name: actSenderName,
 		},
 	}],
 }) => ({
@@ -76,7 +76,7 @@ const EditTriggerPage = ({ data, onSave }) => {
 
 	const handleSave = useMutableCallback(async () => {
 		try {
-			const { actions: { sender, msg, name }, ...restValues } = values;
+			const { actions: { params: { sender, msg, name } }, ...restValues } = values;
 			await save({
 				_id: data._id,
 				...restValues,

diff --git a/client/omnichannel/triggers/NewTriggerPage.js b/client/omnichannel/triggers/NewTriggerPage.js
@@ -38,7 +38,7 @@ const NewTriggerPage = ({ onSave }) => {
 
 	const handleSave = useMutableCallback(async () => {
 		try {
-			const { actions: { sender, msg, name }, ...restValues } = values;
+			const { actions: { params: { sender, msg, name } }, ...restValues } = values;
 			await save({
 				...restValues,
 				conditions: [values.conditions],

diff --git a/client/omnichannel/triggers/TriggersTable.js b/client/omnichannel/triggers/TriggersTable.js
@@ -107,7 +107,7 @@ const TriggersTableContainer = ({ reloadRef }) => {
 
 	return <TriggersTable
 		triggers={data?.triggers}
-		totaltriggers={data?.total}
+		totalTriggers={data?.total}
 		params={params}
 		onChangeParams={setParams}
 		onDelete={reload}