From d31b577f64c3b146204726991c44a4322e9a955c Mon Sep 17 00:00:00 2001 From: zeye Date: Thu, 31 Oct 2019 17:29:10 +0800 Subject: [PATCH 1/2] Fix unsafe 'title' visit --- .../extensions/visual-designer/src/components/nodes/Trigger.tsx | 2 +- .../visual-designer/src/components/nodes/templates/RuleCard.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Composer/packages/extensions/visual-designer/src/components/nodes/Trigger.tsx b/Composer/packages/extensions/visual-designer/src/components/nodes/Trigger.tsx index ef8638bdf3..707273d223 100644 --- a/Composer/packages/extensions/visual-designer/src/components/nodes/Trigger.tsx +++ b/Composer/packages/extensions/visual-designer/src/components/nodes/Trigger.tsx @@ -18,7 +18,7 @@ function getLabel(data: any): string { const labelOverrides = ConceptLabels[data.$type]; - if (labelOverrides.title) { + if (labelOverrides && labelOverrides.title) { return labelOverrides.title; } diff --git a/Composer/packages/extensions/visual-designer/src/components/nodes/templates/RuleCard.tsx b/Composer/packages/extensions/visual-designer/src/components/nodes/templates/RuleCard.tsx index 6650f31cb0..3136960755 100644 --- a/Composer/packages/extensions/visual-designer/src/components/nodes/templates/RuleCard.tsx +++ b/Composer/packages/extensions/visual-designer/src/components/nodes/templates/RuleCard.tsx @@ -90,7 +90,7 @@ export const RuleCard: React.FC = ({ id, data, label, onEvent }): JSX const step = normalizeObiStep(data[StepsKey][0]); if (step.$type === ObiTypes.BeginDialog) { dialog = step.dialog; - summary = ConceptLabels[step.$type].title || step.$type; + summary = ConceptLabels[step.$type] ? ConceptLabels[step.$type].title : step.$type; } else { summary = formatMessage('1 action: {step}', { step: (ConceptLabels[step.$type] || {}).title || step.$type }); } From ec9150c13c46add415e9ce12cd3a48faf1e8eddc Mon Sep 17 00:00:00 2001 From: zeye Date: Thu, 31 Oct 2019 17:32:33 +0800 Subject: [PATCH 2/2] revert changes in RuleCard since not used by Shell --- .../visual-designer/src/components/nodes/templates/RuleCard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/extensions/visual-designer/src/components/nodes/templates/RuleCard.tsx b/Composer/packages/extensions/visual-designer/src/components/nodes/templates/RuleCard.tsx index 3136960755..6650f31cb0 100644 --- a/Composer/packages/extensions/visual-designer/src/components/nodes/templates/RuleCard.tsx +++ b/Composer/packages/extensions/visual-designer/src/components/nodes/templates/RuleCard.tsx @@ -90,7 +90,7 @@ export const RuleCard: React.FC = ({ id, data, label, onEvent }): JSX const step = normalizeObiStep(data[StepsKey][0]); if (step.$type === ObiTypes.BeginDialog) { dialog = step.dialog; - summary = ConceptLabels[step.$type] ? ConceptLabels[step.$type].title : step.$type; + summary = ConceptLabels[step.$type].title || step.$type; } else { summary = formatMessage('1 action: {step}', { step: (ConceptLabels[step.$type] || {}).title || step.$type }); }