From 368c024b435ecb8c103f54b69d40389b62c1a3bf Mon Sep 17 00:00:00 2001 From: Lauren Mills Date: Wed, 30 Jun 2021 14:41:40 -0700 Subject: [PATCH 1/4] update generators if/else conditions to include = --- .../generators/app/templates/botName.dialog | 8 ++++---- .../ChitchatDialog/ChitchatDialog.dialog | 4 ++-- .../generators/app/templates/botName.dialog | 2 +- .../generators/app/templates/botName.dialog | 2 +- .../generators/app/templates/botName.dialog | 2 +- .../generators/app/templates/botName.dialog | 12 +++++------ .../ChitchatDialog/ChitchatDialog.dialog | 4 ++-- .../generators/app/templates/botName.dialog | 12 +++++------ .../CancelEventDialog.dialog | 6 +++--- .../CreateEventDialog.dialog | 8 ++++---- .../GetContactsDialog.dialog | 4 ++-- .../GetEventsDialog/GetEventsDialog.dialog | 18 ++++++++--------- .../dialogs/ListDialog/ListDialog.dialog | 8 ++++---- .../ResolveDateTimeDialog.dialog | 20 +++++++++---------- .../RespondToEventDialog.dialog | 6 +++--- .../ShowEventsDialog/ShowEventsDialog.dialog | 12 +++++------ .../UpdateEventDialog.dialog | 8 ++++---- .../generators/app/templates/botName.dialog | 2 +- .../GetProfileDialog/GetProfileDialog.dialog | 4 ++-- .../dialogs/ListDialog/ListDialog.dialog | 8 ++++---- .../generators/app/templates/emptyBot.dialog | 2 +- 21 files changed, 76 insertions(+), 76 deletions(-) diff --git a/generators/generator-bot-core-assistant/generators/app/templates/botName.dialog b/generators/generator-bot-core-assistant/generators/app/templates/botName.dialog index a50e949f85..43cd66425d 100644 --- a/generators/generator-bot-core-assistant/generators/app/templates/botName.dialog +++ b/generators/generator-bot-core-assistant/generators/app/templates/botName.dialog @@ -28,14 +28,14 @@ "id": "641773", "name": "Branch: if/else" }, - "condition": "string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)", + "condition": "=string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)", "actions": [ { "$kind": "Microsoft.IfCondition", "$designer": { "id": "Y1t1k4" }, - "condition": "exists(user.greeted)", + "condition": "=exists(user.greeted)", "actions": [ { "$kind": "Microsoft.SendActivity", @@ -226,7 +226,7 @@ "$designer": { "id": "tjutdL" }, - "condition": "turn.intentChoice != 'none'", + "condition": "=turn.intentChoice != 'none'", "actions": [ { "$kind": "Microsoft.EmitEvent", @@ -342,7 +342,7 @@ "$designer": { "id": "VogQ3v" }, - "condition": "exists(turn.activity.text)", + "condition": "=exists(turn.activity.text)", "actions": [ { "$kind": "Microsoft.BeginDialog", diff --git a/generators/generator-bot-core-assistant/generators/app/templates/dialogs/ChitchatDialog/ChitchatDialog.dialog b/generators/generator-bot-core-assistant/generators/app/templates/dialogs/ChitchatDialog/ChitchatDialog.dialog index d3ed3626e1..0fa283b261 100644 --- a/generators/generator-bot-core-assistant/generators/app/templates/dialogs/ChitchatDialog/ChitchatDialog.dialog +++ b/generators/generator-bot-core-assistant/generators/app/templates/dialogs/ChitchatDialog/ChitchatDialog.dialog @@ -19,7 +19,7 @@ "$designer": { "id": "1mbleA" }, - "condition": "count(turn.recognized.answers[0].context.prompts) > 0", + "condition": "=count(turn.recognized.answers[0].context.prompts) > 0", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -60,7 +60,7 @@ "$designer": { "id": "qYZxID" }, - "condition": "turn.qnaMatchFromContext && count(turn.qnaMatchFromContext) > 0", + "condition": "=turn.qnaMatchFromContext && count(turn.qnaMatchFromContext) > 0", "actions": [ { "$kind": "Microsoft.SetProperty", diff --git a/generators/generator-bot-core-language/generators/app/templates/botName.dialog b/generators/generator-bot-core-language/generators/app/templates/botName.dialog index 5ad271db33..7955e9a0ab 100644 --- a/generators/generator-bot-core-language/generators/app/templates/botName.dialog +++ b/generators/generator-bot-core-language/generators/app/templates/botName.dialog @@ -28,7 +28,7 @@ "id": "641773", "name": "Branch: if/else" }, - "condition": "string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)", + "condition": "=string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)", "actions": [ { "$kind": "Microsoft.BeginDialog", diff --git a/generators/generator-bot-core-qna/generators/app/templates/botName.dialog b/generators/generator-bot-core-qna/generators/app/templates/botName.dialog index d6dc356fa4..79a0ebbe36 100644 --- a/generators/generator-bot-core-qna/generators/app/templates/botName.dialog +++ b/generators/generator-bot-core-qna/generators/app/templates/botName.dialog @@ -28,7 +28,7 @@ "id": "641773", "name": "Branch: if/else" }, - "condition": "string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)", + "condition": "=string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)", "actions": [ { "$kind": "Microsoft.SendActivity", diff --git a/generators/generator-bot-empty/generators/app/templates/botName.dialog b/generators/generator-bot-empty/generators/app/templates/botName.dialog index b147be7a6b..7055562b03 100644 --- a/generators/generator-bot-empty/generators/app/templates/botName.dialog +++ b/generators/generator-bot-empty/generators/app/templates/botName.dialog @@ -28,7 +28,7 @@ "id": "641773", "name": "Branch: if/else" }, - "condition": "string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)", + "condition": "=string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)", "actions": [ { "$kind": "Microsoft.SendActivity", diff --git a/generators/generator-bot-enterprise-assistant/generators/app/templates/botName.dialog b/generators/generator-bot-enterprise-assistant/generators/app/templates/botName.dialog index 73c92e6802..b666f90576 100644 --- a/generators/generator-bot-enterprise-assistant/generators/app/templates/botName.dialog +++ b/generators/generator-bot-enterprise-assistant/generators/app/templates/botName.dialog @@ -30,14 +30,14 @@ "id": "641773", "name": "Branch: if/else" }, - "condition": "string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)", + "condition": "=string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)", "actions": [ { "$kind": "Microsoft.IfCondition", "$designer": { "id": "Y1t1k4" }, - "condition": "exists(user.greeted)", + "condition": "=exists(user.greeted)", "actions": [ { "$kind": "Microsoft.SendActivity", @@ -258,7 +258,7 @@ "$designer": { "id": "tjutdL" }, - "condition": "turn.intentChoice != 'none'", + "condition": "=turn.intentChoice != 'none'", "actions": [ { "$kind": "Microsoft.EmitEvent", @@ -446,7 +446,7 @@ "$designer": { "id": "zG90cd" }, - "condition": "turn.activity.value.skillId != null", + "condition": "=turn.activity.value.skillId != null", "actions": [ { "$kind": "Microsoft.EmitEvent", @@ -463,7 +463,7 @@ "$designer": { "id": "VogQ3v" }, - "condition": "exists(turn.activity.text)", + "condition": "=exists(turn.activity.text)", "actions": [ { "$kind": "Microsoft.BeginDialog", @@ -629,7 +629,7 @@ "$designer": { "id": "RieQAx" }, - "condition": "exists($skillHandled) && $skillHandled == false", + "condition": "=exists($skillHandled) && $skillHandled == false", "actions": [ { "$kind": "Microsoft.TraceActivity", diff --git a/generators/generator-bot-enterprise-assistant/generators/app/templates/dialogs/ChitchatDialog/ChitchatDialog.dialog b/generators/generator-bot-enterprise-assistant/generators/app/templates/dialogs/ChitchatDialog/ChitchatDialog.dialog index 9342471af9..87ca6dd876 100644 --- a/generators/generator-bot-enterprise-assistant/generators/app/templates/dialogs/ChitchatDialog/ChitchatDialog.dialog +++ b/generators/generator-bot-enterprise-assistant/generators/app/templates/dialogs/ChitchatDialog/ChitchatDialog.dialog @@ -26,7 +26,7 @@ "$designer": { "id": "1mbleA" }, - "condition": "count(turn.recognized.answers[0].context.prompts) > 0", + "condition": "=count(turn.recognized.answers[0].context.prompts) > 0", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -67,7 +67,7 @@ "$designer": { "id": "qYZxID" }, - "condition": "turn.qnaMatchFromContext && count(turn.qnaMatchFromContext) > 0", + "condition": "=turn.qnaMatchFromContext && count(turn.qnaMatchFromContext) > 0", "actions": [ { "$kind": "Microsoft.SetProperty", diff --git a/generators/generator-bot-enterprise-calendar/generators/app/templates/botName.dialog b/generators/generator-bot-enterprise-calendar/generators/app/templates/botName.dialog index 555b2ac664..d1554a356e 100644 --- a/generators/generator-bot-enterprise-calendar/generators/app/templates/botName.dialog +++ b/generators/generator-bot-enterprise-calendar/generators/app/templates/botName.dialog @@ -27,7 +27,7 @@ "$designer": { "id": "25rJrE" }, - "condition": "= turn.activity.channelId == 'msteams' && turn.activity.conversation.conversationType != 'personal'", + "condition": "=turn.activity.channelId == 'msteams' && turn.activity.conversation.conversationType != 'personal'", "elseActions": [ { "$kind": "Microsoft.BeginDialog", @@ -411,7 +411,7 @@ ] } ], - "condition": "not(exists($options.start))" + "condition": "=not(exists($options.start))" }, { "$kind": "Microsoft.BeginDialog", @@ -484,7 +484,7 @@ ] } ], - "condition": "not(exists($options.start))" + "condition": "=not(exists($options.start))" }, { "$kind": "Microsoft.BeginDialog", @@ -550,7 +550,7 @@ ] } ], - "condition": "not(exists($options.start))" + "condition": "=not(exists($options.start))" }, { "$kind": "Microsoft.BeginDialog", @@ -580,7 +580,7 @@ "$designer": { "id": "ijHFYq" }, - "condition": "count($availabilityList) > 0", + "condition": "=count($availabilityList) > 0", "actions": [ { "$kind": "Microsoft.SendActivity", @@ -1732,7 +1732,7 @@ "$designer": { "id": "7mDmi7" }, - "condition": "exists(@duration)", + "condition": "=exists(@duration)", "actions": [ { "$kind": "Microsoft.BeginDialog", diff --git a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/CancelEventDialog/CancelEventDialog.dialog b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/CancelEventDialog/CancelEventDialog.dialog index 16ba486db1..02d750dd07 100644 --- a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/CancelEventDialog/CancelEventDialog.dialog +++ b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/CancelEventDialog/CancelEventDialog.dialog @@ -29,7 +29,7 @@ "$designer": { "id": "itkIrW" }, - "condition": "$event.IsOrganizer", + "condition": "=$event.IsOrganizer", "actions": [ { "$kind": "Microsoft.EmitEvent", @@ -86,7 +86,7 @@ "$designer": { "id": "9dab8n" }, - "condition": "$confirmation", + "condition": "=$confirmation", "actions": [ { "$kind": "Microsoft.BeginDialog", @@ -159,7 +159,7 @@ "$designer": { "id": "wF3uxS" }, - "condition": "$confirmation", + "condition": "=$confirmation", "actions": [ { "$kind": "Microsoft.BeginDialog", diff --git a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/CreateEventDialog/CreateEventDialog.dialog b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/CreateEventDialog/CreateEventDialog.dialog index d14fee964e..9c23300365 100644 --- a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/CreateEventDialog/CreateEventDialog.dialog +++ b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/CreateEventDialog/CreateEventDialog.dialog @@ -117,7 +117,7 @@ "$designer": { "id": "QBgXJe" }, - "condition": "turn.addLocation", + "condition": "=turn.addLocation", "actions": [ { "$kind": "Microsoft.EmitEvent", @@ -501,7 +501,7 @@ "$designer": { "id": "MGvqYl" }, - "condition": "not(exists($options.dateTime))", + "condition": "=not(exists($options.dateTime))", "actions": [ { "$kind": "Microsoft.DateTimeInput", @@ -969,7 +969,7 @@ "$designer": { "id": "m2E2Qw" }, - "condition": "turn.createConfirmResult", + "condition": "=turn.createConfirmResult", "actions": [ { "$kind": "Microsoft.BeginDialog", @@ -994,7 +994,7 @@ "$designer": { "id": "yt4PWR" }, - "condition": "exists($createEventResult)", + "condition": "=exists($createEventResult)", "actions": [ { "$kind": "Microsoft.SendActivity", diff --git a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/GetContactsDialog/GetContactsDialog.dialog b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/GetContactsDialog/GetContactsDialog.dialog index 3032637b73..9e733cb2b8 100644 --- a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/GetContactsDialog/GetContactsDialog.dialog +++ b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/GetContactsDialog/GetContactsDialog.dialog @@ -110,7 +110,7 @@ "allowLoop": false } ], - "condition": "not(exists(#Skip))" + "condition": "=not(exists(#Skip))" } ] }, @@ -144,7 +144,7 @@ "$designer": { "id": "pNZ1RI" }, - "condition": "not(exists($emailArray)) && not(exists($contactArray))", + "condition": "=not(exists($emailArray)) && not(exists($contactArray))", "actions": [ { "$kind": "Microsoft.TextInput", diff --git a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/GetEventsDialog/GetEventsDialog.dialog b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/GetEventsDialog/GetEventsDialog.dialog index 4b9cdb9ea3..5069755117 100644 --- a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/GetEventsDialog/GetEventsDialog.dialog +++ b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/GetEventsDialog/GetEventsDialog.dialog @@ -42,7 +42,7 @@ "$designer": { "id": "80CHa6" }, - "condition": "$parameters.eventId != null", + "condition": "=$parameters.eventId != null", "elseActions": [ { "$kind": "Microsoft.EmitEvent", @@ -73,7 +73,7 @@ "$designer": { "id": "1Zhz3U" }, - "condition": "count($events) > 0", + "condition": "=count($events) > 0", "elseActions": [ { "$kind": "Microsoft.EmitEvent", @@ -95,7 +95,7 @@ } ], "elseActions": [], - "condition": "$doSelection" + "condition": "=$doSelection" }, { "$kind": "Microsoft.EndDialog", @@ -167,7 +167,7 @@ "$designer": { "id": "1cNXeh" }, - "condition": "count(where(flatten($parameters), p, exists(p))) == 0", + "condition": "=count(where(flatten($parameters), p, exists(p))) == 0", "actions": [ { "$kind": "Microsoft.TextInput", @@ -219,7 +219,7 @@ "$designer": { "id": "nfaMkj" }, - "condition": "not(exists(@@contact)) && not(exists(@@email)) && not(exists(@subject)) && not(exists($options.start)) && not(exists($options.end))", + "condition": "=not(exists(@@contact)) && not(exists(@@email)) && not(exists(@subject)) && not(exists($options.start)) && not(exists($options.end))", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -250,7 +250,7 @@ "$designer": { "id": "YB34jG" }, - "condition": "not(exists($parameters.start))", + "condition": "=not(exists($parameters.start))", "actions": [ { "$kind": "Microsoft.SetProperties", @@ -390,7 +390,7 @@ "$designer": { "id": "KmSBRT" }, - "condition": "count($events) == 1", + "condition": "=count($events) == 1", "elseActions": [ { "$kind": "Microsoft.SetProperties", @@ -494,7 +494,7 @@ "$designer": { "id": "DM5U3G" }, - "condition": "$turnCount < 2", + "condition": "=$turnCount < 2", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -572,7 +572,7 @@ "$designer": { "id": "DG1RAS" }, - "condition": "turn.getSchedule", + "condition": "=turn.getSchedule", "actions": [ { "$kind": "Microsoft.DeleteProperty", diff --git a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/ListDialog/ListDialog.dialog b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/ListDialog/ListDialog.dialog index b379d20d4a..9d51498f72 100644 --- a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/ListDialog/ListDialog.dialog +++ b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/ListDialog/ListDialog.dialog @@ -36,7 +36,7 @@ "$designer": { "id": "NbCgE7" }, - "condition": "$doSelection", + "condition": "=$doSelection", "actions": [ { "$kind": "Microsoft.ChoiceInput", @@ -72,7 +72,7 @@ "$designer": { "id": "lIowZt" }, - "condition": "$selectedIndex != null", + "condition": "=$selectedIndex != null", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -239,7 +239,7 @@ "$designer": { "id": "P1awzy" }, - "condition": "$pageIndex * $pageSize < count($items)", + "condition": "=$pageIndex * $pageSize < count($items)", "actions": [ { "$kind": "Microsoft.SetProperties", @@ -347,7 +347,7 @@ "$designer": { "id": "UVQphx" }, - "condition": "$pageIndex >= 0", + "condition": "=$pageIndex >= 0", "actions": [ { "$kind": "Microsoft.SetProperties", diff --git a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/ResolveDateTimeDialog/ResolveDateTimeDialog.dialog b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/ResolveDateTimeDialog/ResolveDateTimeDialog.dialog index c1d4474048..3cd50b95d5 100644 --- a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/ResolveDateTimeDialog/ResolveDateTimeDialog.dialog +++ b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/ResolveDateTimeDialog/ResolveDateTimeDialog.dialog @@ -77,7 +77,7 @@ "$designer": { "id": "vwdsTV" }, - "condition": "toLower($foreach.value.text) == \"my day\" || $foreach.value.typeName == \"datetimeV2.set\"", + "condition": "=toLower($foreach.value.text) == \"my day\" || $foreach.value.typeName == \"datetimeV2.set\"", "actions": [ { "$kind": "Microsoft.ContinueLoop", @@ -130,7 +130,7 @@ "$designer": { "id": "wUbrlv" }, - "condition": "count($foreach.value.Resolution.values) == 1", + "condition": "=count($foreach.value.Resolution.values) == 1", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -298,7 +298,7 @@ "$designer": { "id": "IQInq1" }, - "condition": "$minDate != null && ticks(formatDateTime($foreach.value.value)) < ticks(formatDateTime(date($minDate)))", + "condition": "=$minDate != null && ticks(formatDateTime($foreach.value.value)) < ticks(formatDateTime(date($minDate)))", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -325,7 +325,7 @@ "$designer": { "id": "Xv3qc4" }, - "condition": "$foreach.skip != true", + "condition": "=$foreach.skip != true", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -353,14 +353,14 @@ "$designer": { "id": "Kxsxdt" }, - "condition": "$choices != null", + "condition": "=$choices != null", "actions": [ { "$kind": "Microsoft.IfCondition", "$designer": { "id": "rxH6X0" }, - "condition": "count($choices) == 1", + "condition": "=count($choices) == 1", "elseActions": [ { "$kind": "Microsoft.ChoiceInput", @@ -449,7 +449,7 @@ "$designer": { "id": "4nSPCc" }, - "condition": "$minDate != null && ticks(formatDateTime($foreach.value.value)) < ticks(formatDateTime($minDate))", + "condition": "=$minDate != null && ticks(formatDateTime($foreach.value.value)) < ticks(formatDateTime($minDate))", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -476,7 +476,7 @@ "$designer": { "id": "bYsQ7q" }, - "condition": "$foreach.skip != true", + "condition": "=$foreach.skip != true", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -504,14 +504,14 @@ "$designer": { "id": "OqJa6A" }, - "condition": "$choices != null", + "condition": "=$choices != null", "actions": [ { "$kind": "Microsoft.IfCondition", "$designer": { "id": "QhjFD1" }, - "condition": "count($choices) == 1", + "condition": "=count($choices) == 1", "elseActions": [ { "$kind": "Microsoft.ChoiceInput", diff --git a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/RespondToEventDialog/RespondToEventDialog.dialog b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/RespondToEventDialog/RespondToEventDialog.dialog index 6d2f99b861..ac2d820972 100644 --- a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/RespondToEventDialog/RespondToEventDialog.dialog +++ b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/RespondToEventDialog/RespondToEventDialog.dialog @@ -92,7 +92,7 @@ "$designer": { "id": "Jhz67U" }, - "condition": "$event.isOrganizer", + "condition": "=$event.isOrganizer", "actions": [ { "$kind": "Microsoft.SendActivity", @@ -164,7 +164,7 @@ "$designer": { "id": "0I6DX5" }, - "condition": "$event.isOrganizer", + "condition": "=$event.isOrganizer", "actions": [ { "$kind": "Microsoft.SendActivity", @@ -241,7 +241,7 @@ "$designer": { "id": "1elpcm" }, - "condition": "$event.isOrganizer", + "condition": "=$event.isOrganizer", "actions": [ { "$kind": "Microsoft.SendActivity", diff --git a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/ShowEventsDialog/ShowEventsDialog.dialog b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/ShowEventsDialog/ShowEventsDialog.dialog index 4f9aa8a980..6d0aa9a815 100644 --- a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/ShowEventsDialog/ShowEventsDialog.dialog +++ b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/ShowEventsDialog/ShowEventsDialog.dialog @@ -57,7 +57,7 @@ "eventName": "ShowResults" } ], - "condition": "exists($options.eventId)", + "condition": "=exists($options.eventId)", "actions": [ { "$kind": "Microsoft.EmitEvent", @@ -98,7 +98,7 @@ ] } ], - "condition": "count(where(flatten($options), o, exists(o))) == 0" + "condition": "=count(where(flatten($options), o, exists(o))) == 0" }, { "$kind": "Microsoft.IfCondition", @@ -112,7 +112,7 @@ "$designer": { "id": "ZDxmgI" }, - "condition": "not(exists($options.subject)) && not(exists($options.contactArray)) && not(exists($options.emailArray)) && not(exists($options.ordinal))", + "condition": "=not(exists($options.subject)) && not(exists($options.contactArray)) && not(exists($options.emailArray)) && not(exists($options.ordinal))", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -156,14 +156,14 @@ "$designer": { "id": "Xad3Vv" }, - "condition": "exists($options.subject) || exists($options.contactArray) || exists($options.emailArray) || exists($options.location) || exists($options.ordinal)", + "condition": "=exists($options.subject) || exists($options.contactArray) || exists($options.emailArray) || exists($options.location) || exists($options.ordinal)", "actions": [ { "$kind": "Microsoft.IfCondition", "$designer": { "id": "JGLah7" }, - "condition": "count($events) > 1", + "condition": "=count($events) > 1", "elseActions": [ { "$kind": "Microsoft.EmitEvent", @@ -266,7 +266,7 @@ "$designer": { "id": "cLApQW" }, - "condition": "count($events) > 0", + "condition": "=count($events) > 0", "actions": [ { "$kind": "Microsoft.SendActivity", diff --git a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/UpdateEventDialog/UpdateEventDialog.dialog b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/UpdateEventDialog/UpdateEventDialog.dialog index 8af4b0a63e..ea89a667c5 100644 --- a/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/UpdateEventDialog/UpdateEventDialog.dialog +++ b/generators/generator-bot-enterprise-calendar/generators/app/templates/dialogs/UpdateEventDialog/UpdateEventDialog.dialog @@ -298,7 +298,7 @@ "$designer": { "id": "M19ih4" }, - "condition": "turn.repeat", + "condition": "=turn.repeat", "actions": [ { "$kind": "Microsoft.DeleteProperties", @@ -518,7 +518,7 @@ "$designer": { "id": "h0lIzs" }, - "condition": "count(turn.removeAttendees) == 1", + "condition": "=count(turn.removeAttendees) == 1", "elseActions": [ { "$kind": "Microsoft.SetProperties", @@ -1172,7 +1172,7 @@ "$designer": { "id": "7VJVuF" }, - "condition": "$confirmUpdate", + "condition": "=$confirmUpdate", "actions": [ { "$kind": "Microsoft.BeginDialog", @@ -1196,7 +1196,7 @@ "$designer": { "id": "fhRoY7" }, - "condition": "$result.statusCode == \"OK\"", + "condition": "=$result.statusCode == \"OK\"", "actions": [ { "$kind": "Microsoft.SendActivity", diff --git a/generators/generator-bot-enterprise-people/generators/app/templates/botName.dialog b/generators/generator-bot-enterprise-people/generators/app/templates/botName.dialog index c391813b76..b04304cfa6 100644 --- a/generators/generator-bot-enterprise-people/generators/app/templates/botName.dialog +++ b/generators/generator-bot-enterprise-people/generators/app/templates/botName.dialog @@ -29,7 +29,7 @@ "$designer": { "id": "2Szxt3" }, - "condition": "= turn.activity.channelId == 'msteams' && turn.activity.conversation.conversationType != 'personal'", + "condition": "=turn.activity.channelId == 'msteams' && turn.activity.conversation.conversationType != 'personal'", "elseActions": [ { "$kind": "Microsoft.BeginDialog", diff --git a/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetProfileDialog/GetProfileDialog.dialog b/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetProfileDialog/GetProfileDialog.dialog index 7559d2e258..201194c742 100644 --- a/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetProfileDialog/GetProfileDialog.dialog +++ b/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetProfileDialog/GetProfileDialog.dialog @@ -37,7 +37,7 @@ "$designer": { "id": "rqPdz8" }, - "condition": "= not(exists($UserIdFound))", + "condition": "=not(exists($UserIdFound))", "actions": [ { "$kind": "Microsoft.BeginDialog", @@ -84,7 +84,7 @@ "$designer": { "id": "hFpZL4" }, - "condition": "= exists($UserIdFound)", + "condition": "=exists($UserIdFound)", "actions": [ { "$kind": "Microsoft.Graph.User.GetUserProfile", diff --git a/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/ListDialog/ListDialog.dialog b/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/ListDialog/ListDialog.dialog index bb39c34d3b..c9e6dfb44d 100644 --- a/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/ListDialog/ListDialog.dialog +++ b/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/ListDialog/ListDialog.dialog @@ -51,7 +51,7 @@ "$designer": { "id": "siTpSb" }, - "condition": "$autoChooseFirst && count(turn.Items) == 1", + "condition": "=$autoChooseFirst && count(turn.Items) == 1", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -110,7 +110,7 @@ "$designer": { "id": "lIowZt" }, - "condition": "turn.selectedIndex != null", + "condition": "=turn.selectedIndex != null", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -325,7 +325,7 @@ "$designer": { "id": "P1awzy" }, - "condition": "$pageIndex * $pageSize < $itemCount", + "condition": "=$pageIndex * $pageSize < $itemCount", "actions": [ { "$kind": "Microsoft.SetProperties", @@ -441,7 +441,7 @@ "$designer": { "id": "UVQphx" }, - "condition": "$pageIndex >= 0", + "condition": "=$pageIndex >= 0", "actions": [ { "$kind": "Microsoft.SetProperties", diff --git a/generators/generator-bot-template-generator/app/templates/generators/app/templates/emptyBot.dialog b/generators/generator-bot-template-generator/app/templates/generators/app/templates/emptyBot.dialog index a18ca53eec..0d5c560a73 100644 --- a/generators/generator-bot-template-generator/app/templates/generators/app/templates/emptyBot.dialog +++ b/generators/generator-bot-template-generator/app/templates/generators/app/templates/emptyBot.dialog @@ -28,7 +28,7 @@ "id": "641773", "name": "Branch: if/else" }, - "condition": "string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)", + "condition": "=string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)", "actions": [ { "$kind": "Microsoft.SendActivity", From c90120a5f9608355188c03325c42f2a5ec828f1a Mon Sep 17 00:00:00 2001 From: Lauren Mills Date: Wed, 30 Jun 2021 14:53:48 -0700 Subject: [PATCH 2/4] update ifConditions in dev projects --- .../Calendar/Calendar/Calendar.dialog | 10 +++++----- .../CancelEventDialog.dialog | 6 +++--- .../CreateEventDialog.dialog | 8 ++++---- .../GetContactsDialog.dialog | 4 ++-- .../GetEventsDialog/GetEventsDialog.dialog | 16 +++++++-------- .../dialogs/ListDialog/ListDialog.dialog | 8 ++++---- .../ResolveDateTimeDialog.dialog | 20 +++++++++---------- .../RespondToEventDialog.dialog | 6 +++--- .../ShowEventsDialog/ShowEventsDialog.dialog | 12 +++++------ .../UpdateEventDialog.dialog | 8 ++++---- .../declarative/People/People/People.dialog | 2 +- .../GetProfileDialog/GetProfileDialog.dialog | 4 ++-- .../dialogs/ListDialog/ListDialog.dialog | 8 ++++---- 13 files changed, 56 insertions(+), 56 deletions(-) diff --git a/skills/declarative/Calendar/Calendar/Calendar.dialog b/skills/declarative/Calendar/Calendar/Calendar.dialog index 80b8a65275..93641f3015 100644 --- a/skills/declarative/Calendar/Calendar/Calendar.dialog +++ b/skills/declarative/Calendar/Calendar/Calendar.dialog @@ -27,7 +27,7 @@ "$designer": { "id": "25rJrE" }, - "condition": "= turn.activity.channelId == 'msteams' && turn.activity.conversation.conversationType != 'personal'", + "condition": "=turn.activity.channelId == 'msteams' && turn.activity.conversation.conversationType != 'personal'", "elseActions": [ { "$kind": "Microsoft.BeginDialog", @@ -484,7 +484,7 @@ ] } ], - "condition": "not(exists($options.start))" + "condition": "=not(exists($options.start))" }, { "$kind": "Microsoft.BeginDialog", @@ -550,7 +550,7 @@ ] } ], - "condition": "not(exists($options.start))" + "condition": "=not(exists($options.start))" }, { "$kind": "Microsoft.BeginDialog", @@ -580,7 +580,7 @@ "$designer": { "id": "ijHFYq" }, - "condition": "count($availabilityList) > 0", + "condition": "=count($availabilityList) > 0", "actions": [ { "$kind": "Microsoft.SendActivity", @@ -1732,7 +1732,7 @@ "$designer": { "id": "7mDmi7" }, - "condition": "exists(@duration)", + "condition": "=exists(@duration)", "actions": [ { "$kind": "Microsoft.BeginDialog", diff --git a/skills/declarative/Calendar/Calendar/dialogs/CancelEventDialog/CancelEventDialog.dialog b/skills/declarative/Calendar/Calendar/dialogs/CancelEventDialog/CancelEventDialog.dialog index 16ba486db1..02d750dd07 100644 --- a/skills/declarative/Calendar/Calendar/dialogs/CancelEventDialog/CancelEventDialog.dialog +++ b/skills/declarative/Calendar/Calendar/dialogs/CancelEventDialog/CancelEventDialog.dialog @@ -29,7 +29,7 @@ "$designer": { "id": "itkIrW" }, - "condition": "$event.IsOrganizer", + "condition": "=$event.IsOrganizer", "actions": [ { "$kind": "Microsoft.EmitEvent", @@ -86,7 +86,7 @@ "$designer": { "id": "9dab8n" }, - "condition": "$confirmation", + "condition": "=$confirmation", "actions": [ { "$kind": "Microsoft.BeginDialog", @@ -159,7 +159,7 @@ "$designer": { "id": "wF3uxS" }, - "condition": "$confirmation", + "condition": "=$confirmation", "actions": [ { "$kind": "Microsoft.BeginDialog", diff --git a/skills/declarative/Calendar/Calendar/dialogs/CreateEventDialog/CreateEventDialog.dialog b/skills/declarative/Calendar/Calendar/dialogs/CreateEventDialog/CreateEventDialog.dialog index d14fee964e..9c23300365 100644 --- a/skills/declarative/Calendar/Calendar/dialogs/CreateEventDialog/CreateEventDialog.dialog +++ b/skills/declarative/Calendar/Calendar/dialogs/CreateEventDialog/CreateEventDialog.dialog @@ -117,7 +117,7 @@ "$designer": { "id": "QBgXJe" }, - "condition": "turn.addLocation", + "condition": "=turn.addLocation", "actions": [ { "$kind": "Microsoft.EmitEvent", @@ -501,7 +501,7 @@ "$designer": { "id": "MGvqYl" }, - "condition": "not(exists($options.dateTime))", + "condition": "=not(exists($options.dateTime))", "actions": [ { "$kind": "Microsoft.DateTimeInput", @@ -969,7 +969,7 @@ "$designer": { "id": "m2E2Qw" }, - "condition": "turn.createConfirmResult", + "condition": "=turn.createConfirmResult", "actions": [ { "$kind": "Microsoft.BeginDialog", @@ -994,7 +994,7 @@ "$designer": { "id": "yt4PWR" }, - "condition": "exists($createEventResult)", + "condition": "=exists($createEventResult)", "actions": [ { "$kind": "Microsoft.SendActivity", diff --git a/skills/declarative/Calendar/Calendar/dialogs/GetContactsDialog/GetContactsDialog.dialog b/skills/declarative/Calendar/Calendar/dialogs/GetContactsDialog/GetContactsDialog.dialog index 3032637b73..9e733cb2b8 100644 --- a/skills/declarative/Calendar/Calendar/dialogs/GetContactsDialog/GetContactsDialog.dialog +++ b/skills/declarative/Calendar/Calendar/dialogs/GetContactsDialog/GetContactsDialog.dialog @@ -110,7 +110,7 @@ "allowLoop": false } ], - "condition": "not(exists(#Skip))" + "condition": "=not(exists(#Skip))" } ] }, @@ -144,7 +144,7 @@ "$designer": { "id": "pNZ1RI" }, - "condition": "not(exists($emailArray)) && not(exists($contactArray))", + "condition": "=not(exists($emailArray)) && not(exists($contactArray))", "actions": [ { "$kind": "Microsoft.TextInput", diff --git a/skills/declarative/Calendar/Calendar/dialogs/GetEventsDialog/GetEventsDialog.dialog b/skills/declarative/Calendar/Calendar/dialogs/GetEventsDialog/GetEventsDialog.dialog index 734fd9290f..c70b5238a3 100644 --- a/skills/declarative/Calendar/Calendar/dialogs/GetEventsDialog/GetEventsDialog.dialog +++ b/skills/declarative/Calendar/Calendar/dialogs/GetEventsDialog/GetEventsDialog.dialog @@ -42,7 +42,7 @@ "$designer": { "id": "80CHa6" }, - "condition": "$parameters.eventId != null", + "condition": "=$parameters.eventId != null", "elseActions": [ { "$kind": "Microsoft.EmitEvent", @@ -73,7 +73,7 @@ "$designer": { "id": "1Zhz3U" }, - "condition": "count($events) > 0", + "condition": "=count($events) > 0", "elseActions": [ { "$kind": "Microsoft.EmitEvent", @@ -167,7 +167,7 @@ "$designer": { "id": "1cNXeh" }, - "condition": "count(where(flatten($parameters), p, exists(p))) == 0", + "condition": "=count(where(flatten($parameters), p, exists(p))) == 0", "actions": [ { "$kind": "Microsoft.TextInput", @@ -219,7 +219,7 @@ "$designer": { "id": "nfaMkj" }, - "condition": "not(exists(@@contact)) && not(exists(@@email)) && not(exists(@subject)) && not(exists($options.start)) && not(exists($options.end))", + "condition": "=not(exists(@@contact)) && not(exists(@@email)) && not(exists(@subject)) && not(exists($options.start)) && not(exists($options.end))", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -250,7 +250,7 @@ "$designer": { "id": "YB34jG" }, - "condition": "not(exists($parameters.start))", + "condition": "=not(exists($parameters.start))", "actions": [ { "$kind": "Microsoft.SetProperties", @@ -390,7 +390,7 @@ "$designer": { "id": "KmSBRT" }, - "condition": "count($events) == 1", + "condition": "=count($events) == 1", "elseActions": [ { "$kind": "Microsoft.SetProperties", @@ -494,7 +494,7 @@ "$designer": { "id": "DM5U3G" }, - "condition": "$turnCount < 2", + "condition": "=$turnCount < 2", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -572,7 +572,7 @@ "$designer": { "id": "DG1RAS" }, - "condition": "turn.getSchedule", + "condition": "=turn.getSchedule", "actions": [ { "$kind": "Microsoft.DeleteProperty", diff --git a/skills/declarative/Calendar/Calendar/dialogs/ListDialog/ListDialog.dialog b/skills/declarative/Calendar/Calendar/dialogs/ListDialog/ListDialog.dialog index b379d20d4a..9d51498f72 100644 --- a/skills/declarative/Calendar/Calendar/dialogs/ListDialog/ListDialog.dialog +++ b/skills/declarative/Calendar/Calendar/dialogs/ListDialog/ListDialog.dialog @@ -36,7 +36,7 @@ "$designer": { "id": "NbCgE7" }, - "condition": "$doSelection", + "condition": "=$doSelection", "actions": [ { "$kind": "Microsoft.ChoiceInput", @@ -72,7 +72,7 @@ "$designer": { "id": "lIowZt" }, - "condition": "$selectedIndex != null", + "condition": "=$selectedIndex != null", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -239,7 +239,7 @@ "$designer": { "id": "P1awzy" }, - "condition": "$pageIndex * $pageSize < count($items)", + "condition": "=$pageIndex * $pageSize < count($items)", "actions": [ { "$kind": "Microsoft.SetProperties", @@ -347,7 +347,7 @@ "$designer": { "id": "UVQphx" }, - "condition": "$pageIndex >= 0", + "condition": "=$pageIndex >= 0", "actions": [ { "$kind": "Microsoft.SetProperties", diff --git a/skills/declarative/Calendar/Calendar/dialogs/ResolveDateTimeDialog/ResolveDateTimeDialog.dialog b/skills/declarative/Calendar/Calendar/dialogs/ResolveDateTimeDialog/ResolveDateTimeDialog.dialog index c1d4474048..3cd50b95d5 100644 --- a/skills/declarative/Calendar/Calendar/dialogs/ResolveDateTimeDialog/ResolveDateTimeDialog.dialog +++ b/skills/declarative/Calendar/Calendar/dialogs/ResolveDateTimeDialog/ResolveDateTimeDialog.dialog @@ -77,7 +77,7 @@ "$designer": { "id": "vwdsTV" }, - "condition": "toLower($foreach.value.text) == \"my day\" || $foreach.value.typeName == \"datetimeV2.set\"", + "condition": "=toLower($foreach.value.text) == \"my day\" || $foreach.value.typeName == \"datetimeV2.set\"", "actions": [ { "$kind": "Microsoft.ContinueLoop", @@ -130,7 +130,7 @@ "$designer": { "id": "wUbrlv" }, - "condition": "count($foreach.value.Resolution.values) == 1", + "condition": "=count($foreach.value.Resolution.values) == 1", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -298,7 +298,7 @@ "$designer": { "id": "IQInq1" }, - "condition": "$minDate != null && ticks(formatDateTime($foreach.value.value)) < ticks(formatDateTime(date($minDate)))", + "condition": "=$minDate != null && ticks(formatDateTime($foreach.value.value)) < ticks(formatDateTime(date($minDate)))", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -325,7 +325,7 @@ "$designer": { "id": "Xv3qc4" }, - "condition": "$foreach.skip != true", + "condition": "=$foreach.skip != true", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -353,14 +353,14 @@ "$designer": { "id": "Kxsxdt" }, - "condition": "$choices != null", + "condition": "=$choices != null", "actions": [ { "$kind": "Microsoft.IfCondition", "$designer": { "id": "rxH6X0" }, - "condition": "count($choices) == 1", + "condition": "=count($choices) == 1", "elseActions": [ { "$kind": "Microsoft.ChoiceInput", @@ -449,7 +449,7 @@ "$designer": { "id": "4nSPCc" }, - "condition": "$minDate != null && ticks(formatDateTime($foreach.value.value)) < ticks(formatDateTime($minDate))", + "condition": "=$minDate != null && ticks(formatDateTime($foreach.value.value)) < ticks(formatDateTime($minDate))", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -476,7 +476,7 @@ "$designer": { "id": "bYsQ7q" }, - "condition": "$foreach.skip != true", + "condition": "=$foreach.skip != true", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -504,14 +504,14 @@ "$designer": { "id": "OqJa6A" }, - "condition": "$choices != null", + "condition": "=$choices != null", "actions": [ { "$kind": "Microsoft.IfCondition", "$designer": { "id": "QhjFD1" }, - "condition": "count($choices) == 1", + "condition": "=count($choices) == 1", "elseActions": [ { "$kind": "Microsoft.ChoiceInput", diff --git a/skills/declarative/Calendar/Calendar/dialogs/RespondToEventDialog/RespondToEventDialog.dialog b/skills/declarative/Calendar/Calendar/dialogs/RespondToEventDialog/RespondToEventDialog.dialog index 6d2f99b861..ac2d820972 100644 --- a/skills/declarative/Calendar/Calendar/dialogs/RespondToEventDialog/RespondToEventDialog.dialog +++ b/skills/declarative/Calendar/Calendar/dialogs/RespondToEventDialog/RespondToEventDialog.dialog @@ -92,7 +92,7 @@ "$designer": { "id": "Jhz67U" }, - "condition": "$event.isOrganizer", + "condition": "=$event.isOrganizer", "actions": [ { "$kind": "Microsoft.SendActivity", @@ -164,7 +164,7 @@ "$designer": { "id": "0I6DX5" }, - "condition": "$event.isOrganizer", + "condition": "=$event.isOrganizer", "actions": [ { "$kind": "Microsoft.SendActivity", @@ -241,7 +241,7 @@ "$designer": { "id": "1elpcm" }, - "condition": "$event.isOrganizer", + "condition": "=$event.isOrganizer", "actions": [ { "$kind": "Microsoft.SendActivity", diff --git a/skills/declarative/Calendar/Calendar/dialogs/ShowEventsDialog/ShowEventsDialog.dialog b/skills/declarative/Calendar/Calendar/dialogs/ShowEventsDialog/ShowEventsDialog.dialog index 4f9aa8a980..6d0aa9a815 100644 --- a/skills/declarative/Calendar/Calendar/dialogs/ShowEventsDialog/ShowEventsDialog.dialog +++ b/skills/declarative/Calendar/Calendar/dialogs/ShowEventsDialog/ShowEventsDialog.dialog @@ -57,7 +57,7 @@ "eventName": "ShowResults" } ], - "condition": "exists($options.eventId)", + "condition": "=exists($options.eventId)", "actions": [ { "$kind": "Microsoft.EmitEvent", @@ -98,7 +98,7 @@ ] } ], - "condition": "count(where(flatten($options), o, exists(o))) == 0" + "condition": "=count(where(flatten($options), o, exists(o))) == 0" }, { "$kind": "Microsoft.IfCondition", @@ -112,7 +112,7 @@ "$designer": { "id": "ZDxmgI" }, - "condition": "not(exists($options.subject)) && not(exists($options.contactArray)) && not(exists($options.emailArray)) && not(exists($options.ordinal))", + "condition": "=not(exists($options.subject)) && not(exists($options.contactArray)) && not(exists($options.emailArray)) && not(exists($options.ordinal))", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -156,14 +156,14 @@ "$designer": { "id": "Xad3Vv" }, - "condition": "exists($options.subject) || exists($options.contactArray) || exists($options.emailArray) || exists($options.location) || exists($options.ordinal)", + "condition": "=exists($options.subject) || exists($options.contactArray) || exists($options.emailArray) || exists($options.location) || exists($options.ordinal)", "actions": [ { "$kind": "Microsoft.IfCondition", "$designer": { "id": "JGLah7" }, - "condition": "count($events) > 1", + "condition": "=count($events) > 1", "elseActions": [ { "$kind": "Microsoft.EmitEvent", @@ -266,7 +266,7 @@ "$designer": { "id": "cLApQW" }, - "condition": "count($events) > 0", + "condition": "=count($events) > 0", "actions": [ { "$kind": "Microsoft.SendActivity", diff --git a/skills/declarative/Calendar/Calendar/dialogs/UpdateEventDialog/UpdateEventDialog.dialog b/skills/declarative/Calendar/Calendar/dialogs/UpdateEventDialog/UpdateEventDialog.dialog index 8af4b0a63e..ea89a667c5 100644 --- a/skills/declarative/Calendar/Calendar/dialogs/UpdateEventDialog/UpdateEventDialog.dialog +++ b/skills/declarative/Calendar/Calendar/dialogs/UpdateEventDialog/UpdateEventDialog.dialog @@ -298,7 +298,7 @@ "$designer": { "id": "M19ih4" }, - "condition": "turn.repeat", + "condition": "=turn.repeat", "actions": [ { "$kind": "Microsoft.DeleteProperties", @@ -518,7 +518,7 @@ "$designer": { "id": "h0lIzs" }, - "condition": "count(turn.removeAttendees) == 1", + "condition": "=count(turn.removeAttendees) == 1", "elseActions": [ { "$kind": "Microsoft.SetProperties", @@ -1172,7 +1172,7 @@ "$designer": { "id": "7VJVuF" }, - "condition": "$confirmUpdate", + "condition": "=$confirmUpdate", "actions": [ { "$kind": "Microsoft.BeginDialog", @@ -1196,7 +1196,7 @@ "$designer": { "id": "fhRoY7" }, - "condition": "$result.statusCode == \"OK\"", + "condition": "=$result.statusCode == \"OK\"", "actions": [ { "$kind": "Microsoft.SendActivity", diff --git a/skills/declarative/People/People/People.dialog b/skills/declarative/People/People/People.dialog index a69bc39d22..91d93585aa 100644 --- a/skills/declarative/People/People/People.dialog +++ b/skills/declarative/People/People/People.dialog @@ -29,7 +29,7 @@ "$designer": { "id": "2Szxt3" }, - "condition": "= turn.activity.channelId == 'msteams' && turn.activity.conversation.conversationType != 'personal'", + "condition": "=turn.activity.channelId == 'msteams' && turn.activity.conversation.conversationType != 'personal'", "elseActions": [ { "$kind": "Microsoft.BeginDialog", diff --git a/skills/declarative/People/People/dialogs/GetProfileDialog/GetProfileDialog.dialog b/skills/declarative/People/People/dialogs/GetProfileDialog/GetProfileDialog.dialog index 1331d3fb1f..3d9713b854 100644 --- a/skills/declarative/People/People/dialogs/GetProfileDialog/GetProfileDialog.dialog +++ b/skills/declarative/People/People/dialogs/GetProfileDialog/GetProfileDialog.dialog @@ -37,7 +37,7 @@ "$designer": { "id": "rqPdz8" }, - "condition": "= not(exists($UserIdFound))", + "condition": "=not(exists($UserIdFound))", "actions": [ { "$kind": "Microsoft.BeginDialog", @@ -84,7 +84,7 @@ "$designer": { "id": "hFpZL4" }, - "condition": "= exists($UserIdFound)", + "condition": "=exists($UserIdFound)", "actions": [ { "$kind": "Microsoft.Graph.User.GetUserProfile", diff --git a/skills/declarative/People/People/dialogs/ListDialog/ListDialog.dialog b/skills/declarative/People/People/dialogs/ListDialog/ListDialog.dialog index 648d9a23af..4dfa936e9e 100644 --- a/skills/declarative/People/People/dialogs/ListDialog/ListDialog.dialog +++ b/skills/declarative/People/People/dialogs/ListDialog/ListDialog.dialog @@ -51,7 +51,7 @@ "$designer": { "id": "siTpSb" }, - "condition": "$autoChooseFirst && count(turn.Items) == 1", + "condition": "=$autoChooseFirst && count(turn.Items) == 1", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -110,7 +110,7 @@ "$designer": { "id": "lIowZt" }, - "condition": "turn.selectedIndex != null", + "condition": "=turn.selectedIndex != null", "actions": [ { "$kind": "Microsoft.SetProperty", @@ -325,7 +325,7 @@ "$designer": { "id": "P1awzy" }, - "condition": "$pageIndex * $pageSize < $itemCount", + "condition": "=$pageIndex * $pageSize < $itemCount", "actions": [ { "$kind": "Microsoft.SetProperties", @@ -441,7 +441,7 @@ "$designer": { "id": "UVQphx" }, - "condition": "$pageIndex >= 0", + "condition": "=$pageIndex >= 0", "actions": [ { "$kind": "Microsoft.SetProperties", From 68f5a8fbf622668bea9b5cd1aec39e17bfac655f Mon Sep 17 00:00:00 2001 From: Lauren Mills Date: Wed, 30 Jun 2021 14:57:23 -0700 Subject: [PATCH 3/4] remove extraneous schema files and properties --- .../generators/app/templates/botName.dialog | 1 - .../generators/app/templates/botName.dialog | 1 - .../generators/app/templates/botName.dialog | 1 - .../GetManagerDialog.dialog.schema | 11 ---- .../GetProfileDialog.dialog.schema | 51 ------------------- .../ResolveUserDialog.dialog.schema | 51 ------------------- .../Calendar/Calendar/Calendar.dialog | 1 - .../declarative/People/People/People.dialog | 1 - 8 files changed, 118 deletions(-) delete mode 100644 generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetManagerDialog/GetManagerDialog.dialog.schema delete mode 100644 generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetProfileDialog/GetProfileDialog.dialog.schema delete mode 100644 generators/generator-bot-enterprise-people/generators/app/templates/dialogs/ResolveUserDialog/ResolveUserDialog.dialog.schema diff --git a/generators/generator-bot-enterprise-assistant/generators/app/templates/botName.dialog b/generators/generator-bot-enterprise-assistant/generators/app/templates/botName.dialog index b666f90576..e972b9019a 100644 --- a/generators/generator-bot-enterprise-assistant/generators/app/templates/botName.dialog +++ b/generators/generator-bot-enterprise-assistant/generators/app/templates/botName.dialog @@ -651,7 +651,6 @@ ] } ], - "$schema": "https://raw.githubusercontent.com/microsoft/BotFramework-Composer/stable/Composer/packages/server/schemas/sdk.schema", "generator": "<%= botName %>.lg", "id": "<%= botName %>", "recognizer": "<%= botName %>.lu.qna" diff --git a/generators/generator-bot-enterprise-calendar/generators/app/templates/botName.dialog b/generators/generator-bot-enterprise-calendar/generators/app/templates/botName.dialog index d1554a356e..7be4d34752 100644 --- a/generators/generator-bot-enterprise-calendar/generators/app/templates/botName.dialog +++ b/generators/generator-bot-enterprise-calendar/generators/app/templates/botName.dialog @@ -1820,7 +1820,6 @@ "runOnce": true } ], - "$schema": "https://raw.githubusercontent.com/microsoft/BotFramework-Composer/stable/Composer/packages/server/schemas/sdk.schema", "generator": "<%= botName %>.lg", "recognizer": "<%= botName %>.lu.qna", "id": "<%= botName %>" diff --git a/generators/generator-bot-enterprise-people/generators/app/templates/botName.dialog b/generators/generator-bot-enterprise-people/generators/app/templates/botName.dialog index b04304cfa6..29cc056513 100644 --- a/generators/generator-bot-enterprise-people/generators/app/templates/botName.dialog +++ b/generators/generator-bot-enterprise-people/generators/app/templates/botName.dialog @@ -626,7 +626,6 @@ ] } ], - "$schema": "https://raw.githubusercontent.com/microsoft/BotFramework-Composer/stable/Composer/packages/server/schemas/sdk.schema", "generator": "<%= botName %>.lg", "id": "<%= botName %>", "recognizer": "<%= botName %>.lu.qna" diff --git a/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetManagerDialog/GetManagerDialog.dialog.schema b/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetManagerDialog/GetManagerDialog.dialog.schema deleted file mode 100644 index 20c0b9ba43..0000000000 --- a/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetManagerDialog/GetManagerDialog.dialog.schema +++ /dev/null @@ -1,11 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema", - "$role": "implements(Microsoft.IDialog)", - "title": "GetManagerDialog", - "type": "object", - "properties": {}, - "$result": { - "type": "object", - "properties": {} - } -} \ No newline at end of file diff --git a/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetProfileDialog/GetProfileDialog.dialog.schema b/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetProfileDialog/GetProfileDialog.dialog.schema deleted file mode 100644 index 4e884252bb..0000000000 --- a/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetProfileDialog/GetProfileDialog.dialog.schema +++ /dev/null @@ -1,51 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema", - "$role": "implements(Microsoft.IDialog)", - "title": "GetProfileDialog", - "type": "object", - "properties": { - "nameEntity": { - "description": "Name entity to search", - "$ref": "#/definitions/stringExpression", - "title": "Name Entity" - } - }, - "$result": { - "type": "object", - "properties": {} - }, - "definitions": { - "equalsExpression": { - "$role": "expression", - "type": "string", - "title": "Equals Expression", - "description": "Expression starting with =.", - "pattern": "^=.*\\S.*", - "examples": [ - "=user.name" - ] - }, - "stringExpression": { - "$role": "expression", - "title": "String or expression", - "description": "Interpolated string or expression to evaluate.", - "oneOf": [ - { - "type": "string", - "title": "String", - "description": "Interpolated string", - "pattern": "^(?!(=)).*", - "examples": [ - "Hello ${user.name}" - ] - }, - { - "$ref": "#/definitions/equalsExpression", - "examples": [ - "=concat('x','y','z')" - ] - } - ] - } - } -} diff --git a/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/ResolveUserDialog/ResolveUserDialog.dialog.schema b/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/ResolveUserDialog/ResolveUserDialog.dialog.schema deleted file mode 100644 index e8d29d691f..0000000000 --- a/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/ResolveUserDialog/ResolveUserDialog.dialog.schema +++ /dev/null @@ -1,51 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema", - "$role": "implements(Microsoft.IDialog)", - "title": "ResolveUserDialog", - "type": "object", - "properties": { - "UserIdFound": { - "title": "User Id Found", - "description": "Id of the user to look for", - "$ref": "#/definitions/stringExpression" - } - }, - "$result": { - "type": "object", - "properties": {} - }, - "definitions": { - "equalsExpression": { - "$role": "expression", - "type": "string", - "title": "Equals Expression", - "description": "Expression starting with =.", - "pattern": "^=.*\\S.*", - "examples": [ - "=user.name" - ] - }, - "stringExpression": { - "$role": "expression", - "title": "String or expression", - "description": "Interpolated string or expression to evaluate.", - "oneOf": [ - { - "type": "string", - "title": "String", - "description": "Interpolated string", - "pattern": "^(?!(=)).*", - "examples": [ - "Hello ${user.name}" - ] - }, - { - "$ref": "#/definitions/equalsExpression", - "examples": [ - "=concat('x','y','z')" - ] - } - ] - } - } -} diff --git a/skills/declarative/Calendar/Calendar/Calendar.dialog b/skills/declarative/Calendar/Calendar/Calendar.dialog index 93641f3015..e78d21968f 100644 --- a/skills/declarative/Calendar/Calendar/Calendar.dialog +++ b/skills/declarative/Calendar/Calendar/Calendar.dialog @@ -1820,7 +1820,6 @@ "runOnce": true } ], - "$schema": "https://raw.githubusercontent.com/microsoft/BotFramework-Composer/stable/Composer/packages/server/schemas/sdk.schema", "generator": "Calendar.lg", "recognizer": "Calendar.lu.qna", "id": "Calendar" diff --git a/skills/declarative/People/People/People.dialog b/skills/declarative/People/People/People.dialog index 91d93585aa..9f57d866fe 100644 --- a/skills/declarative/People/People/People.dialog +++ b/skills/declarative/People/People/People.dialog @@ -626,7 +626,6 @@ ] } ], - "$schema": "https://raw.githubusercontent.com/microsoft/BotFramework-Composer/stable/Composer/packages/server/schemas/sdk.schema", "generator": "People.lg", "id": "People", "recognizer": "People.lu.qna" From ee7f4ff928915f89dcd1acd6d197dc2bebf10b2a Mon Sep 17 00:00:00 2001 From: Lauren Mills Date: Thu, 1 Jul 2021 11:16:36 -0700 Subject: [PATCH 4/4] Fix bot tour buttons in Teams --- .../en-us/BotTourDialog.en-us.lg | 39 ++++++++++++++----- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/generators/generator-bot-enterprise-assistant/generators/app/templates/dialogs/BotTourDialog/language-generation/en-us/BotTourDialog.en-us.lg b/generators/generator-bot-enterprise-assistant/generators/app/templates/dialogs/BotTourDialog/language-generation/en-us/BotTourDialog.en-us.lg index bd3189898b..12d19dc26c 100644 --- a/generators/generator-bot-enterprise-assistant/generators/app/templates/dialogs/BotTourDialog/language-generation/en-us/BotTourDialog.en-us.lg +++ b/generators/generator-bot-enterprise-assistant/generators/app/templates/dialogs/BotTourDialog/language-generation/en-us/BotTourDialog.en-us.lg @@ -169,13 +169,7 @@ ] } ], - "selectAction":{ - "type":"Action.Submit", - "title":"${text}", - "data":{ - "intent":"${intent}" - } - }, + "selectAction": ${SubmitAction(title, intent)}, "separator": true } ``` @@ -236,11 +230,36 @@ } ``` -# BuildSubmitAction(title, intent) +# BuildSubmitAction(text, intent) +- IF: ${ turn.activity.channelId == "msteams" } + - ${TeamsSubmitAction(text, intent)} +- ELSE: + - ${SubmitAction(text, intent)} + + +# TeamsSubmitAction(text, intent) +- ``` +{ + "type": "Action.Submit", + "title": "${text}", + "data": { + "intent": "${intent}", + "msteams": { + "type": "messageBack", + "text": "${text}" + } + } +} +``` + +# SubmitAction(text, intent) - ``` { "type": "Action.Submit", - "title": "${title}", - "data": "${title}" + "title": "${text}", + "data": { + "intent": "${intent}", + "value": "${text}" + } } ``` \ No newline at end of file