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.

Sign up for GitHub

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

Jump to bottom

feat: Add dynamic choices to Choice Prompt #1777

Merged
merged 34 commits into from
Dec 17, 2019
Merged

feat: Add dynamic choices to Choice Prompt #1777

merged 34 commits into from
Dec 17, 2019

Conversation

tdurnford
Copy link
Collaborator

Description

Added dropdown in multiple choice prompt to allow the user to choose between static and dynamic choices.

Task Item

Closes #1644

Type of change

  • New feature (non-breaking change which adds functionality)

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

image

image

tdurnford and others added 30 commits November 20, 2019 12:43
@tdurnford
Update validation and choice array ui
75de04d
@tdurnford
Updated string array
3d7f18b
@tdurnford
Merge branch 'master' into 1510
b19e31e
@tdurnford
Merge branch 'master' into 1510
c67cf89
@tdurnford
Updated regex pattern
3d00f9f
@tdurnford
Merge branch 'master' into 1510
dbefebf
@tdurnford
Updated array styles
37712b5
@tdurnford
Style cleanup
4141ee9
@tdurnford
Merge branch 'master' into 1510
3771450
@tdurnford
Merge branch 'master' into 1510
8e5286a
@cwhitten
Merge branch 'master' into 1510
227af8d
@tdurnford
Fixed string array test
8f27478
@tdurnford
Fixed ObjectArray tests
731944d
@tdurnford
Merge branch 'master' into 1510
3069d84
@tdurnford
Updated request header object
fd7d0f6
@tdurnford
Small change to custom object field
be85e06
@tdurnford
Fixed styling
d647273
@tdurnford
Updated dialogs
9b93233
@tdurnford
Merge branch 'master' into 1510
9478ea5
@tdurnford
Fix margin issue
1c4a4b0
@tdurnford
Merge branch 'master' into 1510
755a04d
@tdurnford
Updated callback dependencies
945c935
@tdurnford
Added error message
577664a
@tdurnford
Updated callback dependencies
dd63e4f
@cwhitten
Merge branch 'master' into 1510
ef65401
@tdurnford
Merge branch 'master' into 1510
5648c34
@tdurnford
Fixed margin issues
a0e9e36
@tdurnford
Fixed styles
2a43183
@tdurnford
Fixed transparent border issue
3c9843a
@tdurnford
Created Dyncamic and Static Choices components
30b94e2
a-b-r-o-w-n
a-b-r-o-w-n requested changes Dec 16, 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.

Beyond the issues I've commented about, I see another issue that may not be related to this change.

Undo/redo doesn't reflect in the form. It requires a refresh of the form to show the reverted state (i.e. clicking out of a node and then back in).

