Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make body optional on open ticket actions #1214

Merged
merged 2 commits into from
Jan 4, 2024
Merged

Make body optional on open ticket actions #1214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0971c8
Make body optional on open ticket actions
rowanseymour Jan 3, 2024
04be869
REmove default values for body and result name for open ticket actions
rowanseymour Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/components/flow/routers/ticket/TicketRouterForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')) {
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand Down
8 changes: 4 additions & 4 deletions src/components/flow/routers/ticket/__snapshots__/TicketRouterForm.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="[]"
/>
Expand All @@ -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>
Expand Down Expand Up @@ -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="[]"
/>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/components/flow/routers/ticket/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 };

Expand Down
2 changes: 1 addition & 1 deletion src/config/i18n/defaults.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]]",
Expand Down
2 changes: 1 addition & 1 deletion src/config/i18n/es/resource.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]]",
Expand Down
2 changes: 1 addition & 1 deletion src/flowTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Loading