Skip to content
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

feat: Update sdk schema #2729

Merged
merged 39 commits into from
Apr 28, 2020
Merged

feat: Update sdk schema #2729

merged 39 commits into from
Apr 28, 2020

Conversation

luhan2017
Copy link
Contributor

@luhan2017 luhan2017 commented Apr 21, 2020

Description

Tom has a commit in the sdk side to go through and update the schema. I am bring that update in composer. (the package update is included in #2679 )

Here are two issues I found for the schema update, others looks good to me.

  1. Enum is updated to one of enum, which caused all the enum type failed to render in composer.
    EditArray->changeType, HttpRequest->responseType. Here is one example:

image

  1. For value with different types, we should show string editor as a default instead of empty.
    Now:

image

Suggested Fix:

image

@cwhitten @a-b-r-o-w-n

Task Item

fixes #2541
closes #2743

Screenshots

@luhan2017 luhan2017 changed the title Update sdk schema feat: Update sdk schema Apr 21, 2020
@github-actions
Copy link

Coverage Status

Coverage remained the same at 0.0% when pulling bf13b0e on luhan/sdkschema into 8f3e17c on master.

@a-b-r-o-w-n a-b-r-o-w-n self-assigned this Apr 21, 2020
@a-b-r-o-w-n
Copy link
Contributor

I'll make some PR's today to address those issues.

@@ -0,0 +1,2 @@
cd ..
bf dialog:merge *.csproj -o schema/sdk.schema -v -b "R9"
Copy link
Contributor

Choose a reason for hiding this comment

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

"R9" [](start = 51, length = 5)

NO, this should be ""
This switch is going away, and you should not be passing data to it, except an empty string.

tomlm
tomlm previously approved these changes Apr 22, 2020
Copy link
Contributor

@tomlm tomlm left a comment

Choose a reason for hiding this comment

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

:shipit:

@a-b-r-o-w-n a-b-r-o-w-n marked this pull request as draft April 22, 2020 20:34
@a-b-r-o-w-n
Copy link
Contributor

@luhan2017 update: I have been talking with @tomlm about make some more adjustments to the schema based on the usage by the property editor. He is in the process of applying those updates and I will push some commits into this branch. I have marked the PR as draft in the meantime.

@luhan2017
Copy link
Contributor Author

@a-b-r-o-w-n,

  1. Begindialog.dialog is missing "type" field, so we got such error in composer, I've created this PR is SDK side Update Microsoft.BeginDialog.schema botbuilder-dotnet#3801
    image

  2. Not sure which version of the schema you are using. I see Tom make more changes on the schema and the nightly build didn't come out yet. we might need to update the schema to the latest version after it is ready.

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

The schema was based off of microsoft/botbuilder-dotnet#3794. That has been merged to we should take the nightly build to generate the schema.

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

@luhan2017 I have fixed 1 failing e2e test. The other is due to the issue you mentioned above. Ping me when you update the schema to the nightly build and I will do another look and then we can merge.

@luhan2017
Copy link
Contributor Author

@a-b-r-o-w-n , I've updated to the very latest schema and packages, and I did some sanity test, the samples looks good now.

image

@cwhitten cwhitten marked this pull request as ready for review April 26, 2020 18:00
@cwhitten cwhitten requested a review from beyackle as a code owner April 26, 2020 18:00
@luhan2017
Copy link
Contributor Author

I've found another issue about the validation, I've talke with @lei9444 on this, he will submit a PR to fix the validation logic.

image

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

@luhan2017 can you address the conflicts as well as investigate the e2e test failure?

Once those are addressed, go ahead and merge.

@luhan2017 luhan2017 merged commit ac1e959 into master Apr 28, 2020
@luhan2017 luhan2017 deleted the luhan/sdkschema branch April 28, 2020 00:36
lei9444 added a commit to lei9444/BotFramework-Composer-1 that referenced this pull request Jun 15, 2021
* Update sdk schema

* use dialog:merge to generate the schema

* Update readme.md

* Update

* remove R9

* render select field for all enums, not just strings

* merge parent schema into resolved schema for oneOf

* enable dropdown option in OneOfField

* handle new expression schema shapestill more to do

* remove value field in prompts

* show card action in choices form

* allow oneOf schema to set placeholder

* account for rows when checking to stack items

* clean up choices form schema

* remove json plugin

http request body is an expression now, so the expression plugin handles it

* render choice action as json editor

still need to pass in schema

* pass schema through json field

* do not merge parent schema into oneOf

* update lockfile

* remove emit event plugin

* if type is undefined, use string field

* get enum options from oneOf schemas

* enable fetching of schema

* add recognizer options to prompt fields

* fix issue passing errors in array items

* stop-gap for blocking shell operation

* update schema

* fix jest config

* allow for setting startup command for e2e

* fix notification page spec

expression is now the default option

* Schema update

* Update sdk.schema

* remove the duplicate types for schema (microsoft#2782)

Co-authored-by: Andy Brown <asbrown002@gmail.com>
Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
Co-authored-by: leileizhang <leilzh@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants