Rework webhook nodes to route on @webhook.status

Author: rowanseymour

src/components/flow/routers/airtime/helpers.ts

@@ -2,7 +2,7 @@ import {
   AirtimeRouterFormState,
   AirtimeTransferEntry
 } from 'components/flow/routers/airtime/AirtimeRouterForm';
-import { createWebhookBasedNode } from 'components/flow/routers/helpers';
+import { createServiceCallSplitNode } from 'components/flow/routers/helpers';
 import { Types } from 'config/interfaces';
 import { TransferAirtime } from 'flowTypes';
 import { RenderNode } from 'store/flowContext';
@@ -56,7 +56,7 @@ export const stateToNode = (
     result_name: state.resultName.value
   };
 
-  return createWebhookBasedNode(newAction, settings.originalNode, true);
+  return createServiceCallSplitNode(newAction, settings.originalNode, false);
 };
 
 export const getOriginalAction = (settings: NodeEditorSettings): TransferAirtime => {

src/components/flow/routers/helpers.ts

@@ -14,7 +14,7 @@ import {
   SwitchRouter,
   TransferAirtime,
   UIConfig,
-  WebhookExitNames,
+  ServiceCallExitNames,
   CallClassifier,
   OpenTicket
 } from 'flowTypes';
@@ -330,14 +330,15 @@ export const resolveRoutes = (
   return results;
 };
 
-export const createWebhookBasedNode = (
+export const createServiceCallSplitNode = (
   action: CallWebhook | CallResthook | OpenTicket | TransferAirtime,
   originalNode: RenderNode,
-  useCategoryTest: boolean
+  useWebhookTest: boolean
 ): RenderNode => {
   const exits: Exit[] = [];
   let cases: Case[] = [];
   let categories: Category[] = [];
+  let operand = '';
 
   // see if we are editing an existing router so we reuse exits
   if (
@@ -365,29 +366,41 @@ export const createWebhookBasedNode = (
     categories = [
       {
         uuid: createUUID(),
-        name: WebhookExitNames.Success,
+        name: ServiceCallExitNames.Success,
         exit_uuid: exits[0].uuid
       },
       {
         uuid: createUUID(),
-        name: WebhookExitNames.Failure,
+        name: ServiceCallExitNames.Failure,
         exit_uuid: exits[1].uuid
       }
     ];
 
-    cases = [
-      {
-        uuid: createUUID(),
-        type: useCategoryTest ? Operators.has_category : Operators.has_only_text,
-        arguments: [WebhookExitNames.Success],
-        category_uuid: categories[0].uuid
-      }
-    ];
+    if (useWebhookTest) {
+      cases = [
+        {
+          uuid: createUUID(),
+          type: Operators.has_number_between,
+          arguments: ['200', '299'],
+          category_uuid: categories[0].uuid
+        }
+      ];
+    } else {
+      cases = [
+        {
+          uuid: createUUID(),
+          type: Operators.has_category,
+          arguments: [ServiceCallExitNames.Success],
+          category_uuid: categories[0].uuid
+        }
+      ];
+    }
   }
 
-  let operand = '@results.' + snakify(action.result_name);
-  if (!useCategoryTest) {
-    operand += '.category';
+  if (useWebhookTest) {
+    operand = '@webhook.status';
+  } else {
+    operand = '@results.' + snakify(action.result_name);
   }
 
   const router: SwitchRouter = {

src/components/flow/routers/resthook/__snapshots__/ResthookRouterForm.test.ts.snap

@@ -135,7 +135,7 @@ Array [
           },
         ],
         "default_category_uuid": "477ac8b4-25e2-483a-8686-2d1332c4da1c",
-        "operand": "@results.result.category",
+        "operand": "@webhook.status",
         "type": "switch",
       },
       "uuid": "132de855-4042-4dc1-a18f-cc2e6a8f790a",
@@ -176,10 +176,11 @@ Array [
         "cases": Array [
           Object {
             "arguments": Array [
-              "Success",
+              "200",
+              "299",
             ],
             "category_uuid": "6c22884b-0e35-4206-982e-18320691eda9",
-            "type": "has_only_text",
+            "type": "has_number_between",
             "uuid": "0c8c9239-9b59-473a-a229-d8a9693be270",
           },
         ],
@@ -196,7 +197,7 @@ Array [
           },
         ],
         "default_category_uuid": "a62e8284-49f8-4292-adbc-d5f6607f85c5",
-        "operand": "@results.result.category",
+        "operand": "@webhook.status",
         "type": "switch",
       },
       "uuid": "132de855-4042-4dc1-a18f-cc2e6a8f790a",
@@ -274,7 +275,7 @@ Array [
           },
         ],
         "default_category_uuid": "477ac8b4-25e2-483a-8686-2d1332c4da1c",
-        "operand": "@results.result.category",
+        "operand": "@webhook.status",
         "type": "switch",
       },
       "uuid": "132de855-4042-4dc1-a18f-cc2e6a8f790a",

src/components/flow/routers/resthook/helpers.ts

@@ -1,4 +1,4 @@
-import { createWebhookBasedNode } from 'components/flow/routers/helpers';
+import { createServiceCallSplitNode } from 'components/flow/routers/helpers';
 import { Types } from 'config/interfaces';
 import { CallResthook } from 'flowTypes';
 import { RenderNode } from 'store/flowContext';
@@ -46,7 +46,7 @@ export const stateToNode = (
     result_name: state.resultName.value
   };
 
-  return createWebhookBasedNode(newAction, settings.originalNode, false);
+  return createServiceCallSplitNode(newAction, settings.originalNode, true);
 };
 
 export const getOriginalAction = (settings: NodeEditorSettings): CallResthook => {

src/components/flow/routers/ticket/helpers.ts

@@ -1,4 +1,4 @@
-import { createWebhookBasedNode } from 'components/flow/routers/helpers';
+import { createServiceCallSplitNode } from 'components/flow/routers/helpers';
 import { Types } from 'config/interfaces';
 import { getType } from 'config/typeConfigs';
 import { OpenTicket } from 'flowTypes';
@@ -64,5 +64,5 @@ export const stateToNode = (
     result_name: state.resultName.value
   };
 
-  return createWebhookBasedNode(newAction, settings.originalNode, true);
+  return createServiceCallSplitNode(newAction, settings.originalNode, false);
 };

