From 63d794ed3e59afa8fb2736b3542a33b968cb0ea4 Mon Sep 17 00:00:00 2001
From: Ali BARIN <ali.barin53@gmail.com>
Date: Wed, 1 Mar 2023 18:00:27 +0000
Subject: [PATCH] refactor(dynamicFields): use thrown error instead of
 returning it

---
 .../slack/dynamic-fields/send-as-bot/index.ts  | 18 +++---------------
 .../src/graphql/queries/get-dynamic-fields.ts  |  8 ++------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/packages/backend/src/apps/slack/dynamic-fields/send-as-bot/index.ts b/packages/backend/src/apps/slack/dynamic-fields/send-as-bot/index.ts
index 82d04794..75c6c5e0 100644
--- a/packages/backend/src/apps/slack/dynamic-fields/send-as-bot/index.ts
+++ b/packages/backend/src/apps/slack/dynamic-fields/send-as-bot/index.ts
@@ -1,22 +1,12 @@
-import { IGlobalVariable, IField, IJSONObject } from '@automatisch/types';
+import { IGlobalVariable } from '@automatisch/types';
 
 export default {
   name: 'List fields after send as bot',
   key: 'listFieldsAfterSendAsBot',
 
   async run($: IGlobalVariable) {
-    const sendAsBot = $.step.parameters.sendAsBot as boolean;
-
-    const remainingArguments: {
-      data: IJSONObject[];
-      error: IJSONObject | null;
-    } = {
-      data: [],
-      error: null,
-    };
-
-    if (sendAsBot) {
-      remainingArguments.data = [
+    if ($.step.parameters.sendAsBot) {
+      return [
         {
           label: 'Bot name',
           key: 'botName',
@@ -38,7 +28,5 @@ export default {
         },
       ];
     }
-
-    return remainingArguments;
   },
 };
diff --git a/packages/backend/src/graphql/queries/get-dynamic-fields.ts b/packages/backend/src/graphql/queries/get-dynamic-fields.ts
index 386f66b8..cd72ba12 100644
--- a/packages/backend/src/graphql/queries/get-dynamic-fields.ts
+++ b/packages/backend/src/graphql/queries/get-dynamic-fields.ts
@@ -40,13 +40,9 @@ const getDynamicFields = async (
     $.step.parameters[parameterKey] = parameterValue;
   }
 
-  const remainingArguments = await command.run($);
+  const additionalFields = await command.run($) || [];
 
-  if (remainingArguments.error) {
-    throw new Error(JSON.stringify(remainingArguments.error));
-  }
-
-  return remainingArguments.data;
+  return additionalFields;
 };
 
 export default getDynamicFields;