Skip to content

Commit

Permalink
Cherry-picks for 4.11 (#4929)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
4 people authored Nov 6, 2020
1 parent 39a2fd6 commit c20ee62
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"form": {
"label": "Log to console",
"subtitle": "Log Action",
"helpLink": "https://aka.ms/bfc-debugging-bots"
"helpLink": "https://aka.ms/composer-telemetry"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,9 @@
"description": "Optional id for the dialog"
},
"disabled": {
"$ref": "schema:#/definitions/stringExpression",
"$ref": "schema:#/definitions/booleanExpression",
"title": "Disabled",
"description": "Optional condition which if true will disable this action.",
"examples": [
"user.age > 3"
]
"description": "Optional condition which if true will disable this action."
},
"activity": {
"$kind": "Microsoft.IActivityTemplate",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"form": {
"label": "Emit a trace event",
"subtitle": "Trace Activity",
"helpLink": "https://aka.ms/bfc-debugging-bots"
"helpLink": "https://aka.ms/composer-telemetry"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
"form": {
"order": [
"condition",
"*"
],
"hidden": [
"actions"
]
}
}
14 changes: 4 additions & 10 deletions tests/tests.schema
Original file line number Diff line number Diff line change
Expand Up @@ -774,12 +774,9 @@
"description": "Optional id for the dialog"
},
"disabled": {
"$ref": "#/definitions/stringExpression",
"$ref": "#/definitions/booleanExpression",
"title": "Disabled",
"description": "Optional condition which if true will disable this action.",
"examples": [
"user.age > 3"
]
"description": "Optional condition which if true will disable this action."
},
"activity": {
"$kind": "Microsoft.IActivityTemplate",
Expand Down Expand Up @@ -7916,12 +7913,9 @@
"description": "Optional id for the dialog"
},
"disabled": {
"$ref": "#/definitions/stringExpression",
"$ref": "#/definitions/booleanExpression",
"title": "Disabled",
"description": "Optional condition which if true will disable this action.",
"examples": [
"user.age > 3"
]
"description": "Optional condition which if true will disable this action."
},
"activity": {
"$kind": "Microsoft.IActivityTemplate",
Expand Down
15 changes: 13 additions & 2 deletions tests/tests.uischema
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
},
"Microsoft.LogAction": {
"form": {
"helpLink": "https://aka.ms/bfc-debugging-bots",
"helpLink": "https://aka.ms/composer-telemetry",
"label": "Log to console",
"subtitle": "Log Action"
}
Expand Down Expand Up @@ -401,6 +401,17 @@
"subtitle": "Cancel dialog event"
}
},
"Microsoft.OnChooseIntent": {
"form": {
"hidden": [
"actions"
],
"order": [
"condition",
"*"
]
}
},
"Microsoft.OnCondition": {
"form": {
"hidden": [
Expand Down Expand Up @@ -762,7 +773,7 @@
},
"Microsoft.TraceActivity": {
"form": {
"helpLink": "https://aka.ms/bfc-debugging-bots",
"helpLink": "https://aka.ms/composer-telemetry",
"label": "Emit a trace event",
"subtitle": "Trace Activity"
}
Expand Down

0 comments on commit c20ee62

Please sign in to comment.