Skip to content

[Shared] Remove isRequired property serialization #3131

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
almedina-ms merged 10 commits into from
Jul 12, 2019
Merged

[Shared] Remove isRequired property serialization #3131

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a54bb91
Remove isRequired property serialization
almedina-ms Jul 1, 2019
d9d9f6b
Merge branch 'master' into user/almedina-ms/RemoveIsRequiredSerializa…
almedina-ms Jul 2, 2019
0a64c16
Fix test json
almedina-ms Jul 2, 2019
e28f839
Add validation for serialization
almedina-ms Jul 5, 2019
d2a4a6d
Merge branch 'master' into user/almedina-ms/RemoveIsRequiredSerializa…
almedina-ms Jul 5, 2019
f36029f
Merge branch 'master' into user/almedina-ms/RemoveIsRequiredSerializa…
almedina-ms Jul 8, 2019
11837ed
Update test results
almedina-ms Jul 8, 2019
a555948
Fix UWP unit tests
almedina-ms Jul 9, 2019
b0a6cf7
Merge branch 'master' into user/almedina-ms/RemoveIsRequiredSerializa…
almedina-ms Jul 10, 2019
9311377
Merge branch 'master' into user/almedina-ms/RemoveIsRequiredSerializa…
almedina-ms Jul 12, 2019
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
2 changes: 1 addition & 1 deletion ...ce/shared/cpp/AdaptiveCardsSharedModel/AdaptiveCardsSharedModelUnitTest/EverythingBagel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
// Licensed under the MIT License.
#pragma once

