Repository navigation
[TS] Template engine and integration into Designer #2355
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.
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
Closed
Closed
Changes from all commits
Commits
Show all changes
131 commits
Select commit
Hold shift + click to select a range
e5bc62c
Work in progress
dclaux daf6092
Work in progress
dclaux 1896eb8
Work in progress
dclaux 8d400e8
Work in progress
dclaux 6f48dff
Work in progress
dclaux 71e8a8f
Work in progress
dclaux 0483e90
Work in progress
dclaux a18c6e5
Work in progress
dclaux 8ad05e7
Merge branch 'master' into js/template-engine
dclaux 0a465cc
Work in progress
dclaux ac436be
Work in progress
dclaux 647562c
Work in progress
dclaux 3f16126
Adaptive template engine - fully functional
dclaux 968bf70
Enhanced test app UI, add input box for data
dclaux 8112cb7
Fix repeating elements wrongly generating an array
dclaux 474b554
Add support for {?# expressions
dclaux d52860c
[Designer] Add support for multiple tool boxes per side panel
dclaux 1b22e28
Fix cursor not always sticking to splitters when resizing
dclaux 051ccad
[Designer] Add Data Explorer toolbox
dclaux 3d27be2
Add drag/drop support of fields from data explorer
dclaux a1d31c1
Change a couple of strings
dclaux 6da164d
[Designer] Add support for toolbox commands
dclaux 38c10a0
[Designer] Integrated templating/data binding support
dclaux 24b45d8
Fix expression parse conflicting with existing {{ }} notation
dclaux 7af8a07
Fix data path generation bug
dclaux 1a9eb24
Rework parser
dclaux fb9df8b
Fix {{ notation interfering with binding parser (again)
dclaux 105394e
merge controls css into adaptivecards-designer.css so only one CSS re…
matthidinger 47f3569
added sample data to designer
matthidinger 3375f68
formatting
matthidinger 292d542
fix sample data
matthidinger 053f37a
fix designer sample payload in site
matthidinger e11d311
Rework data structure OM
dclaux f0990cc
Update designer.ejs
matthidinger a772412
Add support for full JSON rountrip
dclaux bd9041d
Merge branch 'js/template-engine' of https://github.com/Microsoft/Ada…
dclaux a4ecd80
Small fix
dclaux 8f78bf4
Remove print function from parser
dclaux d7221b9
Fix FactSet not playing well with data binding
dclaux 77c8395
Fix column bleeding bug
dclaux 2cb96cd
Make Timeline a fizxed height container
dclaux 9bb331f
Merge branch 'master' into js/template-engine
dclaux 6d0cbfa
Revert "Merge branch 'master' into js/template-engine"
dclaux a1d95de
FIx multiple {{...}} in a single TextBlock breaking data binding
dclaux 3f5f55a
Fix TextBlock.color not supporting data bidning
dclaux d7a49ea
adding payloads
matthidinger a8a55cb
Merge branch 'js/template-engine' of https://github.com/Microsoft/Ada…
matthidinger 3b22f87
Force parsed string values to be of string type
dclaux fa24e81
Merge branch 'master' into js/template-engine
dclaux 5f6b478
[Designer] Add built-in sample loader
dclaux 6aad4b4
[Designer] Add default sample to catalogue
dclaux b21ae66
[Designer] Fix impossibility to close sample picker if an error occurs
dclaux 42921e8
Update StockUpdate.data.json
matthidinger b3a08ca
[Designer] Change function calling pattern
dclaux b1e1891
Merge branch 'js/template-engine' of https://github.com/Microsoft/Ada…
dclaux 994f399
Update sample payload
dclaux c05731d
Merge branch 'master' into js/template-engine
dclaux 9ce20af
Merge branch 'master' into js/template-engine
dclaux 414183f
Merge branch 'master' into js/template-engine
dclaux d1dfcb5
Manual merge from master
dclaux e93bd88
Fix entire object dropped if single field null during template expansion
dclaux 6d7ec9a
Merge branch 'master' into js/template-engine
dclaux 7284445
Replace import wqith require for HostCOnfig json files
dclaux eba7310
Merge branch 'master' into js/template-engine
dclaux 1bd1279
Merge branch 'master' into js/template-engine
dclaux bad8e57
Quick fix
dclaux 6012334
Merge branch 'master' into js/template-engine
dclaux 2fcbcd2
Merge branch 'master' into js/template-engine
dclaux d78e49a
Merge branch 'master' into js/template-engine
dclaux b51fcea
Merge branch 'master' into js/template-engine
dclaux ed42bab
Fix JSON roundtrip bug
dclaux 28b7b9d
Add experimental "if" function
dclaux bf8a36e
Merge branch 'master' into js/template-engine
dclaux 16623ea
Merge branch 'master' into js/template-engine
dclaux eaaf89f
Update Outlook and WebChat CSS in visualizer
dclaux 37e3665
Fix round trip serialization again
dclaux d83e3ee
Small fix when switching back to design mode
dclaux 1b14fc4
Fix error when encoutering a property == null
dclaux e11baed
Bug fix in progress
dclaux db4b4d1
Fix payload rountripping, again
dclaux 2f6baa2
Merge branch 'master' into js/template-engine
dclaux 56ef16c
Merge branch 'master' into js/template-engine
dclaux cd6e93b
Merge branch 'js/template-engine' of https://github.com/Microsoft/Ada…
dclaux 5193b02
Merge branch 'master' into js/template-engine
dclaux 38ca6ee
Merge branch 'master' into js/template-engine
dclaux 27a86c2
Merge branch 'master' into js/template-engine
dclaux 68168c8
Merge branch 'master' into js/template-engine
dclaux 1649076
Merge branch 'master' into js/template-engine
dclaux 8ab9e00
Merge branch 'master' into js/template-engine
dclaux 92b8580
Merge branch 'master' into js/template-engine
dclaux 77ff71c
Merge branch 'master' into js/template-engine
dclaux a38b3ec
Merge branch 'master' into js/template-engine
dclaux 7c1e26b
Merge branch 'master' into js/template-engine
dclaux 951f5e7
Merge branch 'master' into js/template-engine
dclaux adea3db
Fix serialization roundtrip, again
dclaux e8ae66d
Roundtrip what wasn't (e.g. Fact, Choice, ...)
dclaux c0f2b90
More rountrip fixes
dclaux fc81917
Merge branch 'master' into js/template-engine
dclaux fc3e618
Merge branch 'master' into js/template-engine
dclaux ee10124
[Designer] Support for custom tool palette items
dclaux 17b50e1
[Designer] Disable preview features by default
dclaux d2d75d5
Enable preview features in vnext site
dclaux 37c83ed
Variable rename
dclaux cef62d1
Merge branch 'master' into js/template-engine
dclaux 4da18d0
Merge branch 'master' into js/template-engine
dclaux 3a21b4c
Merge branch 'master' into js/template-engine
dclaux 90535fa
Merge branch 'master' into js/template-engine
dclaux 42e6140
Merge branch 'master' into js/template-engine
dclaux 57fe2ae
Merge branch 'master' into js/template-engine
dclaux c9e22ba
Merge branch 'master' into js/template-engine
dclaux 7359742
Merge branch 'master' into js/template-engine
dclaux 1bc9b98
Fix exception with Action.Submit
dclaux 4f91f29
Fix invisible copy JSON button causing exception
dclaux f831677
Merge branch 'master' into js/template-engine
dclaux e42adb3
Merge branch 'master' into js/template-engine
dclaux 304e6b3
Fix $when not deserialized properly
dclaux 9b3648c
enable designer preview features in the vnext site
matthidinger c188e65
Merge branch 'master' into js/template-engine
dclaux 0363d4e
Merge branch 'master' into js/template-engine
dclaux 102cc50
Merge branch 'master' into js/template-engine
dclaux cd89272
Merge branch 'master' into js/template-engine
dclaux 3d156c2
Merge branch 'master' into js/template-engine
dclaux 53d2f88
Merge fixes
dclaux ca879c0
Merge branch 'master' into js/template-engine
dclaux 407e079
Package the template engine
dclaux 8ca2ed1
Merge branch 'master' into js/template-engine
dclaux 7cec279
Merge branch 'master' into js/template-engine
dclaux 52f6a48
Merge branch 'master' into js/template-engine
dclaux e5ac890
Merge branch 'master' into js/template-engine
dclaux 5e2d40d
Merge branch 'master' into js/template-engine
dclaux 49fbbe0
Merge branch 'master' into js/template-engine
dclaux File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| { | ||
| "@context": "http://schema.org", | ||
| "@type": "FlightReservation", | ||
| "reservationId": "RXJ34P", | ||
| "reservationStatus": "http://schema.org/ReservationConfirmed", | ||
| "passengerPriorityStatus": "Fast Track", | ||
| "passengerSequenceNumber": "ABC123", | ||
| "securityScreening": "TSA PreCheck", | ||
| "underName": { | ||
| "@type": "Person", | ||
| "name": "Eva Green" | ||
| }, | ||
| "reservationFor": { | ||
| "@type": "Flight", | ||
| "flightNumber": "UA110", | ||
| "provider": { | ||
| "@type": "Airline", | ||
| "name": "Continental", | ||
| "iataCode": "CO", | ||
| "boardingPolicy": "http://schema.org/ZoneBoardingPolicy" | ||
| }, | ||
| "seller": { | ||
| "@type": "Airline", | ||
| "name": "United", | ||
| "iataCode": "UA" | ||
| }, | ||
| "departureAirport": { | ||
| "@type": "Airport", | ||
| "name": "San Francisco Airport", | ||
| "iataCode": "SFO" | ||
| }, | ||
| "departureTime": "2017-03-04T20:15:00-08:00", | ||
| "arrivalAirport": { | ||
| "@type": "Airport", | ||
| "name": "John F. Kennedy International Airport", | ||
| "iataCode": "JFK" | ||
| }, | ||
| "arrivalTime": "2017-03-05T06:30:00-05:00" | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey David Claux (@dclaux), are the changes to teh test samples related to your changes at all? My only concern is a bad merge accidentally overwriting stuff in master for 1.2 ..
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't remember making any changes here.