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

feat: adaptive expression functions menu #5015

Merged
LouisEugeneMSFT merged 7 commits into from
Dec 2, 2020
Merged

feat: adaptive expression functions menu #5015

LouisEugeneMSFT merged 7 commits into from
Dec 2, 2020

Conversation

@LouisEugeneMSFT
Copy link
Contributor

@LouisEugeneMSFT LouisEugeneMSFT commented Nov 30, 2020 •
edited
Loading

Description

This PR adds a menu surfacing the adaptive expression functions grouped by type when users initially place their cursor on an expression field (see screenshot).

Notes:

  • The Intellisense field needs the refs of its children to manage focus/blur behaviors (so that for example when the user click away, the list of suggestion can be removed). Because the new menu uses Fabric ContextualMenu which in turns leverage React portals, accessing the refs was a challenge. This is currently solved by querying the components in the dom when the layers mount (onLayerMounted prop). Using google material ClickAwayListener component was explored for a cleaner solution but we didn't manage to make it work in the context of Composer.
  • The logic to get the text which should be inserted upon selecting an expression function was abstracted away into un util since it is now shared by this new menu and the regular Intellisense completion list.

Task Item

fix #4195
fix #4196
fix #4197

Screenshots

image

@LouisEugeneMSFT LouisEugeneMSFT changed the title Leugene/expression menu feat: adaptive expression functions menu Nov 30, 2020
@coveralls
Copy link

coveralls commented Nov 30, 2020 •
edited
Loading

Coverage Status

Coverage decreased (-0.06%) to 55.317% when pulling 5fa44bd on leugene/expressionMenu into e63a30c on main.

hatpick
hatpick suggested changes Nov 30, 2020
View reviewed changes
hatpick
hatpick approved these changes Dec 1, 2020
View reviewed changes
Copy link
Contributor

@hatpick hatpick left a comment

Choose a reason for hiding this comment

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

nice

@LouisEugeneMSFT LouisEugeneMSFT merged commit 6ff23ce into main Dec 2, 2020
@LouisEugeneMSFT LouisEugeneMSFT deleted the leugene/expressionMenu branch December 2, 2020 00:40
boydc2014 pushed a commit that referenced this pull request Dec 2, 2020
@liweitian @GeoffCoxMSFT
@beyackle @tonyanziano @LouisEugeneMSFT @hatpick @lei9444
fix: merge with main (#5048)
405c8d3 
* try-catch around trigger grouping expressions (#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
boydc2014 pushed a commit that referenced this pull request Dec 2, 2020
@liweitian @GeoffCoxMSFT
@beyackle @tonyanziano @LouisEugeneMSFT @hatpick @lei9444
fix: merge with main again (#5049)
401913e 
* try-catch around trigger grouping expressions (#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
boydc2014 pushed a commit that referenced this pull request Dec 2, 2020
@liweitian @GeoffCoxMSFT
@beyackle @tonyanziano @LouisEugeneMSFT @hatpick @lei9444
fix: merge with main again (#5050)
3e4170e 
* try-catch around trigger grouping expressions (#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
benbrown pushed a commit to benbrown/BotFramework-Composer that referenced this pull request May 24, 2021
@liweitian @GeoffCoxMSFT
@beyackle @tonyanziano @LouisEugeneMSFT @hatpick @lei9444
fix: merge with main (microsoft#5048)
1c1b92d 
* try-catch around trigger grouping expressions (microsoft#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (microsoft#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (microsoft#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (microsoft#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (microsoft#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
benbrown pushed a commit to benbrown/BotFramework-Composer that referenced this pull request May 24, 2021
@liweitian @GeoffCoxMSFT
@beyackle @tonyanziano @LouisEugeneMSFT @hatpick @lei9444
fix: merge with main again (microsoft#5049)
ed38682 
* try-catch around trigger grouping expressions (microsoft#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (microsoft#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (microsoft#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (microsoft#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (microsoft#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
benbrown pushed a commit to benbrown/BotFramework-Composer that referenced this pull request May 24, 2021
@liweitian @GeoffCoxMSFT
@beyackle @tonyanziano @LouisEugeneMSFT @hatpick @lei9444
fix: merge with main again (microsoft#5050)
e58cd53 
* try-catch around trigger grouping expressions (microsoft#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (microsoft#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (microsoft#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (microsoft#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (microsoft#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
benbrown pushed a commit that referenced this pull request Jun 11, 2021
@liweitian @GeoffCoxMSFT
@beyackle @tonyanziano @LouisEugeneMSFT @hatpick @lei9444
fix: merge with main (#5048)
2dcddce 
* try-catch around trigger grouping expressions (#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
benbrown pushed a commit that referenced this pull request Jun 11, 2021
@liweitian @GeoffCoxMSFT
@beyackle @tonyanziano @LouisEugeneMSFT @hatpick @lei9444
fix: merge with main again (#5049)
c4e36eb 
* try-catch around trigger grouping expressions (#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
benbrown pushed a commit that referenced this pull request Jun 11, 2021
@liweitian @GeoffCoxMSFT
@beyackle @tonyanziano @LouisEugeneMSFT @hatpick @lei9444
fix: merge with main again (#5050)
0a99dcd 
* try-catch around trigger grouping expressions (#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
lei9444 pushed a commit to lei9444/BotFramework-Composer-1 that referenced this pull request Jun 15, 2021
@LouisEugeneMSFT @hatpick
feat: adaptive expression functions menu (microsoft#5015)
3279df2 
* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@a-b-r-o-w-n a-b-r-o-w-n Awaiting requested review from a-b-r-o-w-n

@beyackle beyackle Awaiting requested review from beyackle

@boydc2014 boydc2014 Awaiting requested review from boydc2014

@cwhitten cwhitten Awaiting requested review from cwhitten

@GeoffCoxMSFT GeoffCoxMSFT Awaiting requested review from GeoffCoxMSFT

@srinaath srinaath Awaiting requested review from srinaath

@tonyanziano tonyanziano Awaiting requested review from tonyanziano

1 more reviewer

@hatpick hatpick hatpick approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

4 participants

@LouisEugeneMSFT @coveralls @hatpick