Clean up of status reporting of failed operations #8311
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Undo plumbing and infra introduced in 1572cbd. With that we have one less dependency on WPF stack. There are several scenarios that involve showing `FormStatus` or its descendants. 1. Show a progress as a modal dialog (this is standard way). 2. Do not show the progress dialog, and only show it if an operation that was running failed (e.g. staging files in `FormCommit`). The approach to showing results of failed operations appears to be unnecessay complex, that IIUC led to issues while attempting to show a dialog that was already considered opened but invisible. And the WPF's DispatcherFrameModalController was used to deal with this. This also necessitated defining delegates, and required more plumbing to pass those around, validation, etc. However it is much simpler *not* to show the dialog *until after* the operation has failed. The callsites are also much easier to read and understand.
ghost
assigned 
Codecov Report
@@ Coverage Diff @@
## master #8311 +/- ##
==========================================
+ Coverage 52.68% 52.70% +0.02%
==========================================
Files 864 864
Lines 62509 62474 -35
Branches 11194 11187 -7
==========================================
- Hits 32933 32928 -5
+ Misses 26965 26929 -36
- Partials 2611 2617 +6
|
|
@msftbot merge in 2 days |
|
Hello @RussKie! Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:
If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you". |
mstv
approved these changes
Jul 15, 2020
Comment on lines
+99
to
100
| using (var form = new FormStatus(commands: null, new EditboxBasedConsoleOutputControl(), useDialogSettings: true)) | ||
| { |
There was a problem hiding this comment.
Suggested change
| using (var form = new FormStatus(commands: null, new EditboxBasedConsoleOutputControl(), useDialogSettings: true)) | |
| { | |
| using var form = new FormStatus(commands: null, new EditboxBasedConsoleOutputControl(), useDialogSettings: true); |
|
|
||
| _errorOccurred = !isSuccess; | ||
|
|
||
| if (isSuccess && !_showOnError && (_useDialogSettings && AppSettings.CloseProcessDialog)) | ||
| if (isSuccess && (_useDialogSettings && AppSettings.CloseProcessDialog)) |
There was a problem hiding this comment.
Suggested change
| if (isSuccess && (_useDialogSettings && AppSettings.CloseProcessDialog)) | |
| if (isSuccess && _useDialogSettings && AppSettings.CloseProcessDialog) |
| } | ||
|
|
||
| internal void Start() | ||
| private void Start() |
| public Action<FormStatus> AbortCallback; | ||
| private bool _errorOccurred; | ||
| private bool _showOnError; | ||
| private protected ConsoleOutputControl ConsoleOutput { get; } |
|
Thank you. There's more clean up to do, I'll address the nits in the follow up PRs. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes
Undo plumbing and infra introduced in 1572cbd. With that we have one less dependency on WPF stack.
There are several scenarios that involve showing
FormStatusor its descendants.FormCommit).The approach to showing results of failed operations appears to be unnecessary complex, that IIUC led to issues while attempting to show a dialog that was already considered opened but invisible.
And the WPF's DispatcherFrameModalController was used to deal with this.
This also necessitated defining delegates, and required more plumbing to pass those around, validation, etc.
However it is much simpler not to show the dialog until after the operation has failed. The callsites are also much easier to read and understand.
Also some general code clean up.
Test methodology
Lots of manual tests
git fetchandgit fetch -all)crlftolfin one of the existing files in a repo)