change names

ninggao · ninggao · commit 64ffaff4559c · 2019-10-02T09:50:51.000-07:00
diff --git a/packages/dialog/templates/cancelconfirmation.dialog b/packages/dialog/templates/cancelconfirmation.dialog
@@ -1,10 +1,14 @@
 {
     "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/chrimc/map/schemas/sdk.schema",
     "$type": "Microsoft.OnIntent",
-    "intent": "Cancel",
+    "intent": "cancel",
     "actions": [
         {
-            "$type": "Microsoft.EndDialog" 
+            "$type": "Microsoft.Ask",
+            "activity": "[cancel]",
+            "expectedProperties": [
+                "CancelConfirmation"
+            ]
         }
     ]
 }
diff --git a/packages/dialog/templates/chooseSlot.dialog b/packages/dialog/templates/chooseSlot.dialog
@@ -1,12 +1,12 @@
 {
     "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/chrimc/map/schemas/sdk.schema",
-    "$type": "Microsoft.OnChooseSlot",
+    "$type": "Microsoft.OnChooseProperty",
     "condition": "turn.dialogEvent.Value.Entity.Entity",
     "actions": [
         {
             "$type": "Microsoft.Ask",
             "activity": "[chooseSlot(turn.dialogEvent.Value.Entity.Entity)]",
-            "expectedSlots":["turn.dialogEvent.Value.Change.Slot"]
+            "expectedProperties":["turn.dialogEvent.Value.Change.Slot"]
         },
         {
             "$type": "Microsoft.SetProperty",
diff --git a/packages/dialog/templates/en-us/cancel.en-us.lu b/packages/dialog/templates/en-us/cancel.en-us.lu
@@ -1,3 +1,3 @@
 # Cancel
 - cancel 
-- forget it
+- forget it
diff --git a/packages/dialog/templates/en-us/common.en-us.lg b/packages/dialog/templates/en-us/common.en-us.lg
@@ -30,4 +30,7 @@
 
 > TODO: This is not correct--the possible values should be picked up from the event structure
 # chooseSlot(entity, turn)
-- Please choose a slot for {toLower(entity)} from \[{join(turn.schema.properties, ',')}\]
+- Please choose a slot for {toLower(entity)} from \[{join(turn.schema.properties, ',')}\]
+
+# cancel
+- Do you want to end the conversation? (yes/no)
diff --git a/packages/dialog/templates/enumAsk.dialog b/packages/dialog/templates/enumAsk.dialog
@@ -6,7 +6,7 @@
         {
             "$type": "Microsoft.Ask",
             "activity": "[Ask**PROPERTY**]",
-            "expectedSlots": [
+            "expectedProperties": [
                 "**PROPERTY**"
             ]
         }
diff --git a/packages/dialog/templates/enumChooseSlotValue.dialog b/packages/dialog/templates/enumChooseSlotValue.dialog
@@ -6,7 +6,7 @@
         {
             "$type": "Microsoft.Ask",
             "activity": "[Clarify**PROPERTY**]",
-            "expectedSlots": [
+            "expectedProperties": [
                 "**PROPERTY**"
             ]       
         }
diff --git a/packages/dialog/templates/enumClarify.dialog b/packages/dialog/templates/enumClarify.dialog
@@ -1,12 +1,12 @@
 {
     "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/chrimc/map/schemas/sdk.schema",
-    "$type": "Microsoft.OnClarifySlotValue",
+    "$type": "Microsoft.OnClarifyEntity",
     "condition":"turn.dialogEvent.Value.Change.Slot == '**PROPERTY**'",
     "actions": [
         {
             "$type": "Microsoft.Ask",
             "activity": "[Clarify**PROPERTY**]",
-            "expectedSlots": [
+            "expectedProperties": [
                 "**PROPERTY**"
             ]
         }
diff --git a/packages/dialog/templates/enumClear.dialog b/packages/dialog/templates/enumClear.dialog
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/chrimc/map/schemas/sdk.schema",
-    "$type": "Microsoft.OnClearSlot",
+    "$type": "Microsoft.OnClearProperty",
     "condition": "turn.dialogEvent.Value.Change.Slot == '**PROPERTY**'",
     "actions": [
         {
diff --git a/packages/dialog/templates/enumSet.dialog b/packages/dialog/templates/enumSet.dialog
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/chrimc/map/schemas/sdk.schema",
-    "$type": "Microsoft.OnSetSlot",
+    "$type": "Microsoft.OnSetProperty",
     "condition": "turn.dialogEvent.Value.Change.Slot == '**PROPERTY**'",
     "actions": [
         {
diff --git a/packages/dialog/test/commands/dialog/forms/sandwich.form.dialog b/packages/dialog/test/commands/dialog/forms/sandwich.form.dialog
@@ -56,6 +56,13 @@
             "type": "string",
             "$mappings": ["utterance"]
         },
+        "CancelConfirmation": {
+            "type": "string",
+            "enum": [
+                "yes",
+                "no"
+            ]
+        },
         "Toppings": {
             "type": "array",
             "items": {

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,14 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/chrimc/map/schemas/sdk.schema",`
`3`	`3`	`"$type": "Microsoft.OnIntent",`
`4`		`- "intent": "Cancel",`
	`4`	`+ "intent": "cancel",`
`5`	`5`	`"actions": [`
`6`	`6`	`{`
`7`		`- "$type": "Microsoft.EndDialog"`
	`7`	`+ "$type": "Microsoft.Ask",`
	`8`	`+ "activity": "[cancel]",`
	`9`	`+ "expectedProperties": [`
	`10`	`+ "CancelConfirmation"`
	`11`	`+ ]`
`8`	`12`	`}`
`9`	`13`	`]`
`10`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/chrimc/map/schemas/sdk.schema",`
`3`		`- "$type": "Microsoft.OnChooseSlot",`
	`3`	`+ "$type": "Microsoft.OnChooseProperty",`
`4`	`4`	`"condition": "turn.dialogEvent.Value.Entity.Entity",`
`5`	`5`	`"actions": [`
`6`	`6`	`{`
`7`	`7`	`"$type": "Microsoft.Ask",`
`8`	`8`	`"activity": "[chooseSlot(turn.dialogEvent.Value.Entity.Entity)]",`
`9`		`- "expectedSlots":["turn.dialogEvent.Value.Change.Slot"]`
	`9`	`+ "expectedProperties":["turn.dialogEvent.Value.Change.Slot"]`
`10`	`10`	`},`
`11`	`11`	`{`
`12`	`12`	`"$type": "Microsoft.SetProperty",`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`{`
`7`	`7`	`"$type": "Microsoft.Ask",`
`8`	`8`	`"activity": "[AskPROPERTY]",`
`9`		`- "expectedSlots": [`
	`9`	`+ "expectedProperties": [`
`10`	`10`	`"PROPERTY"`
`11`	`11`	`]`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`{`
`7`	`7`	`"$type": "Microsoft.Ask",`
`8`	`8`	`"activity": "[ClarifyPROPERTY]",`
`9`		`- "expectedSlots": [`
	`9`	`+ "expectedProperties": [`
`10`	`10`	`"PROPERTY"`
`11`	`11`	`]`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/chrimc/map/schemas/sdk.schema",`
`3`		`- "$type": "Microsoft.OnClarifySlotValue",`
	`3`	`+ "$type": "Microsoft.OnClarifyEntity",`
`4`	`4`	`"condition":"turn.dialogEvent.Value.Change.Slot == 'PROPERTY'",`
`5`	`5`	`"actions": [`
`6`	`6`	`{`
`7`	`7`	`"$type": "Microsoft.Ask",`
`8`	`8`	`"activity": "[ClarifyPROPERTY]",`
`9`		`- "expectedSlots": [`
	`9`	`+ "expectedProperties": [`
`10`	`10`	`"PROPERTY"`
`11`	`11`	`]`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/chrimc/map/schemas/sdk.schema",`
`3`		`- "$type": "Microsoft.OnClearSlot",`
	`3`	`+ "$type": "Microsoft.OnClearProperty",`
`4`	`4`	`"condition": "turn.dialogEvent.Value.Change.Slot == 'PROPERTY'",`
`5`	`5`	`"actions": [`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/chrimc/map/schemas/sdk.schema",`
`3`		`- "$type": "Microsoft.OnSetSlot",`
	`3`	`+ "$type": "Microsoft.OnSetProperty",`
`4`	`4`	`"condition": "turn.dialogEvent.Value.Change.Slot == 'PROPERTY'",`
`5`	`5`	`"actions": [`
`6`	`6`	`{`