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: Refer to settings.skill inside dialog files #4065

Merged
merged 23 commits into from
Sep 11, 2020

Conversation

srinaath
Copy link
Contributor

@srinaath srinaath commented Sep 8, 2020

Description

This PR transforms settings.skill into a dictionary. We now let the BeginDialog action's id, skillAppId and skillEndpoint to refer to skills object inside settings. This makes sure that we have an expression instead of hardcoded values inside BeginDialog action

Fixes #4032

@srinaath srinaath marked this pull request as ready for review September 8, 2020 21:11
@coveralls
Copy link

coveralls commented Sep 8, 2020

Coverage Status

Coverage decreased (-0.003%) to 55.456% when pulling b6661f5 on srravich/4032-skill-support into 37a9348 on main.

@srinaath srinaath changed the title Refer to settings.skill inside dialog files feat:Refer to settings.skill inside dialog files Sep 8, 2020
@srinaath srinaath changed the title feat:Refer to settings.skill inside dialog files feat: Refer to settings.skill inside dialog files Sep 8, 2020
@srinaath srinaath requested a review from tdurnford September 9, 2020 00:31
Srinaath Ravichandran added 11 commits September 10, 2020 14:59
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
@srinaath srinaath force-pushed the srravich/4032-skill-support branch from 9010204 to 0a1470d Compare September 10, 2020 22:30
srinaath and others added 8 commits September 10, 2020 17:12
Co-authored-by: TJ Durnford <tjdford@gmail.com>
Co-authored-by: TJ Durnford <tjdford@gmail.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
…oser into feature/skill-support

Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>

# Conflicts:
#	Composer/packages/server/src/models/bot/botProject.ts
#	Composer/packages/ui-plugins/select-skill-dialog/src/BeginSkillDialogField.tsx
#	Composer/packages/ui-plugins/select-skill-dialog/src/ComboBoxField.tsx
#	Composer/packages/ui-plugins/select-skill-dialog/src/SelectSkillDialogField.tsx
#	Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/BeginSkillDialogField.test.tsx
#	Composer/packages/ui-plugins/select-skill-dialog/src/__tests__/SelectSkillDialog.test.tsx
#	Composer/packages/ui-plugins/select-skill-dialog/src/index.ts
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
tdurnford
tdurnford previously approved these changes Sep 11, 2020
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
@srinaath srinaath merged commit c4212a5 into main Sep 11, 2020
@srinaath srinaath deleted the srravich/4032-skill-support branch September 11, 2020 05:15
@cwhitten cwhitten mentioned this pull request Nov 13, 2020
lei9444 pushed a commit to lei9444/BotFramework-Composer-1 that referenced this pull request Jun 15, 2021
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.

Reference skills object in dialog
5 participants