Skip to content

[TS] Input validation #4197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
David Claux (dclaux) merged 17 commits into from
Jun 22, 2020
Merged

[TS] Input validation #4197

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6f2bd61
Work in progress
dclaux Jun 1, 2020
f898a43
Merge branch 'master' into ts/input-validation
dclaux Jun 1, 2020
208f83b
Merge branch 'master' into ts/input-validation
dclaux Jun 3, 2020
1cbb6bc
Code complete
dclaux Jun 16, 2020
86b9fa2
Merge remote-tracking branch 'origin/main' into ts/input-validation
dclaux Jun 16, 2020
00bf692
Now actually code complete
dclaux Jun 16, 2020
3814f6f
Merge branch 'main' into ts/input-validation
dclaux Jun 16, 2020
94a85a7
Fix not all required inputs gathered from ShowCard
dclaux Jun 16, 2020
3d4bf5b
Merge branch 'ts/input-validation' of https://github.com/microsoft/Ad…
dclaux Jun 16, 2020
a8b0a6a
Merge branch 'main' into ts/input-validation
dclaux Jun 17, 2020
38ea15c
Accessibility support
dclaux Jun 17, 2020
c4a8ee5
Add aria-required, hide suffix from accessibility
dclaux Jun 18, 2020
2ad25a8
aria-required for Toggle and ChoiceSet
dclaux Jun 18, 2020
63e7863
Merge branch 'main' into ts/input-validation
Jun 18, 2020
bba767f
Add sample
dclaux Jun 18, 2020
b459cac
Merge branch 'feature/inputEvolution' into ts/input-validation
dclaux Jun 18, 2020
fccb82b
Merge branch 'feature/inputEvolution' into ts/input-validation
paulcam206 Jun 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 82 additions & 0 deletions samples/v1.3/Tests/AdaptiveCard.InputValidation.AllInputs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{
"type": "AdaptiveCard",
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"version": "1.3",
"body": [
{
"type": "Input.Text",
"placeholder": "Placeholder text",
"label": "This is an optional input",
"id": "input1"
},
{
"type": "Input.Text",
"placeholder": "Placeholder text",
"errorMessage": "The input value is invalid. This error message is intentionally long to show that it wraps.",
"isRequired": true,
"id": "input2",
"regex": "abc",
"label": "This is a required Text input. This label is intentionally long to show that it correctly wraps."
},
{
"type": "Input.Date",
"label": "This is a required Date input",
"isRequired": true,
"min": "6/1/2020",
"max": "6/30/2020",
"errorMessage": "The input value is invalid. This error message is intentionally long to show that it wraps.",
"id": "input3"
},
{
"type": "Input.Time",
"label": "This is a required Time input",
"isRequired": true,
"min": "08:00",
"max": "15:00",
"errorMessage": "The input value is invalid. This error message is intentionally long to show that it wraps.",
"id": "input4"
},
{
"type": "Input.Number",
"placeholder": "Placeholder text",
"label": "This is a required Number input",
"isRequired": true,
"errorMessage": "The input value is invalid. This error message is intentionally long to show that it wraps.",
"min": 4,
"max": 6,
"id": "input5"
},
{
"type": "Input.ChoiceSet",
"choices": [
{
"title": "Choice 1",
"value": "Choice 1"
},
{
"title": "Choice 2",
"value": "Choice 2"
}
],
"placeholder": "Placeholder text",
"label": "This is a required ChoiceSet input",
"isRequired": true,
"errorMessage": "The input value is invalid. This error message is intentionally long to show that it wraps.",
"id": "input6"
},
{
"type": "Input.Toggle",
"title": "New Input.Toggle",
"label": "This is a required Toggle input",
"isRequired": true,
"errorMessage": "The input value is invalid. This error message is intentionally long to show that it wraps.",
"id": "input7"
}
],
"actions": [
{
"type": "Action.Submit",
"title": "Action.Submit"
}
]
}
10 changes: 5 additions & 5 deletions source/nodejs/adaptivecards-designer-app/dist/containers/bf-image-container.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,13 @@
}

.ac-input.ac-input-required {
background-image: linear-gradient(45deg, transparent, transparent 50%, red 50%, red 100%);
background-position: top right;
background-size: .5em .5em;
background-repeat: no-repeat;
}

