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

fix: try-catch around trigger grouping expressions #5017

Merged
merged 5 commits into from
Dec 1, 2020
Merged

fix: try-catch around trigger grouping expressions #5017

merged 5 commits into from
Dec 1, 2020

Conversation

GeoffCoxMSFT
Copy link
Member

@GeoffCoxMSFT GeoffCoxMSFT commented Nov 30, 2020 •
edited by hatpick
Loading

Description

Added a try/catch around trigger grouping to prevent expression parsing from causing an error. Expressions may or may not be parseable at any given time, and the project tree grouping should continue working.

Task Item

closes #5014

Screenshots

N/A

@GeoffCoxMSFT GeoffCoxMSFT changed the title try-catch around trigger grouping expressions fix: try-catch around trigger grouping expressions Nov 30, 2020
@coveralls
Copy link

coveralls commented Nov 30, 2020 •
edited
Loading

Coverage Status

Coverage increased (+0.01%) to 55.398% when pulling 6b35f93 on gcox/protect-trigger-grouping into fa1d278 on main.

@GeoffCoxMSFT GeoffCoxMSFT merged commit f6718d8 into main Dec 1, 2020
@GeoffCoxMSFT GeoffCoxMSFT deleted the gcox/protect-trigger-grouping branch December 1, 2020 18: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 <61990921+beyackle@users.noreply.github.com>

* 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 <hatpick@gmail.com>

* 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) <gcox@microsoft.com>
Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Co-authored-by: Tony Anziano <tonyanziano5@gmail.com>
Co-authored-by: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com>
Co-authored-by: Soroush <hatpick@gmail.com>
Co-authored-by: leileizhang <leilzh@microsoft.com>
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 <61990921+beyackle@users.noreply.github.com>

* 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 <hatpick@gmail.com>

* 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) <gcox@microsoft.com>
Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Co-authored-by: Tony Anziano <tonyanziano5@gmail.com>
Co-authored-by: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com>
Co-authored-by: Soroush <hatpick@gmail.com>
Co-authored-by: leileizhang <leilzh@microsoft.com>
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 <61990921+beyackle@users.noreply.github.com>

* 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 <hatpick@gmail.com>

* 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) <gcox@microsoft.com>
Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Co-authored-by: Tony Anziano <tonyanziano5@gmail.com>
Co-authored-by: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com>
Co-authored-by: Soroush <hatpick@gmail.com>
Co-authored-by: leileizhang <leilzh@microsoft.com>
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 <61990921+beyackle@users.noreply.github.com>

* 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 <hatpick@gmail.com>

* 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) <gcox@microsoft.com>
Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Co-authored-by: Tony Anziano <tonyanziano5@gmail.com>
Co-authored-by: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com>
Co-authored-by: Soroush <hatpick@gmail.com>
Co-authored-by: leileizhang <leilzh@microsoft.com>
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 <61990921+beyackle@users.noreply.github.com>

* 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 <hatpick@gmail.com>

* 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) <gcox@microsoft.com>
Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Co-authored-by: Tony Anziano <tonyanziano5@gmail.com>
Co-authored-by: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com>
Co-authored-by: Soroush <hatpick@gmail.com>
Co-authored-by: leileizhang <leilzh@microsoft.com>
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 <61990921+beyackle@users.noreply.github.com>

* 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 <hatpick@gmail.com>

* 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) <gcox@microsoft.com>
Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Co-authored-by: Tony Anziano <tonyanziano5@gmail.com>
Co-authored-by: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com>
Co-authored-by: Soroush <hatpick@gmail.com>
Co-authored-by: leileizhang <leilzh@microsoft.com>
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 <61990921+beyackle@users.noreply.github.com>

* 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 <hatpick@gmail.com>

* 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) <gcox@microsoft.com>
Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Co-authored-by: Tony Anziano <tonyanziano5@gmail.com>
Co-authored-by: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com>
Co-authored-by: Soroush <hatpick@gmail.com>
Co-authored-by: leileizhang <leilzh@microsoft.com>
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 <61990921+beyackle@users.noreply.github.com>

* 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 <hatpick@gmail.com>

* 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) <gcox@microsoft.com>
Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Co-authored-by: Tony Anziano <tonyanziano5@gmail.com>
Co-authored-by: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com>
Co-authored-by: Soroush <hatpick@gmail.com>
Co-authored-by: leileizhang <leilzh@microsoft.com>
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 <61990921+beyackle@users.noreply.github.com>

* 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 <hatpick@gmail.com>

* 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) <gcox@microsoft.com>
Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Co-authored-by: Tony Anziano <tonyanziano5@gmail.com>
Co-authored-by: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com>
Co-authored-by: Soroush <hatpick@gmail.com>
Co-authored-by: leileizhang <leilzh@microsoft.com>
lei9444 pushed a commit to lei9444/BotFramework-Composer-1 that referenced this pull request Jun 15, 2021
@GeoffCoxMSFT @beyackle
try-catch around trigger grouping expressions (microsoft#5017)
77d1be0 
Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hatpick hatpick hatpick approved these changes

@beyackle beyackle beyackle approved these changes

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

@boydc2014 boydc2014 Awaiting requested review from boydc2014

@cwhitten cwhitten Awaiting requested review from cwhitten

@srinaath srinaath Awaiting requested review from srinaath

@tonyanziano tonyanziano Awaiting requested review from tonyanziano

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

Successfully merging this pull request may close these issues.

Invalid expressions cause trigger grouping to fail
4 participants
@GeoffCoxMSFT @coveralls @hatpick @beyackle