Skip to content

Commit cfd4ec6

Browse files
authored
sync fixes (#167)
* sync fixes * refactor: Simplify handleTemplateChanged method and remove unused code in SendMsgForm feat: Add HAS_START_SESSION feature filter in interfaces feat: Update typeConfigs to include filter for StartSessionForm fix: Remove console logs from initializeForm in helpers * refactor: Remove unnecessary console logs and improve condition checks in various components * test: Update snapshots to include filter property for start_session * refactor: Remove console logs and clean up code in various components * Refactor code structure for improved readability and maintainability * chore: update version to 1.43.0-1 in package.json
1 parent 73aabc1 commit cfd4ec6

File tree

27 files changed

+336
-330
lines changed

27 files changed

+336
-330
lines changed

src/components/flow/actions/addlabels/AddLabelsForm.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ export default class AddLabelsForm extends React.PureComponent<
8080

8181
public render(): JSX.Element {
8282
const typeConfig = this.props.typeConfig;
83+
8384
return (
8485
<Dialog title={typeConfig.name} headerClass={typeConfig.type} buttons={this.getButtons()}>
8586
<TypeList __className="" initialType={typeConfig} onChange={this.props.onTypeChange} />

src/components/flow/actions/addlabels/__snapshots__/AddLabelsForm.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ exports[`AddLabelsForm render allows expressions 1`] = `
4848
namekey="description"
4949
searchable="true"
5050
valuekey="type"
51-
values="[{\\"type\\":\\"start_session\\",\\"name\\":\\"Start Somebody Else\\",\\"description\\":\\"Start somebody else in a flow\\",\\"localizeableKeys\\":[\\"exits\\"]}]"
51+
values="[{\\"type\\":\\"start_session\\",\\"name\\":\\"Start Somebody Else\\",\\"description\\":\\"Start somebody else in a flow\\",\\"localizeableKeys\\":[\\"exits\\"],\\"filter\\":\\"start_session\\"}]"
5252
/>
5353
</div>
5454
</div>

src/components/flow/actions/sendbroadcast/SendBroadcastForm.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export default class SendBroadcastForm extends React.Component<
5858
fetchAsset(this.props.assetStore.templates, this.state.template.value.uuid).then(
5959
(asset: Asset) => {
6060
if (asset && asset.content) {
61-
this.handleTemplateChanged([{ ...this.state.template.value, ...asset.content }]);
61+
this.handleTemplateChanged({ ...this.state.template.value, ...asset.content });
6262
}
6363
}
6464
);
@@ -242,9 +242,7 @@ export default class SendBroadcastForm extends React.Component<
242242
};
243243
}
244244

245-
private handleTemplateChanged(selected: any[]): void {
246-
const template = selected ? selected[0] : null;
247-
245+
private handleTemplateChanged(template: any): void {
248246
if (!template) {
249247
this.setState({
250248
template: { value: null },
@@ -291,6 +289,7 @@ export default class SendBroadcastForm extends React.Component<
291289
<TembaSelectElement
292290
key="template_select"
293291
name={i18n.t('forms.template', 'template')}
292+
placeholder={'Select template message'}
294293
endpoint={this.context.config.endpoints.templates}
295294
entry={this.state.template}
296295
onChange={this.handleTemplateChanged}

src/components/flow/actions/sendbroadcast/__snapshots__/SendBroadcastForm.test.ts.snap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ exports[`SendBroadcastForm render should render an empty form with no action 2`]
122122
}
123123
name="template"
124124
onChange={[Function]}
125+
placeholder="Select template message"
125126
searchable={true}
126127
shouldExclude={[Function]}
127128
/>
@@ -277,6 +278,7 @@ exports[`SendBroadcastForm render should render self, children with base props 1
277278
}
278279
name="template"
279280
onChange={[Function]}
281+
placeholder="Select template message"
280282
searchable={true}
281283
shouldExclude={[Function]}
282284
/>

src/components/flow/actions/sendinteractivemsg/SendInteractiveMsg.tsx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,16 @@ const SendInteractiveMsgComp: React.SFC<SendInteractiveMsg> = ({
5454
} else if (expression || expression === '') {
5555
setBody('Expressions used here');
5656
} else {
57-
getAsset(endpoint, type, id.toString()).then(response => {
58-
if (response.error) {
59-
setBody(PLACEHOLDER);
60-
} else {
61-
addAsset('interactives', response);
62-
setNode(response);
63-
}
64-
});
57+
if (id) {
58+
getAsset(endpoint, type, id.toString()).then(response => {
59+
if (response.error) {
60+
setBody(PLACEHOLDER);
61+
} else {
62+
addAsset('interactives', response);
63+
setNode(response);
64+
}
65+
});
66+
}
6567
}
6668
}, [addAsset, endpoint, expression, interactive, languageId, type, id]);
6769

src/components/flow/actions/sendinteractivemsg/SendInteractiveMsgForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ export default class SendMsgForm extends React.Component<
339339
const message = currentMessage.interactive_content;
340340
body = getMsgBody(message);
341341
}
342-
console.log(additionalOption, this.state.interactives);
342+
343343
return (
344344
<Dialog
345345
title={typeConfig.name}

0 commit comments

Comments
 (0)