.ac-input.ac-input-validation-failed {
.ac-input.ac-textInput.ac-input-validation-failed,
.ac-input.ac-numberInput.ac-input-validation-failed,
.ac-input.ac-dateInput.ac-input-validation-failed,
.ac-input.ac-timeInput.ac-input-validation-failed,
.ac-input.ac-multichoiceInput.ac-choiceSetInput-compact.ac-input-validation-failed {
border: 1px solid red !important;
}

Expand Down
10 changes: 5 additions & 5 deletions source/nodejs/adaptivecards-designer-app/dist/containers/cortana-container.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,13 @@ a.ac-anchor:visited:active {
}

.ac-input.ac-input-required {
background-image: linear-gradient(45deg, transparent, transparent 50%, red 50%, red 100%);
background-position: top right;
background-size: .5em .5em;
background-repeat: no-repeat;
}

.ac-input.ac-input-validation-failed {
.ac-input.ac-textInput.ac-input-validation-failed,
.ac-input.ac-numberInput.ac-input-validation-failed,
.ac-input.ac-dateInput.ac-input-validation-failed,
.ac-input.ac-timeInput.ac-input-validation-failed,
.ac-input.ac-multichoiceInput.ac-choiceSetInput-compact.ac-input-validation-failed {
border: 1px solid red !important;
}

Expand Down
10 changes: 5 additions & 5 deletions source/nodejs/adaptivecards-designer-app/dist/containers/outlook-container.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,13 @@ a.ac-anchor:visited:active {
}

.ac-input.ac-input-required {
background-image: linear-gradient(45deg, transparent, transparent 50%, red 50%, red 100%);
background-position: top right;
background-size: .5em .5em;
background-repeat: no-repeat;
}

.ac-input.ac-input-validation-failed {
.ac-input.ac-textInput.ac-input-validation-failed,
.ac-input.ac-numberInput.ac-input-validation-failed,
.ac-input.ac-dateInput.ac-input-validation-failed,
.ac-input.ac-timeInput.ac-input-validation-failed,
.ac-input.ac-multichoiceInput.ac-choiceSetInput-compact.ac-input-validation-failed {
border: 1px solid red !important;
}

Expand Down
10 changes: 5 additions & 5 deletions source/nodejs/adaptivecards-designer-app/dist/containers/skype-container.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,13 @@ a.ac-anchor:visited:active {
}

.ac-input.ac-input-required {
background-image: linear-gradient(45deg, transparent, transparent 50%, red 50%, red 100%);
background-position: top right;
background-size: .5em .5em;
background-repeat: no-repeat;
}

.ac-input.ac-input-validation-failed {
.ac-input.ac-textInput.ac-input-validation-failed,
.ac-input.ac-numberInput.ac-input-validation-failed,
.ac-input.ac-dateInput.ac-input-validation-failed,
.ac-input.ac-timeInput.ac-input-validation-failed,
.ac-input.ac-multichoiceInput.ac-choiceSetInput-compact.ac-input-validation-failed {
border: 1px solid red !important;
}

Expand Down
10 changes: 5 additions & 5 deletions source/nodejs/adaptivecards-designer-app/dist/containers/teams-container-dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,13 @@ a.ac-anchor:visited:active {
}

.ac-input.ac-input-required {
background-image: linear-gradient(45deg, transparent, transparent 50%, red 50%, red 100%);
background-position: top right;
background-size: .5em .5em;
background-repeat: no-repeat;
}

.ac-input.ac-input-validation-failed {
.ac-input.ac-textInput.ac-input-validation-failed,
.ac-input.ac-numberInput.ac-input-validation-failed,
.ac-input.ac-dateInput.ac-input-validation-failed,
.ac-input.ac-timeInput.ac-input-validation-failed,
.ac-input.ac-multichoiceInput.ac-choiceSetInput-compact.ac-input-validation-failed {
border: 1px solid red !important;
}

Expand Down
10 changes: 5 additions & 5 deletions source/nodejs/adaptivecards-designer-app/dist/containers/teams-container-light.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,13 @@ a.ac-anchor:visited:active {
}

.ac-input.ac-input-required {
background-image: linear-gradient(45deg, transparent, transparent 50%, red 50%, red 100%);
background-position: top right;
background-size: .5em .5em;
background-repeat: no-repeat;
}

.ac-input.ac-input-validation-failed {
.ac-input.ac-textInput.ac-input-validation-failed,
.ac-input.ac-numberInput.ac-input-validation-failed,
.ac-input.ac-dateInput.ac-input-validation-failed,
.ac-input.ac-timeInput.ac-input-validation-failed,
.ac-input.ac-multichoiceInput.ac-choiceSetInput-compact.ac-input-validation-failed {
border: 1px solid red !important;
}

Expand Down
10 changes: 5 additions & 5 deletions source/nodejs/adaptivecards-designer-app/dist/containers/toast-container.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ a.ac-anchor:visited:active {
}

.ac-input.ac-input-required {
background-image: linear-gradient(45deg, transparent, transparent 50%, red 50%, red 100%);
background-position: top right;
background-size: .5em .5em;
background-repeat: no-repeat;
}

.ac-input.ac-input-validation-failed {
.ac-input.ac-textInput.ac-input-validation-failed,
.ac-input.ac-numberInput.ac-input-validation-failed,
.ac-input.ac-dateInput.ac-input-validation-failed,
.ac-input.ac-timeInput.ac-input-validation-failed,
.ac-input.ac-multichoiceInput.ac-choiceSetInput-compact.ac-input-validation-failed {
border: 1px solid red !important;
}

Expand Down
10 changes: 5 additions & 5 deletions source/nodejs/adaptivecards-designer-app/dist/containers/webchat-container.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,13 @@ a.ac-anchor:visited:active {
}

.ac-input.ac-input-required {
background-image: linear-gradient(45deg, transparent, transparent 50%, red 50%, red 100%);
background-position: top right;
background-size: .5em .5em;
background-repeat: no-repeat;
}

.ac-input.ac-input-validation-failed {
.ac-input.ac-textInput.ac-input-validation-failed,
.ac-input.ac-numberInput.ac-input-validation-failed,
.ac-input.ac-dateInput.ac-input-validation-failed,
.ac-input.ac-timeInput.ac-input-validation-failed,
.ac-input.ac-multichoiceInput.ac-choiceSetInput-compact.ac-input-validation-failed {
border: 1px solid red !important;
}

Expand Down
10 changes: 5 additions & 5 deletions source/nodejs/adaptivecards-designer/src/containers/bf-image/bf-image-container.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,13 @@
}

.ac-input.ac-input-required {
background-image: linear-gradient(45deg, transparent, transparent 50%, red 50%, red 100%);
background-position: top right;
background-size: .5em .5em;
background-repeat: no-repeat;
}

.ac-input.ac-input-validation-failed {
.ac-input.ac-textInput.ac-input-validation-failed,
.ac-input.ac-numberInput.ac-input-validation-failed,
.ac-input.ac-dateInput.ac-input-validation-failed,
.ac-input.ac-timeInput.ac-input-validation-failed,
.ac-input.ac-multichoiceInput.ac-choiceSetInput-compact.ac-input-validation-failed {
border: 1px solid red !important;
}

Expand Down
10 changes: 5 additions & 5 deletions source/nodejs/adaptivecards-designer/src/containers/cortana-classic/cortana-container.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,13 @@ a.ac-anchor:visited:active {
}

.ac-input.ac-input-required {
background-image: linear-gradient(45deg, transparent, transparent 50%, red 50%, red 100%);
background-position: top right;
background-size: .5em .5em;
background-repeat: no-repeat;
}

.ac-input.ac-input-validation-failed {
.ac-input.ac-textInput.ac-input-validation-failed,
.ac-input.ac-numberInput.ac-input-validation-failed,
.ac-input.ac-dateInput.ac-input-validation-failed,
.ac-input.ac-timeInput.ac-input-validation-failed,
.ac-input.ac-multichoiceInput.ac-choiceSetInput-compact.ac-input-validation-failed {
border: 1px solid red !important;
}

Expand Down
10 changes: 5 additions & 5 deletions source/nodejs/adaptivecards-designer/src/containers/cortana/cortana-container-dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@ a.ac-anchor:visited:active {
}

.ac-input.ac-input-required {
background-image: linear-gradient(45deg, transparent, transparent 50%, red 50%, red 100%);
background-position: top right;
background-size: .5em .5em;
background-repeat: no-repeat;
}

.ac-input.ac-input-validation-failed {
.ac-input.ac-textInput.ac-input-validation-failed,
.ac-input.ac-numberInput.ac-input-validation-failed,
.ac-input.ac-dateInput.ac-input-validation-failed,
.ac-input.ac-timeInput.ac-input-validation-failed,
.ac-input.ac-multichoiceInput.ac-choiceSetInput-compact.ac-input-validation-failed {
border: 1px solid red !important;
}

Expand Down
10 changes: 5 additions & 5 deletions source/nodejs/adaptivecards-designer/src/containers/cortana/cortana-container-light.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@ a.ac-anchor:visited:active {
}

.ac-input.ac-input-required {
background-image: linear-gradient(45deg, transparent, transparent 50%, red 50%, red 100%);
background-position: top right;
background-size: .5em .5em;
background-repeat: no-repeat;
}

.ac-input.ac-input-validation-failed {
.ac-input.ac-textInput.ac-input-validation-failed,
.ac-input.ac-numberInput.ac-input-validation-failed,
.ac-input.ac-dateInput.ac-input-validation-failed,
.ac-input.ac-timeInput.ac-input-validation-failed,
.ac-input.ac-multichoiceInput.ac-choiceSetInput-compact.ac-input-validation-failed {
border: 1px solid red !important;
}

Expand Down
10 changes: 5 additions & 5 deletions source/nodejs/adaptivecards-designer/src/containers/default/adaptivecards-defaulthost.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@ a.ac-anchor:visited:active {
}

.ac-input.ac-input-required {
background-image: linear-gradient(45deg, transparent, transparent 50%, red 50%, red 100%);
background-position: top right;
background-size: .5em .5em;
background-repeat: no-repeat;
}

.ac-input.ac-input-validation-failed {
.ac-input.ac-textInput.ac-input-validation-failed,
.ac-input.ac-numberInput.ac-input-validation-failed,
.ac-input.ac-dateInput.ac-input-validation-failed,
.ac-input.ac-timeInput.ac-input-validation-failed,
.ac-input.ac-multichoiceInput.ac-choiceSetInput-compact.ac-input-validation-failed {
border: 1px solid red !important;
}

Expand Down
10 changes: 5 additions & 5 deletions source/nodejs/adaptivecards-designer/src/containers/notifications/toast-container.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ a.ac-anchor:visited:active {
}

.ac-input.ac-input-required {
background-image: linear-gradient(45deg, transparent, transparent 50%, red 50%, red 100%);
background-position: top right;
background-size: .5em .5em;
background-repeat: no-repeat;
}

.ac-input.ac-input-validation-failed {
.ac-input.ac-textInput.ac-input-validation-failed,
.ac-input.ac-numberInput.ac-input-validation-failed,
.ac-input.ac-dateInput.ac-input-validation-failed,
.ac-input.ac-timeInput.ac-input-validation-failed,
.ac-input.ac-multichoiceInput.ac-choiceSetInput-compact.ac-input-validation-failed {
border: 1px solid red !important;
}

Expand Down
10 changes: 5 additions & 5 deletions source/nodejs/adaptivecards-designer/src/containers/outlook/outlook-container.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,13 @@ a.ac-anchor:visited:active {
}

.ac-input.ac-input-required {
background-image: linear-gradient(45deg, transparent, transparent 50%, red 50%, red 100%);
background-position: top right;
background-size: .5em .5em;
background-repeat: no-repeat;
}

.ac-input.ac-input-validation-failed {
.ac-input.ac-textInput.ac-input-validation-failed,
.ac-input.ac-numberInput.ac-input-validation-failed,
.ac-input.ac-dateInput.ac-input-validation-failed,
.ac-input.ac-timeInput.ac-input-validation-failed,
.ac-input.ac-multichoiceInput.ac-choiceSetInput-compact.ac-input-validation-failed {
border: 1px solid red !important;
}

Expand Down
10 changes: 5 additions & 5 deletions source/nodejs/adaptivecards-designer/src/containers/skype/skype-container.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,13 @@ a.ac-anchor:visited:active {
}

.ac-input.ac-input-required {
background-image: linear-gradient(45deg, transparent, transparent 50%, red 50%, red 100%);
background-position: top right;
background-size: .5em .5em;
background-repeat: no-repeat;
}

.ac-input.ac-input-validation-failed {
.ac-input.ac-textInput.ac-input-validation-failed,
.ac-input.ac-numberInput.ac-input-validation-failed,
.ac-input.ac-dateInput.ac-input-validation-failed,
.ac-input.ac-timeInput.ac-input-validation-failed,
.ac-input.ac-multichoiceInput.ac-choiceSetInput-compact.ac-input-validation-failed {
border: 1px solid red !important;
}

Expand Down
Loading