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

Updated Dialog Manager to work with skills #2343

Merged
merged 14 commits into from
Jul 9, 2020
Merged

Conversation

chon219
Copy link
Member

@chon219 chon219 commented Jun 14, 2020

Fixes #1970
Fixes #2263

Description

Updated DialogManager to support skills

Specific Changes

  • Updated DialogManager to support skills
  • Split onTurn in DialogManager into 2 private methods to process skill/parent requests

Testing

Added tests for Dialog Manager to cover skills

@chon219 chon219 requested a review from a team as a code owner June 14, 2020 12:46
@chon219 chon219 self-assigned this Jun 14, 2020
@coveralls
Copy link

coveralls commented Jun 14, 2020

Pull Request Test Coverage Report for Build 144966

  • 80 of 81 (98.77%) changed or added relevant lines in 5 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.2%) to 80.858%

Changes Missing Coverage Covered Lines Changed/Added Lines %
libraries/botbuilder-dialogs/src/dialogManager.ts 53 54 98.15%
Totals Coverage Status
Change from base Build 144694: 0.2%
Covered Lines: 13053
Relevant Lines: 15420

💛 - Coveralls

@stevengum
Copy link
Member

@chon219, I will take a look at this today. Thanks for jumping on it!

Copy link
Member

@stevengum stevengum left a comment

Choose a reason for hiding this comment

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

Thanks for the PR! There's some slight style changes that should be done, and additional test coverage that needs to be implemented for DialogManager.

Comment on lines +98 to +103
export function shouldSendEndOfConversationToParent(context: TurnContext, turnResult: DialogTurnResult): boolean {
if (!(turnResult.status == DialogTurnStatus.complete || turnResult.status == DialogTurnStatus.cancelled)) {
// The dialog is still going, don't return EoC.
return false;
}

Copy link
Member

Choose a reason for hiding this comment

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

@chon219, this is a combination that combines DialogManager.ShouldSendEndOfConversationToParent() and DialogExtensions.SendEoCToParent(), correct?

I think we should also take this change in C#. What do you think @gabog?

Copy link
Member Author

Choose a reason for hiding this comment

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

@stevengum I think so. We have two implementations of this function in c# but it seems that we only need one.

libraries/botbuilder-dialogs/src/dialogHelper.ts Outdated Show resolved Hide resolved
libraries/botbuilder-dialogs/src/dialogManager.ts Outdated Show resolved Hide resolved
libraries/botbuilder-dialogs/src/dialogManager.ts Outdated Show resolved Hide resolved
libraries/botbuilder-dialogs/src/dialogManager.ts Outdated Show resolved Hide resolved
libraries/botbuilder-dialogs/src/dialogManager.ts Outdated Show resolved Hide resolved
libraries/botbuilder-dialogs/src/dialogManager.ts Outdated Show resolved Hide resolved
@chon219 chon219 requested a review from stevengum July 1, 2020 02:18
Copy link
Member

@stevengum stevengum left a comment

Choose a reason for hiding this comment

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

Just need a test for the snapshotTrace behavior, then this PR will be good to go.

@stevengum stevengum dismissed their stale review July 1, 2020 18:13

Feedback addressed.

Copy link
Member

@stevengum stevengum left a comment

Choose a reason for hiding this comment

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

Temporarily blocking; design meeting to occur next week.

@chon219 chon219 requested a review from stevengum July 7, 2020 07:05
@stevengum stevengum merged commit 4ee8b03 into master Jul 9, 2020
@stevengum stevengum deleted the zim/dialog-manager branch July 9, 2020 20:22
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.

[PORT] Set Locale for EoC in DialogManager Update DialogManager to work with Skills (JS)
3 participants