#define EVERYTHING_JSON "{\"actions\":[{\"data\":{\"submitValue\":true},\"id\":\"Action.Submit_id\",\"title\":\"Action.Submit\",\"type\":\"Action.Submit\"},{\"card\":{\"actions\":[],\"backgroundImage\":{\"fillMode\":\"repeat\",\"horizontalAlignment\":\"right\",\"url\":\"https://adaptivecards.io/content/cats/1.png\",\"verticalAlignment\":\"center\"},\"body\":[{\"isSubtle\":true,\"text\":\"Action.ShowCard text\",\"type\":\"TextBlock\"}],\"lang\":\"en\",\"type\":\"AdaptiveCard\",\"version\":\"1.0\"},\"id\":\"Action.ShowCard_id\",\"title\":\"Action.ShowCard\",\"type\":\"Action.ShowCard\"}],\"backgroundImage\":\"https://adaptivecards.io/content/cats/1.png\",\"body\":[{\"id\":\"TextBlock_id\",\"italic\":true,\"maxLines\":1,\"strikethrough\":true,\"text\":\"TextBlock_text\",\"type\":\"TextBlock\"},{\"fontType\":\"Monospace\",\"id\":\"TextBlock_id_mono\",\"italic\":true,\"maxLines\":1,\"strikethrough\":true,\"text\":\"TextBlock_text\",\"type\":\"TextBlock\"},{\"id\":\"TextBlock_id_def\",\"italic\":true,\"maxLines\":1,\"strikethrough\":true,\"text\":\"TextBlock_text\",\"type\":\"TextBlock\"},{\"altText\":\"Image_altText\",\"horizontalAlignment\":\"center\",\"id\":\"Image_id\",\"isVisible\":false,\"selectAction\":{\"title\":\"Image_Action.OpenUrl\",\"type\":\"Action.OpenUrl\",\"url\":\"https://adaptivecards.io/\"},\"separator\":true,\"size\":\"Auto\",\"spacing\":\"none\",\"style\":\"person\",\"type\":\"Image\",\"url\":\"https://adaptivecards.io/content/cats/1.png\"},{\"id\":\"Container_id\",\"items\":[{\"columns\":[{\"id\":\"Column_id1\",\"items\":[{\"type\":\"Image\",\"url\":\"https://adaptivecards.io/content/cats/1.png\"}],\"style\":\"Default\",\"type\":\"Column\",\"width\":\"auto\"},{\"id\":\"Column_id2\",\"items\":[{\"type\":\"Image\",\"url\":\"https://adaptivecards.io/content/cats/2.png\"}],\"style\":\"Emphasis\",\"type\":\"Column\",\"width\":\"20px\"},{\"id\":\"Column_id3\",\"items\":[{\"type\":\"Image\",\"url\":\"https://adaptivecards.io/content/cats/3.png\"},{\"id\":\"Column3_TextBlock_id\",\"text\":\"Column3_TextBlock_text\",\"type\":\"TextBlock\"}],\"style\":\"Default\",\"type\":\"Column\",\"width\":\"stretch\"}],\"id\":\"ColumnSet_id\",\"separator\":true,\"spacing\":\"large\",\"type\":\"ColumnSet\"}],\"selectAction\":{\"data\":\"Container_data\",\"title\":\"Container_Action.Submit\",\"type\":\"Action.Submit\"},\"spacing\":\"medium\",\"style\":\"Default\",\"type\":\"Container\"},{\"facts\":[{\"title\":\"Topping\",\"value\":\"poppyseeds\"},{\"title\":\"Topping\",\"value\":\"onion flakes\"}],\"id\":\"FactSet_id\",\"type\":\"FactSet\"},{\"id\":\"ImageSet_id\",\"imageSize\":\"Auto\",\"images\":[{\"type\":\"Image\",\"url\":\"https://adaptivecards.io/content/cats/1.png\"},{\"type\":\"Image\",\"url\":\"https://adaptivecards.io/content/cats/2.png\"},{\"type\":\"Image\",\"url\":\"https://adaptivecards.io/content/cats/3.png\"}],\"separator\":true,\"type\":\"ImageSet\"},{\"id\":\"Container_id_inputs\",\"items\":[{\"id\":\"Input.Text_id\",\"inlineAction\":{\"iconUrl\":\"https://adaptivecards.io/content/cats/1.png\",\"title\":\"Input.Text_Action.Submit\",\"type\":\"Action.Submit\"},\"isRequired\":false,\"maxLength\":10,\"placeholder\":\"Input.Text_placeholder\",\"spacing\":\"small\",\"style\":\"text\",\"type\":\"Input.Text\",\"value\":\"Input.Text_value\"},{\"id\":\"Input.Number_id\",\"isRequired\":false,\"max\":10,\"min\":5,\"placeholder\":\"Input.Number_placeholder\",\"type\":\"Input.Number\",\"value\":7},{\"id\":\"Input.Date_id\",\"isRequired\":false,\"max\":\"1/1/2020\",\"min\":\"8/1/2018\",\"placeholder\":\"Input.Date_placeholder\",\"type\":\"Input.Date\",\"value\":\"8/9/2018\"},{\"id\":\"Input.Time_id\",\"isRequired\":false,\"max\":\"17:00\",\"min\":\"10:00\",\"placeholder\":\"Input.Time_placeholder\",\"type\":\"Input.Time\",\"value\":\"13:00\"},{\"id\":\"Input.Toggle_id\",\"isRequired\":false,\"title\":\"Input.Toggle_title\",\"type\":\"Input.Toggle\",\"value\":\"Input.Toggle_on\",\"valueOff\":\"Input.Toggle_off\",\"valueOn\":\"Input.Toggle_on\"},{\"size\":\"Large\",\"text\":\"Everybody's got choices\",\"type\":\"TextBlock\",\"weight\":\"Bolder\"},{\"choices\":[{\"title\":\"Input.Choice1_title\",\"value\":\"Input.Choice1\"},{\"title\":\"Input.Choice2_title\",\"value\":\"Input.Choice2\"},{\"title\":\"Input.Choice3_title\",\"value\":\"Input.Choice3\"},{\"title\":\"Input.Choice4_title\",\"value\":\"Input.Choice4\"}],\"id\":\"Input.ChoiceSet_id\",\"isMultiSelect\":true,\"isRequired\":false,\"style\":\"Compact\",\"type\":\"Input.ChoiceSet\",\"value\":\"Input.Choice2,Input.Choice4\"}],\"type\":\"Container\"},{\"actions\":[{\"id\":\"ActionSet.Action.Submit_id\",\"title\":\"ActionSet.Action.Submit\",\"type\":\"Action.Submit\"},{\"id\":\"ActionSet.Action.OpenUrl_id\",\"title\":\"ActionSet.Action.OpenUrl\",\"type\":\"Action.OpenUrl\",\"url\":\"https://adaptivecards.io/\"}],\"type\":\"ActionSet\"},{\"horizontalAlignment\":\"right\",\"id\":\"RichTextBlock_id\",\"inlines\":[{\"color\":\"Dark\",\"fontType\":\"Monospace\",\"highlight\":true,\"isSubtle\":true,\"italic\":true,\"size\":\"Large\",\"strikethrough\":true,\"text\":\"This is a text run\",\"type\":\"TextRun\",\"weight\":\"Bolder\"},{\"selectAction\":{\"type\":\"Action.Submit\"},\"text\":\"This is another text run\",\"type\":\"TextRun\"},{\"text\":\"This is a text run specified as a string\",\"type\":\"TextRun\"}],\"type\":\"RichTextBlock\"}],\"fallbackText\":\"fallbackText\",\"lang\":\"en\",\"speak\":\"speak\",\"type\":\"AdaptiveCard\",\"version\":\"1.0\"}\n"
#define EVERYTHING_JSON "{\"actions\":[{\"data\":{\"submitValue\":true},\"id\":\"Action.Submit_id\",\"title\":\"Action.Submit\",\"type\":\"Action.Submit\"},{\"card\":{\"actions\":[],\"backgroundImage\":{\"fillMode\":\"repeat\",\"horizontalAlignment\":\"right\",\"url\":\"https://adaptivecards.io/content/cats/1.png\",\"verticalAlignment\":\"center\"},\"body\":[{\"isSubtle\":true,\"text\":\"Action.ShowCard text\",\"type\":\"TextBlock\"}],\"lang\":\"en\",\"type\":\"AdaptiveCard\",\"version\":\"1.0\"},\"id\":\"Action.ShowCard_id\",\"title\":\"Action.ShowCard\",\"type\":\"Action.ShowCard\"}],\"backgroundImage\":\"https://adaptivecards.io/content/cats/1.png\",\"body\":[{\"id\":\"TextBlock_id\",\"italic\":true,\"maxLines\":1,\"strikethrough\":true,\"text\":\"TextBlock_text\",\"type\":\"TextBlock\"},{\"fontType\":\"Monospace\",\"id\":\"TextBlock_id_mono\",\"italic\":true,\"maxLines\":1,\"strikethrough\":true,\"text\":\"TextBlock_text\",\"type\":\"TextBlock\"},{\"id\":\"TextBlock_id_def\",\"italic\":true,\"maxLines\":1,\"strikethrough\":true,\"text\":\"TextBlock_text\",\"type\":\"TextBlock\"},{\"altText\":\"Image_altText\",\"horizontalAlignment\":\"center\",\"id\":\"Image_id\",\"isVisible\":false,\"selectAction\":{\"title\":\"Image_Action.OpenUrl\",\"type\":\"Action.OpenUrl\",\"url\":\"https://adaptivecards.io/\"},\"separator\":true,\"size\":\"Auto\",\"spacing\":\"none\",\"style\":\"person\",\"type\":\"Image\",\"url\":\"https://adaptivecards.io/content/cats/1.png\"},{\"id\":\"Container_id\",\"items\":[{\"columns\":[{\"id\":\"Column_id1\",\"items\":[{\"type\":\"Image\",\"url\":\"https://adaptivecards.io/content/cats/1.png\"}],\"style\":\"Default\",\"type\":\"Column\",\"width\":\"auto\"},{\"id\":\"Column_id2\",\"items\":[{\"type\":\"Image\",\"url\":\"https://adaptivecards.io/content/cats/2.png\"}],\"style\":\"Emphasis\",\"type\":\"Column\",\"width\":\"20px\"},{\"id\":\"Column_id3\",\"items\":[{\"type\":\"Image\",\"url\":\"https://adaptivecards.io/content/cats/3.png\"},{\"id\":\"Column3_TextBlock_id\",\"text\":\"Column3_TextBlock_text\",\"type\":\"TextBlock\"}],\"style\":\"Default\",\"type\":\"Column\",\"width\":\"stretch\"}],\"id\":\"ColumnSet_id\",\"separator\":true,\"spacing\":\"large\",\"type\":\"ColumnSet\"}],\"selectAction\":{\"data\":\"Container_data\",\"title\":\"Container_Action.Submit\",\"type\":\"Action.Submit\"},\"spacing\":\"medium\",\"style\":\"Default\",\"type\":\"Container\"},{\"facts\":[{\"title\":\"Topping\",\"value\":\"poppyseeds\"},{\"title\":\"Topping\",\"value\":\"onion flakes\"}],\"id\":\"FactSet_id\",\"type\":\"FactSet\"},{\"id\":\"ImageSet_id\",\"imageSize\":\"Auto\",\"images\":[{\"type\":\"Image\",\"url\":\"https://adaptivecards.io/content/cats/1.png\"},{\"type\":\"Image\",\"url\":\"https://adaptivecards.io/content/cats/2.png\"},{\"type\":\"Image\",\"url\":\"https://adaptivecards.io/content/cats/3.png\"}],\"separator\":true,\"type\":\"ImageSet\"},{\"id\":\"Container_id_inputs\",\"items\":[{\"id\":\"Input.Text_id\",\"inlineAction\":{\"iconUrl\":\"https://adaptivecards.io/content/cats/1.png\",\"title\":\"Input.Text_Action.Submit\",\"type\":\"Action.Submit\"},\"maxLength\":10,\"placeholder\":\"Input.Text_placeholder\",\"spacing\":\"small\",\"style\":\"text\",\"type\":\"Input.Text\",\"value\":\"Input.Text_value\"},{\"id\":\"Input.Number_id\",\"max\":10,\"min\":5,\"placeholder\":\"Input.Number_placeholder\",\"type\":\"Input.Number\",\"value\":7},{\"id\":\"Input.Date_id\",\"max\":\"1/1/2020\",\"min\":\"8/1/2018\",\"placeholder\":\"Input.Date_placeholder\",\"type\":\"Input.Date\",\"value\":\"8/9/2018\"},{\"id\":\"Input.Time_id\",\"max\":\"17:00\",\"min\":\"10:00\",\"placeholder\":\"Input.Time_placeholder\",\"type\":\"Input.Time\",\"value\":\"13:00\"},{\"id\":\"Input.Toggle_id\",\"title\":\"Input.Toggle_title\",\"type\":\"Input.Toggle\",\"value\":\"Input.Toggle_on\",\"valueOff\":\"Input.Toggle_off\",\"valueOn\":\"Input.Toggle_on\"},{\"size\":\"Large\",\"text\":\"Everybody's got choices\",\"type\":\"TextBlock\",\"weight\":\"Bolder\"},{\"choices\":[{\"title\":\"Input.Choice1_title\",\"value\":\"Input.Choice1\"},{\"title\":\"Input.Choice2_title\",\"value\":\"Input.Choice2\"},{\"title\":\"Input.Choice3_title\",\"value\":\"Input.Choice3\"},{\"title\":\"Input.Choice4_title\",\"value\":\"Input.Choice4\"}],\"id\":\"Input.ChoiceSet_id\",\"isMultiSelect\":true,\"style\":\"Compact\",\"type\":\"Input.ChoiceSet\",\"value\":\"Input.Choice2,Input.Choice4\"}],\"type\":\"Container\"},{\"actions\":[{\"id\":\"ActionSet.Action.Submit_id\",\"title\":\"ActionSet.Action.Submit\",\"type\":\"Action.Submit\"},{\"id\":\"ActionSet.Action.OpenUrl_id\",\"title\":\"ActionSet.Action.OpenUrl\",\"type\":\"Action.OpenUrl\",\"url\":\"https://adaptivecards.io/\"}],\"type\":\"ActionSet\"},{\"horizontalAlignment\":\"right\",\"id\":\"RichTextBlock_id\",\"inlines\":[{\"color\":\"Dark\",\"fontType\":\"Monospace\",\"highlight\":true,\"isSubtle\":true,\"italic\":true,\"size\":\"Large\",\"strikethrough\":true,\"text\":\"This is a text run\",\"type\":\"TextRun\",\"weight\":\"Bolder\"},{\"selectAction\":{\"type\":\"Action.Submit\"},\"text\":\"This is another text run\",\"type\":\"TextRun\"},{\"text\":\"This is a text run specified as a string\",\"type\":\"TextRun\"}],\"type\":\"RichTextBlock\"}],\"fallbackText\":\"fallbackText\",\"lang\":\"en\",\"speak\":\"speak\",\"type\":\"AdaptiveCard\",\"version\":\"1.0\"}\n"
5 changes: 4 additions & 1 deletion source/shared/cpp/ObjectModel/BaseInputElement.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ Json::Value BaseInputElement::SerializeToJsonValue() const
{
Json::Value root = BaseCardElement::SerializeToJsonValue();

root[AdaptiveCardSchemaKeyToString(AdaptiveCardSchemaKey::IsRequired)] = m_isRequired;
Comment thread
almedina-ms marked this conversation as resolved.
if (m_isRequired)
{
root[AdaptiveCardSchemaKeyToString(AdaptiveCardSchemaKey::IsRequired)] = m_isRequired;
}
Comment thread
almedina-ms marked this conversation as resolved.

return root;
}