src/components/flow/routers/webhook/__snapshots__/WebhookRouterForm.test.tsx.snap

@@ -628,7 +628,7 @@ Array [
           },
         ],
         "default_category_uuid": "477ac8b4-25e2-483a-8686-2d1332c4da1c",
-        "operand": "@results.my_webhook_result.category",
+        "operand": "@webhook.status",
         "type": "switch",
       },
       "uuid": "132de855-4042-4dc1-a18f-cc2e6a8f790a",

src/components/flow/routers/webhook/helpers.ts

@@ -1,4 +1,4 @@
-import { createWebhookBasedNode } from 'components/flow/routers/helpers';
+import { createServiceCallSplitNode } from 'components/flow/routers/helpers';
 import { WebhookRouterFormState } from 'components/flow/routers/webhook/WebhookRouterForm';
 import { DEFAULT_BODY } from 'components/nodeeditor/constants';
 import { Types } from 'config/interfaces';
@@ -133,7 +133,7 @@ export const stateToNode = (
     result_name: state.resultName.value
   };
 
-  return createWebhookBasedNode(newAction, settings.originalNode, false);
+  return createServiceCallSplitNode(newAction, settings.originalNode, true);
 };
 
 export const getDefaultBody = (method: string): string => {

src/flowTypes.ts

@@ -585,16 +585,11 @@ export enum StartFlowExitNames {
   Expired = 'Expired'
 }
 
-export enum WebhookExitNames {
+export enum ServiceCallExitNames {
   Success = 'Success',
   Failure = 'Failure'
 }
 
-export enum TransferAirtimeExitNames {
-  Success = 'Success',
-  Failure = 'Failed'
-}
-
 export enum DialCategoryNames {
   Answered = 'Answered',
   NoAnswer = 'No Answer',

src/testUtils/assetCreators.ts

@@ -51,7 +51,7 @@ import {
   UINode,
   Wait,
   WaitTypes,
-  WebhookExitNames,
+  ServiceCallExitNames,
   HintTypes,
   CallClassifier,
   ComposeAttachment
@@ -387,15 +387,15 @@ export const createWebhookNode = (
   useCategoryTest: boolean
 ) => {
   const { categories, exits } = createCategories([
-    WebhookExitNames.Success,
-    WebhookExitNames.Failure
+    ServiceCallExitNames.Success,
+    ServiceCallExitNames.Failure
   ]);
 
   const cases: Case[] = [
     {
       uuid: utils.createUUID(),
       type: useCategoryTest ? Operators.has_category : Operators.has_only_text,
-      arguments: [WebhookExitNames.Success],
+      arguments: [ServiceCallExitNames.Success],
       category_uuid: categories[0].uuid
     }
   ];