Skip to content

Commit

Permalink
Js/tooltips headings (#5608)
Browse files Browse the repository at this point in the history
* Schema 1.4 (#5317)

* Schema update for Action.Execute and refresh

* Generate 1.4 schema file

* Updated specs

* Update toc.yml

* Updated specs

* Add authentication

* Updated specs

* Fix typos

* Add missing Action.Execute.verb

* Update verbiage

* Add Action.Execute sample

* Table of contents updates and labels on the sample inputs

Co-authored-by: Adaptive Cards Specs CI <[email protected]>
Co-authored-by: Paul Campbell <[email protected]>
Co-authored-by: Rebecca Muraira <[email protected]>

* [JS] Add support for Universal Actions (#5533)

* Work in progress

* strictNullChecks, noImplicitAny
noImplicitReturns, noImplicitThis, noUnusedLocals
noFallthroughCasesInSwitch
More refactoring
Work in progress

* var --> let

* Array<type> --> type[]
for (let i = 0 ...) --> for (let item of ...)
Additional cleanup
Work in progress

* null --> undefined where appropriate

* Code organizing plus some cleanup

* CardObject, CardElement, TextBlock now use schema

* Image, FactSet now use schema

* FactSet fully uses schema

* Library size reduction

* Looking at decorators...

* Fully move to decorators

* Some cleanup

* selectAction/inlineAction --> schema

* ChoiceSet/ToggleInput --> schema

* Media -> schema

* All inputs --> schema

* Fix IE11 compat (don't use obj.constructor.name)

* OpenUrl/ToggleVis./Submit -> schema

* Action.Http --> schema

* Everything now uses schema

* Merge changes from master

* Fix designer build break

* Add version info in type registries
Plus some cleanup

* Forgot to add v1.2 to ToggleVisibility

* API simplification

* Library size reduction (~2 KB minified)

* Reduce library size

* Small simplification

* Update README wih notable changes so far

* More simplifications

* More simplification + 1KB size reduction

* More simplification + bug fix

* Parse logic refactor (WIP)

* Refactor parse logic (WIP)

* Move designer off global registry

* Small cLeanup

* Refactor toJSON

* Parse/serialize to/from specific schema version
Full version picker support
Still WIP, but almost there

* Code complete - full version picker support

* Fix test case + minor tweak

* Designer bug fixes and minor enhancements

* Review feedback so far + designer improvements

* Designer bug fixes

* Add support for cancelling d&d with ESC

* Review feedback + fix value type for number input

* Address review feedback

* More review feedback

* Fix Image.Width/Height serialization regression

* Fix Action.Submit not incl. empty inputs anymore
Add onExecuteAction handler in Preview Mode

* Small designer tweak

* Small popup control refactor

* [Designer] Enhanced data binding support

* [Designer] Small tweak/fix

* [Designer] Improved sample data support

* Use correct sample data in Preview Mode

* Integrate changes from master

* Add support for "preview" param on designer URL
Hide data structure toolbox

* [Designer] Enhanced sample picker dialog

* Fix integration mistake

* [Designer] Combine open sample and new card buttons
Also fully remove "full screen" button

* Remove references to removed buttons

* Sample picker tweaks

* Fix nasty regression introduced by fix in master

* [Designer] Add CHANGELOG.md

* Publishing preview designer + AC JS packages

* [Designer] HostContainer controls target version

* [Designer] Adding getCard and setCard back

* bump package versions for beta release

* Update README.md

* Improve experience for modern browsers

* [Designer] Add modulus, round, ceil, floor func.
[Renderer] Serialization bug fixes

* Update README

* Small cleanup

* Work in progress

* Work in progress

* [Templating] Fix $when not working within loops
[Renderer] Dynamically convert values to string for string properties

* [Templating] Add toString, parseInt, parseFloat
Refactor function storage to avoid name conflicts
[Renderer] Revert automatic conversion to string

* CLeanup

* Work in progress

* Work in progress

* Work in progress

* Small fixes

* [Designer] Styling update

* [Designer] Styling update

* Work in progress

* Work in progress

* Work in progress

* Disable lockDataStructure

* Work in progress

* Work in progress

* Package-lock updates

* Work in progress

* Move to Adaptive Expression

* Cleanup

* Templating tweaks + initial doc generation

* [Templating] Bug fixes

* Add null check for this.renderedElement

* updated website pacakge versions. removed const from exported enums

* [Templating] Fix regr introduced with last commit
Update README.ms

* [Templating] Fix broken {{Date}} and {{TIME}}

* fix website templating script based on API changes

* Changes to accommodate Schema changes (#3967)

* Changes to accommodate Schema changes:
* appId property - removed
* autoRefresh property - renamed
* userIds and displayCardWhenRefresh properties inside refresh - removed

* Renamed ActivityInvocationContext.Refresh to ActivityInvocationContext.Automatic

* Renamed ActivityInvocationContext as ActivityInvocationTrigger

* Moving ActivityInvocationTrigger inside InvokeActivity as per design

* Update to use AEL

* Better auto refresh handling

* update template samples location and where website loads them from

* Updated the Scenarios

* Fix website - load Monaco before designer init

* Update designer README

* ported samples updates from .net branch

* [Site] Fix data sample not loading

* variable misnamed

* Add built-in refresh button

* Fix data structure gen from null

* update site script

* Fix duplicated refresh button

* Small doc fix

* Update to AEL 4.9.0-rc4

* Revert "Update to AEL 4.9.0-rc4"

This reverts commit e3a0d77.

* Upgrade to AEL 4.9.0-rc5

* Updated samples and added Elements cards

* Revert "Merge branch 'ts/renderer-refactor' of github.com:Microsoft/AdaptiveCards into ts/renderer-refactor"

This reverts commit 858c7c0, reversing
changes made to 7cd9ef6.

* Revert "Updated samples and added Elements cards"

This reverts commit 7cd9ef6.

* Updated Samples

* Revert "Updated Samples"

This reverts commit 94d5e35.

* one git automatic merge led to build errors and had to revert several commits

* updated samples and added Elements payload after fixing bungled merge

* [Designer] Bump Teams to 1.2

* site new card dialog loads template versions now

* update stock template

* Update dependencies

* Npm audit fix

* Incorporate changes from main

* Merge AAF code into renderer package

* removing failing test for now to test AAF publishing

* update AC package version to 3.x for AAF testing

* Make AdaptiveApplet registries public

* Fix new syntax error

* New AdaptiveApplet.onExecuteAction event

* Add AdaptiveApplet.hostConfig

* Allow blocking manual refreshes

* Add support for per-action progress indicator

* Refactor to make UB model part of main SDK
Add support for providing custom SerializationContext to AdaptiveApplet

* Some refactoring to support auth model

* Package cleanup

* More refactoring for auth support

* Web Chat support schema 1.3 (#5514)

Co-authored-by: Paul Campbell <[email protected]>

* Some renaming

* Fix weird discrepancy with main

* Auth support complete

* Add anchor right click support
Cleanup

* Tweaks

Co-authored-by: shalinijoshi19 <[email protected]>
Co-authored-by: Matt Hidinger <[email protected]>
Co-authored-by: Paul Campbell <[email protected]>
Co-authored-by: Muthurathinam <[email protected]>
Co-authored-by: nesalang <[email protected]>
Co-authored-by: William Wong <[email protected]>

* Update Action.Execute.json

Update doc URL for Action.Execute

* [Shared] 1.4 - Action.Execute (#5539)

* UAM

* moar tests

* PR feedback

* Add new files to UWP to unbreak build

* Fix ShouldSerialize

Co-authored-by: Rebecca Muraira <[email protected]>

* [.NET] Add support for parsing schema 1.4 features (#5531)

* [.NET] Add support for parsing schema 1.4 features

* PR feedback

* PR feedback

* [Android] Action.Execute support (#5551)

* Fix SWIG ordering

* Action.Execute support

* Revert ParseUtil::GetValueAsString; not a duplicate

* Bump version

* [iOS] Action.Execute Changes (#5549)

* UAM

* moar tests

* PR feedback

* Add new files to UWP to unbreak build

* [iOS] Action.Execute ios change

* [iOS] exposed auth card to the root card

* [iOS] fixed typo

* added unit tests

* [iOS] Added Action.Execute Renderer

* [iOS] CR Comments

Co-authored-by: Risheek Rajolu <[email protected]>
Co-authored-by: Rebecca Muraira <[email protected]>

* [UWP] Add parsing of schema 1.4 changes and Action.Excute support (#5554)

* [UWP] Add parsing of schema 1.4 changes and Action.Excute support

* Fix SAL

Co-authored-by: Joseph Woo <[email protected]>

* Add validation + Action.Execute test card

* [iOS] updated text view to update its intrinsic content size dynamically (#5560)

* [JS] Universal Action designer support + some bug fixes (#5565)

* Universal Actions designer support
Plus some bug fixes

* Cleanup

* [JS] Action.description and TextBlock.style

* version update for Android

* description --> tooltip

* Bump custom.props version

* [JS] Updated package deps

* [JS] Updated package versions

* Metrics for layout structure comparison (#5576)

* Added bleu score metric collection for layout structure comparions

* latest changes based on review comments

* removed OrderedDict for sorting

* latest changes

* command usage changes

* [shared] Parser support for TextBlock headings changes (#5577)

* [Shared] Text Heading Support

* Added Samples

* changed spaces to tabs in .json

* [iOS] Text heading changes (#5584)

* [Shared] Text Heading Support

* Added Samples

* [iOS] Text heading changes

* [Android][Accessibility] TextBlock style: heading (#5587)

* [Android] Accessible Headings

* Bump to 1.5

* Missed SWIG enum

* [UWP][Shared] Implement Text Heading Object model for UWP and fix shared model serialization (#5601)

* Remove tooltip implementation

* Remove tooltip from schema

* Remove tooltip (description) from designer

Co-authored-by: Adaptive Cards Specs CI <[email protected]>
Co-authored-by: Paul Campbell <[email protected]>
Co-authored-by: Rebecca Muraira <[email protected]>
Co-authored-by: shalinijoshi19 <[email protected]>
Co-authored-by: Matt Hidinger <[email protected]>
Co-authored-by: Muthurathinam <[email protected]>
Co-authored-by: nesalang <[email protected]>
Co-authored-by: William Wong <[email protected]>
Co-authored-by: Risheek Rajolu <[email protected]>
Co-authored-by: Joseph Woo <[email protected]>
Co-authored-by: Keerthana Manoharan <[email protected]>
  • Loading branch information
12 people authored Mar 31, 2021
1 parent b80baa0 commit ff68d86
Show file tree
Hide file tree
Showing 269 changed files with 75,122 additions and 615 deletions.
4 changes: 2 additions & 2 deletions custom.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Version">
<VersionMajor>2</VersionMajor>
<VersionMinor>5</VersionMinor>
<VersionMinor>7</VersionMinor>
<!-- The nuget package version should be incremented when we produce QFEs -->
<NuGetPackVersion>2.5.1</NuGetPackVersion>
<NuGetPackVersion>2.7.0</NuGetPackVersion>
<VersionInfoProductName>AdaptiveCards</VersionInfoProductName>
</PropertyGroup>
</Project>
31 changes: 31 additions & 0 deletions samples/v1.4/Elements/Action.Execute.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.4",
"body": [
{
"type": "TextBlock",
"text": "Present a form and submit it back to the originator"
},
{
"type": "Input.Text",
"id": "firstName",
"label": "What is your first name?"
},
{
"type": "Input.Text",
"id": "lastName",
"label": "What is your last name?"
}
],
"actions": [
{
"type": "Action.Execute",
"title": "Action.Execute",
"verb": "doStuff",
"data": {
"x": 13
}
}
]
}
25 changes: 25 additions & 0 deletions samples/v1.4/Elements/AdaptiveCard.Authentication.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"type": "AdaptiveCard",
"version": "1.4",
"authentication": {
"connectionName": "myConnection",
"text": "Please Authenticate your account",
"tokenExchangeResource": {
"id": "myTokenId",
"providerId": "myProviderId",
"uri": "https: //mytoken.exchange/resource"
},
"buttons": [
{
"type": "signin",
"title": "Click here to Sign In!"
}
]
},
"body": [
{
"type": "TextBlock",
"text": "This is a card that has authentication"
}
]
}
20 changes: 20 additions & 0 deletions samples/v1.4/Elements/AdaptiveCard.Refresh.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "AdaptiveCard",
"version": "1.3",
"refresh": {
"action": {
"type": "Action.Execute",
"verb": "refreshCard"
},
"userIds": [
"user1",
"user2"
]
},
"body": [
{
"type": "TextBlock",
"text": "This is a card that will be refreshed."
}
]
}
63 changes: 63 additions & 0 deletions samples/v1.4/Tests/Action.Execute.With.Validation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.4",
"body": [
{
"type": "TextBlock",
"text": "Present a form and submit it back to the originator (with validation!)"
},
{
"type": "ActionSet",
"actions": [
{
"type": "Action.Execute",
"title": "ActionSet Execute",
"verb": "doActionSetStuff",
"iconUrl": "https://adaptivecards.io/content/Closed%20bug%2092x92.png",
"associatedInputs": "none",
"data": {
"y": -1
}
},
{
"type": "Action.ShowCard",
"title": "ShowCard",
"card": {
"type": "AdaptiveCard",
"actions": [
{
"type": "Action.Execute",
"title": "Neat!",
"associatedInputs": "none"
}
]
}
}
]
},
{
"type": "Input.Text",
"id": "firstName",
"isRequired": true,
"regex": "^[A-Z]{1}.*",
"label": "What is your first name?"
},
{
"type": "Input.Text",
"id": "lastName",
"label": "What is your last name?"
}
],
"actions": [
{
"type": "Action.Execute",
"title": "Action.Execute",
"verb": "doStuff",
"iconUrl": "https://adaptivecards.io/content/Closed%20bug%2092x92.png",
"data": {
"x": 13
}
}
]
}
24 changes: 24 additions & 0 deletions samples/v1.5/Elements/TextBlock.Style.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.5",
"body": [
{
"type": "TextBlock",
"text": "Style: Heading",
"style": "heading",
"weight": "bolder"
},
{
"type": "TextBlock",
"text": "Style: Paragraph",
"style": "paragraph",
"weight": "default"
},
{
"type": "TextBlock",
"text": "Style: Default",
"weight": "default"
}
]
}
82 changes: 82 additions & 0 deletions samples/v1.5/Scenarios/InputFormWithLabels.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.0",
"body": [
{
"type": "ColumnSet",
"columns": [
{
"type": "Column",
"width": 2,
"items": [
{
"type": "TextBlock",
"text": "Tell us about yourself",
"weight": "bolder",
"style" : "heading",
"size": "medium",
"wrap": true
},
{
"type": "TextBlock",
"text": "We just need a few more details to get you booked for the trip of a lifetime!",
"isSubtle": true,
"wrap": true
},
{
"type": "TextBlock",
"text": "Don't worry, we'll never share or sell your information.",
"isSubtle": true,
"wrap": true,
"size": "small"
},
{
"type": "Input.Text",
"id": "myName",
"label": "Your name (Last, First)",
"isRequired": true,
"regex": "^[A-Z][a-z]+, [A-Z][a-z]+$",
"errorMessage": "Please enter your name in the specified format"
},
{
"type": "Input.Text",
"id": "myEmail",
"label": "Your email",
"regex": "^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+[.][A-Za-z0-9-]{2,4}$",
"isRequired": true,
"errorMessage": "Please enter a valid email address",
"style": "email"
},
{
"type": "Input.Text",
"id": "myTel",
"label": "Phone Number (xxx-xxx-xxxx)",
"regex": "^[0-9]{3}-[0-9]{3}-[0-9]{4}$",
"errorMessage": "Invalid phone number. Use the specified format: 3 numbers, hyphen, 3 numbers, hyphen and 4 numbers",
"style": "tel"
}
]
},
{
"type": "Column",
"width": 1,
"items": [
{
"type": "Image",
"url": "https://upload.wikimedia.org/wikipedia/commons/b/b2/Diver_Silhouette%2C_Great_Barrier_Reef.jpg",
"size": "auto",
"altText": "Diver in the Great Barrier Reef"
}
]
}
]
}
],
"actions": [
{
"type": "Action.Submit",
"title": "Submit"
}
]
}
Loading

0 comments on commit ff68d86

Please sign in to comment.