Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

feat: Update schema and samples #1735

Merged
cwhitten merged 12 commits into from
Dec 18, 2019
Merged

feat: Update schema and samples #1735

cwhitten merged 12 commits into from
Dec 18, 2019

Conversation

@luhan2017
Copy link
Contributor

@luhan2017 luhan2017 commented Dec 9, 2019 •
edited
Loading

Description

Update package to version 4.7.0-preview-191208-1

Here are the schema updates from the new package:

  1. Added two actions:
  • SetProperties
  • DeleteProperties
  1. Added Test related schemas (we can ignore this for now)
  2. BeginDialog Actions includeActivity update
  • In Action BeginDialog, added includeActivity(bool)
  • In Action RepeatDialog, added options(object) and includeActivity(bool)
  • In Action ReplaceDialog, added includeActivity(bool)
  1. outputFormat update:
  • Add outputFormat(expression) in ConfirmInput
  • Add outputFormat(expression) in DateTimeInput
  • Update outputFormat(enum->expression) in NumberInput
  • Update outputFormat(enum->expression) in TextInput
  1. Other schema update:
  • Update EmitEvent->eventValue to an expression.
  • Update QnAMakerDialog strictFilters and top

Notes:

  1. 4 and 5 is the breaking schema change, which will impact the old bots created by users.
  2. This should be checked in after the decouple PR checked in, because I already assume we use template to start a bot, the BotProject folder should be deleted.

Task Item

fixes #1734
fixes #1763

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code refactor (non-breaking change which improve code quality, clean up, add tests, etc)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Doc update (document update)

Checklist

  • I have added tests that prove my fix is effective or that my feature works
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have functionally tested my change

Screenshots

Please include screenshots or gifs if your PR include UX changes.

@luhan2017 luhan2017 changed the title Update schema and samples feat: Update schema and samples Dec 9, 2019
@github-actions
Copy link

github-actions bot commented Dec 9, 2019

Coverage Status

Coverage remained the same at 40.434% when pulling d456234 on luhan/updateSchema into cde21e2 on master.

@a-b-r-o-w-n
Copy link
Contributor

a-b-r-o-w-n commented Dec 11, 2019

@alanlong9278 can you take a shot at updating the appschema.ts as well as the uiSchema if necessary? That will be needed to get these changes into the form.

a-b-r-o-w-n
a-b-r-o-w-n suggested changes Dec 13, 2019
View reviewed changes
Copy link
Contributor

@a-b-r-o-w-n a-b-r-o-w-n left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can't be merged until the UI is updated to account for the new schema changes.

@alanlong9278
Copy link
Contributor

alanlong9278 commented Dec 16, 2019

@alanlong9278 can you take a shot at updating the appschema.ts as well as the uiSchema if necessary? That will be needed to get these changes into the form.

@a-b-r-o-w-n update ui for new schema #1775

alanlong9278 and others added 6 commits December 17, 2019 12:03
@alanlong9278
feat: update ui for new schema (#1775)
9abc85a 
* update ui for new schema

* Fixed includeActivity default value wrong type & use original component replace customObjectArrayField
@luhan2017
Merge branch 'master' into luhan/updateSchema
d441860
@luhan2017
Fix test cases
3c411b9
@luhan2017
Merge branch 'luhan/updateSchema' of https://github.com/microsoft/Bot…
006f41c 
…Framework-Composer into luhan/updateSchema
@alanlong9278
capitalize
48a88c3
@yeze322
Show proper contents for new types: SetProperties, DeleteProperties (#…
4575f07 
…1779)

* show properties in VisualEditor

* wrong schema

* give deleteProperties a better content string

* format text

* -> 'Delete {n} properties'
@yeze322 yeze322 self-requested a review as a code owner December 17, 2019 07:45
@yeze322
Copy link
Contributor

yeze322 commented Dec 17, 2019 •
edited
Loading

Merged #1779

In Visual Editor:
SetProperties
image

DeleteProperties
image

a-b-r-o-w-n
a-b-r-o-w-n suggested changes Dec 17, 2019
View reviewed changes
Copy link
Contributor

@a-b-r-o-w-n a-b-r-o-w-n left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new SDK types don't appear in the dialog menus:

I had an outdated version.

@cwhitten cwhitten merged commit 4ea1b2a into master Dec 18, 2019
@cwhitten cwhitten deleted the luhan/updateSchema branch December 18, 2019 00:33
This was referenced Dec 18, 2019
Closed
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@boydc2014 boydc2014 Awaiting requested review from boydc2014 boydc2014 is a code owner

@yeze322 yeze322 Awaiting requested review from yeze322

2 more reviewers

@cwhitten cwhitten cwhitten approved these changes

@a-b-r-o-w-n a-b-r-o-w-n a-b-r-o-w-n approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

status: in progress

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@luhan2017 @a-b-r-o-w-n @alanlong9278 @yeze322 @cwhitten