Skip to content

Commit c20ee62

Browse files
Chris McConnellzxyanliua-b-r-o-w-nluhan2017
authored
Cherry-picks for 4.11 (#4929)
* Fix broken help links in uischema files (#4911) * Update Microsoft.LogAction.uischema * fix broken links * add OnChooseIntent uischema (#4914) * Update Microsoft.SendActivity.schema (#4923) * Update test schemas. Co-authored-by: zxyanliu <[email protected]> Co-authored-by: Andy Brown <[email protected]> Co-authored-by: Lu Han <[email protected]>
1 parent 39a2fd6 commit c20ee62

File tree

6 files changed

+33
-19
lines changed

6 files changed

+33
-19
lines changed

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.LogAction.uischema

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"form": {
44
"label": "Log to console",
55
"subtitle": "Log Action",
6-
"helpLink": "https://aka.ms/bfc-debugging-bots"
6+
"helpLink": "https://aka.ms/composer-telemetry"
77
}
88
}

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SendActivity.schema

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@
1111
"description": "Optional id for the dialog"
1212
},
1313
"disabled": {
14-
"$ref": "schema:#/definitions/stringExpression",
14+
"$ref": "schema:#/definitions/booleanExpression",
1515
"title": "Disabled",
16-
"description": "Optional condition which if true will disable this action.",
17-
"examples": [
18-
"user.age > 3"
19-
]
16+
"description": "Optional condition which if true will disable this action."
2017
},
2118
"activity": {
2219
"$kind": "Microsoft.IActivityTemplate",

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.TraceActivity.uischema

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"form": {
44
"label": "Emit a trace event",
55
"subtitle": "Trace Activity",
6-
"helpLink": "https://aka.ms/bfc-debugging-bots"
6+
"helpLink": "https://aka.ms/composer-telemetry"
77
}
88
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
3+
"form": {
4+
"order": [
5+
"condition",
6+
"*"
7+
],
8+
"hidden": [
9+
"actions"
10+
]
11+
}
12+
}

tests/tests.schema

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -774,12 +774,9 @@
774774
"description": "Optional id for the dialog"
775775
},
776776
"disabled": {
777-
"$ref": "#/definitions/stringExpression",
777+
"$ref": "#/definitions/booleanExpression",
778778
"title": "Disabled",
779-
"description": "Optional condition which if true will disable this action.",
780-
"examples": [
781-
"user.age > 3"
782-
]
779+
"description": "Optional condition which if true will disable this action."
783780
},
784781
"activity": {
785782
"$kind": "Microsoft.IActivityTemplate",
@@ -7916,12 +7913,9 @@
79167913
"description": "Optional id for the dialog"
79177914
},
79187915
"disabled": {
7919-
"$ref": "#/definitions/stringExpression",
7916+
"$ref": "#/definitions/booleanExpression",
79207917
"title": "Disabled",
7921-
"description": "Optional condition which if true will disable this action.",
7922-
"examples": [
7923-
"user.age > 3"
7924-
]
7918+
"description": "Optional condition which if true will disable this action."
79257919
},
79267920
"activity": {
79277921
"$kind": "Microsoft.IActivityTemplate",

tests/tests.uischema

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@
319319
},
320320
"Microsoft.LogAction": {
321321
"form": {
322-
"helpLink": "https://aka.ms/bfc-debugging-bots",
322+
"helpLink": "https://aka.ms/composer-telemetry",
323323
"label": "Log to console",
324324
"subtitle": "Log Action"
325325
}
@@ -401,6 +401,17 @@
401401
"subtitle": "Cancel dialog event"
402402
}
403403
},
404+
"Microsoft.OnChooseIntent": {
405+
"form": {
406+
"hidden": [
407+
"actions"
408+
],
409+
"order": [
410+
"condition",
411+
"*"
412+
]
413+
}
414+
},
404415
"Microsoft.OnCondition": {
405416
"form": {
406417
"hidden": [
@@ -762,7 +773,7 @@
762773
},
763774
"Microsoft.TraceActivity": {
764775
"form": {
765-
"helpLink": "https://aka.ms/bfc-debugging-bots",
776+
"helpLink": "https://aka.ms/composer-telemetry",
766777
"label": "Emit a trace event",
767778
"subtitle": "Trace Activity"
768779
}

0 commit comments

Comments
 (0)