Merge pull request #1214 from nyaruka/ticket_body_optional

Make body optional on open ticket actions
nyaruka · Jan 4, 2024 · 92d6a68 · 92d6a68
2 parents 0a17ab1 + 04be869
commit 92d6a68
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/src/components/flow/routers/ticket/TicketRouterForm.tsx b/src/components/flow/routers/ticket/TicketRouterForm.tsx
@@ -75,9 +75,7 @@ export default class TicketRouterForm extends React.Component<
     }
 
     if (keys.hasOwnProperty('body')) {
-      updates.body = validate(i18n.t('forms.body', 'Body'), keys.body, [
-        shouldRequireIf(submitting)
-      ]);
+      updates.body = validate(i18n.t('forms.body', 'Body'), keys.body, []);
     }
 
     if (keys.hasOwnProperty('resultName')) {
@@ -172,7 +170,7 @@ export default class TicketRouterForm extends React.Component<
             <TembaSelect
               key="select_assignee"
               name={i18n.t('forms.assignee', 'Assignee')}
-              placeholder="Assign to (Optional)"
+              placeholder="Assign to (optional)"
               valueKey="email"
               endpoint={this.context.config.endpoints.users}
               onChange={this.handleAssigneeUpdate}
@@ -190,7 +188,7 @@ export default class TicketRouterForm extends React.Component<
         <div className={styles.body}>
           <TextInputElement
             name={i18n.t('forms.body', 'Body')}
-            placeholder={i18n.t('forms.enter_a_body', 'Enter a body')}
+            placeholder={i18n.t('forms.enter_a_body', 'Enter a body (optional)')}
             entry={this.state.body}
             onChange={this.handleBodyUpdate}
             autocomplete={true}

diff --git a/src/components/flow/routers/ticket/__snapshots__/TicketRouterForm.test.tsx.snap b/src/components/flow/routers/ticket/__snapshots__/TicketRouterForm.test.tsx.snap
@@ -88,7 +88,7 @@ exports[`TicketRouterForm render should render 1`] = `
                 expressions=""
                 name="Assignee"
                 namekey="name"
-                placeholder="Assign to (Optional)"
+                placeholder="Assign to (optional)"
                 valuekey="email"
                 values="[]"
               />
@@ -107,7 +107,7 @@ exports[`TicketRouterForm render should render 1`] = `
               <input
                 data-testid="Body"
                 name="Body"
-                placeholder="Enter a body"
+                placeholder="Enter a body (optional)"
                 value="Where are my cookies"
               />
             </div>
@@ -267,7 +267,7 @@ exports[`TicketRouterForm updates should save changes 1`] = `
                 expressions=""
                 name="Assignee"
                 namekey="name"
-                placeholder="Assign to (Optional)"
+                placeholder="Assign to (optional)"
                 valuekey="email"
                 values="[]"
               />
@@ -286,7 +286,7 @@ exports[`TicketRouterForm updates should save changes 1`] = `
               <input
                 data-testid="Body"
                 name="Body"
-                placeholder="Enter a body"
+                placeholder="Enter a body (optional)"
                 value="Where are my cookies"
               />
             </div>

diff --git a/src/components/flow/routers/ticket/helpers.ts b/src/components/flow/routers/ticket/helpers.ts
@@ -19,8 +19,8 @@ export const getOriginalAction = (settings: NodeEditorSettings): OpenTicket => {
 
 export const nodeToState = (settings: NodeEditorSettings): TicketRouterFormState => {
   let subject = { value: '@run.flow.name' };
-  let body = { value: '@results' };
-  let resultName = { value: 'Result' };
+  let body = { value: '' };
+  let resultName = { value: '' };
   let assignee: FormEntry = { value: null };
   let topic: FormEntry = { value: null };
 

diff --git a/src/config/i18n/defaults.json b/src/config/i18n/defaults.json
@@ -217,7 +217,7 @@
     "email_recipient_name": "Recipient",
     "email_recipient_placeholder": "To",
     "email_recipient_prompt": "Enter email address",
-    "enter_a_body": "Enter a body",
+    "enter_a_body": "Enter a body (optional)",
     "enter_a_subject": "Enter a subject",
     "enter_a_url": "Enter a URL",
     "enter_field_value": "Enter a new value for [[field]]",

diff --git a/src/config/i18n/es/resource.json b/src/config/i18n/es/resource.json
@@ -217,7 +217,7 @@
     "email_recipient_name": "Destinatario",
     "email_recipient_placeholder": "Para",
     "email_recipient_prompt": "Introducir la dirección de correo electrónico",
-    "enter_a_body": "Introducir cuerpo",
+    "enter_a_body": "Introducir cuerpo (opcional)",
     "enter_a_subject": "Introducir asunto",
     "enter_a_url": "Introducir URL",
     "enter_field_value": "Ingrese un nuevo valor para [[field]]",

diff --git a/src/flowTypes.ts b/src/flowTypes.ts
@@ -465,7 +465,7 @@ export interface CallWebhook extends Action {
 export interface OpenTicket extends Action {
   subject?: string;
   topic?: Topic;
-  body: string;
+  body?: string;
   result_name: string;
   assignee?: User;
 }