Composer/packages/extensions/obiformeditor/src/Form/fields/PromptField/ChoiceInput/Choices.tsx Outdated Show resolved Hide resolved
...packages/extensions/obiformeditor/src/Form/fields/PromptField/ChoiceInput/DynamicChoices.tsx Outdated Show resolved Hide resolved
Composer/packages/extensions/obiformeditor/src/Form/fields/PromptField/ChoiceInput/Choices.tsx Outdated Show resolved Hide resolved
a-b-r-o-w-n
a-b-r-o-w-n approved these changes Dec 17, 2019
View reviewed changes
Composer/packages/lib/shared/src/types/sdk.ts
@@ -111,7 +113,7 @@ export interface AttachmentInput extends Partial<InputDialog> {
export interface ChoiceInput extends Partial<InputDialog> {
/** The output format. */
outputFormat?: 'value' | 'index';
choices?: IChoice[];
choices?: IChoice;
Copy link
Contributor

Choose a reason for hiding this comment

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

Just a thought: What if we had an AnyOf type alias for this? I think it would make this easier to connect with the schema.

@tdurnford tdurnford marked this pull request as ready for review December 17, 2019 18:27
@a-b-r-o-w-n a-b-r-o-w-n merged commit ce75811 into microsoft:master Dec 17, 2019
@tdurnford tdurnford deleted the 1644 branch December 17, 2019 20:51
@zxyanliu zxyanliu mentioned this pull request Dec 24, 2019
Closed
@a-b-r-o-w-n a-b-r-o-w-n mentioned this pull request Jan 27, 2020
Merged
cwhitten added a commit that referenced this pull request Jan 28, 2020
@cwhitten
release: 01-27-2020
028775b 
### 01-27-2020

#### Added

- feat: enrich prebuilt memory paths and add user defined memory paths ([#1868](#1868)) ([@lei9444](https://github.com/lei9444))
- feat: Language-Understanding LSP ([#1711](#1711)) ([@cosmicshuai](https://github.com/cosmicshuai))
- feat: lu shell api ([#1810](#1810)) ([@zhixzhan](https://github.com/zhixzhan))
- feat: Start Botproject runtime in bot folder ([#1672](#1672)) ([@VanyLaw](https://github.com/VanyLaw))
- feat: Schema-driven visual editor - migrates 15 simple types ([#1811](#1811)) ([@yeze322](https://github.com/yeze322))
- feat: Update OnConversationUpdate actions ([#1794](#1794)) ([@luhan2017](https://github.com/luhan2017))
- feat: Update LG and built in expression functions in LSP ([#1790](#1790)) ([@Danieladu](https://github.com/Danieladu))
- feat: Add dynamic choices to Choice Prompt ([#1777](#1777)) ([@tdurnford](https://github.com/tdurnford))
- feat: update ui for new schema ([#1775](#1775)) ([@alanlong9278](https://github.com/alanlong9278))
- feat: lu all up view ux enhancement ([#1879](#1879)) ([@zhixzhan](https://github.com/zhixzhan))
- feat: add autoClosingPairs for lg editor ([#1789](#1789)) ([@cosmicshuai](https://github.com/cosmicshuai))

#### Fixed

- fix: update the lg content to store when editor editing ([#1884](#1884)) ([@lei9444](https://github.com/lei9444))
- fix: Aligned elements in prompt settings ([#1893](#1893)) ([@tdurnford](https://github.com/tdurnford))
- fix: remove label from validations ([#1891](#1891)) ([@tdurnford](https://github.com/tdurnford))
- fix: Undo / redo behavior on LG resources ([#1813](#1813)) ([@lei9444](https://github.com/lei9444))
- fix: botproject build script powershell version limit ([#1857](#1857)) ([@VanyLaw](https://github.com/VanyLaw))
- fix: Add support of auto suggestion memory variable ([#1819](#1819)) ([@cosmicshuai](https://github.com/cosmicshuai))
- fix: Fixed Multiple Choice Type undo/redo functionality ([#1844](#1844)) ([@tdurnford](https://github.com/tdurnford))
- fix: RepeatDialog not shown ([#1835](#1835)) ([@yeze322](https://github.com/yeze322))
- fix: do not preset name when creating a dialog ([#1805](#1805)) ([@liweitian](https://github.com/liweitian))
- fix: luis authoringRegion not update in popup form ([#1818](#1818)) ([@VanyLaw](https://github.com/VanyLaw))
- fix: Check all expressions in dialog ([#1798](#1798)) ([@lei9444](https://github.com/lei9444))
- fix: TextWidget hover ([#1825](#1825)) ([@tdurnford](https://github.com/tdurnford))
- fix: Create bot from scratch may create a non-empty bot ([#1796](#1796)) ([@liweitian](https://github.com/liweitian))
- fix: Updated release version on about page ([#1788](#1788)) ([@tdurnford](https://github.com/tdurnford))
- fix: Remove the unused lufiles in notifications ([#1760](#1760)) ([@lei9444](https://github.com/lei9444))
- fix: update form correctly when undo or redo changes ([#1808](#1808)) ([@lei9444](https://github.com/lei9444))
- fix: handle multiple ctrl+z in lg editor ([#1804](#1804)) ([@zhixzhan](https://github.com/zhixzhan))

#### Changed

- refactor: re-provide `getLgTemplates` api ([#1746](#1746)) ([@yeze322](https://github.com/yeze322))
- style: updated delete icon ([#1892](#1892)) ([@tdurnford](https://github.com/tdurnford))
- refactor: let ElementWrapper control the focus state ([#1880](#1880)) ([@yeze322](https://github.com/yeze322))
- refactor: render Elements with composition strategy (ElementRenderer -> ElementWrapper) ([#1873](#1873)) ([@yeze322](https://github.com/yeze322))

#### Other

- chore: migrate IfCondition, SwitchCondition, Foreach(Page) to uischema ([#1899](#1899)) ([@yeze322](https://github.com/yeze322))
- chore: migrate TextInput and all other \*Input types to uischema ([#1874](#1874)) ([@yeze322](https://github.com/yeze322))
- chore: migrate SendActivity, BeginDialog, ReplaceDialog to uischema ([#1840](#1840)) ([@yeze322](https://github.com/yeze322))
- chore: retire 'DefaultRenderer' in visual editor ([#1836](#1836)) ([@yeze322](https://github.com/yeze322))
- chore: update lu/lg all up view ([#1806](#1806)) ([@liweitian](https://github.com/liweitian))
- chore: share server's resource to lsp server ([#1793](#1793)) ([@zhixzhan](https://github.com/zhixzhan))
- chore: refactor lg page route & url ([#1756](#1756)) ([@zhixzhan](https://github.com/zhixzhan))
- chore: convert ludown to bf-lu ([#1608](#1608)) ([@lei9444](https://github.com/lei9444))
- chore: proxy lsp ws request in dev ([#1754](#1754)) ([@zhixzhan](https://github.com/zhixzhan))
- docs: fix a typo ([#1901](#1901)) ([@HiltonGiesenow](https://github.com/HiltonGiesenow))
- docs: use correct link in events and triggers documentation ([#1832](#1832)) ([@arafattehsin](https://github.com/arafattehsin))
- docs: fix memory documentation link and typo ([#1833](#1833)) ([@arafattehsin](https://github.com/arafattehsin))
- docs: fix the links to intents and advanced definitions ([#1854](#1854)) ([@arafattehsin](https://github.com/arafattehsin))
- chore: bump immer to 5.2.0 ([#1846](#1846)) ([@cwhitten](https://github.com/cwhitten))
- chore: update botproject packages ([#1809](#1809)) ([@luhan2017](https://github.com/luhan2017))
- chore: update github templates ([@a-b-r-o-w-n](https://github.com/a-b-r-o-w-n))
- chore: update schema and samples ([@luhan2017](https://github.com/luhan2017))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

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

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

@yeze322 yeze322 Awaiting requested review from yeze322

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tdurnford @a-b-r-o-w-n @cwhitten