Merge branch 'master' into hideFlyoutOnClick

vgromfeld · web-flow · commit 6c891689b1e4 · 2020-03-18T22:01:15.000+01:00
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us fix something that isn't working as expected
 title: ''
-labels: bug
+labels: "bug :bug:"
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
@@ -2,7 +2,7 @@
 name: Documentation
 about: I have a documentation suggestion or question
 title: "[Docs]"
-labels: documentation
+labels: "documentation :page_with_curl:"
 assignees: ''
 
 ---
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,41 @@
+Fixes #
+<!-- Link to relevant issue (for ex: #1234) which will automatically close the issue once the PR is merged -->
+
+## PR Type
+What kind of change does this PR introduce?
+<!-- Please uncomment one ore more that apply to this PR -->
+
+<!-- - Bugfix -->
+<!-- - Feature -->
+<!-- - Code style update (formatting) -->
+<!-- - Refactoring (no functional changes, no api changes) -->
+<!-- - Build or CI related changes -->
+<!-- - Documentation content changes -->
+<!-- - Sample app changes -->
+<!-- - Other... Please describe: -->
+
+
+## What is the current behavior?
+<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
+
+
+## What is the new behavior?
+
+
+## PR Checklist
+
+Please check if your PR fulfills the following requirements:
+
+- [ ] Tested code with current [supported SDKs](https://github.com/windows-toolkit/Graph-Controls/blob/master/README.md)
+- [ ] Sample in sample app has been added / updated (for bug fixes / features)
+    - [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/windows-toolkit/WindowsCommunityToolkit-design-assets)
+- [ ] Tests for the changes have been added (for bug fixes / features) (if applicable)
+- [ ] Header has been added to all new source files (run *build/UpdateHeaders.bat*)
+- [ ] Contains **NO** breaking changes
+
+
+<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. 
+     Please note that breaking changes are likely to be rejected -->
+
+
+## Other information
diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.Properties.cs b/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.Properties.cs
@@ -46,6 +46,6 @@ public bool IsLoading
         /// The identifier for the <see cref="IsLoading"/> dependency property.
         /// </returns>
         public static readonly DependencyProperty IsLoadingProperty =
-            DependencyProperty.Register("IsLoading", typeof(bool), typeof(LoginButton), new PropertyMetadata(true));
+            DependencyProperty.Register(nameof(IsLoading), typeof(bool), typeof(LoginButton), new PropertyMetadata(true));
     }
 }
diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.cs b/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Graph.Providers;
 using Windows.UI.Xaml;
@@ -32,22 +33,15 @@ public LoginButton()
         {
             this.DefaultStyleKey = typeof(LoginButton);
 
-            ProviderManager.Instance.ProviderUpdated += (sender, args) =>
-            {
-                if (!IsLoading && ProviderManager.Instance?.GlobalProvider?.State == ProviderState.Loading)
-                {
-                    IsLoading = true;
-                }
-
-                LoadData();
-            };
+            ProviderManager.Instance.ProviderUpdated += (sender, args) => LoadData();
         }
 
         /// <inheritdoc/>
         protected override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
 
+            IsLoading = true;
             LoadData();
 
             if (_loginButton != null)
@@ -110,7 +104,11 @@ private async void LoadData()
                 return;
             }
 
-            if (provider.State == ProviderState.SignedIn)
+            if (provider.State == ProviderState.Loading)
+            {
+                IsLoading = true;
+            }
+            else if (provider.State == ProviderState.SignedIn)
             {
                 try
                 {
@@ -122,18 +120,20 @@ private async void LoadData()
                 {
                     LoginFailed?.Invoke(this, new LoginFailedEventArgs(e));
                 }
+
+                IsLoading = false;
             }
             else if (provider.State == ProviderState.SignedOut)
             {
                 UserDetails = null; // What if this was user provided? Should we not hook into these events then?
+
+                IsLoading = false;
             }
             else
             {
                 // Provider in Loading state
-                return;
+                Debug.Fail("unsupported state");
             }
-
-            IsLoading = false;
         }
 
         /// <summary>
@@ -142,7 +142,7 @@ private async void LoadData()
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
         public async Task LoginAsync()
         {
-            if (UserDetails != null)
+            if (UserDetails != null || IsLoading)
             {
                 return;
             }
@@ -153,6 +153,7 @@ public async Task LoginAsync()
             {
                 try
                 {
+                    IsLoading = true;
                     await provider.LoginAsync();
 
                     if (provider.State == ProviderState.SignedIn)
@@ -171,6 +172,10 @@ public async Task LoginAsync()
                 {
                     LoginFailed?.Invoke(this, new LoginFailedEventArgs(e));
                 }
+                finally
+                {
+                    IsLoading = false;
+                }
             }
         }
 
@@ -186,6 +191,11 @@ public async Task LogoutAsync()
                 flyout.Hide();
             }
 
+            if (IsLoading)
+            {
+                return;
+            }
+
             var cargs = new CancelEventArgs();
             LogoutInitiated?.Invoke(this, cargs);
 
@@ -207,7 +217,9 @@ public async Task LogoutAsync()
 
             if (provider != null)
             {
+                IsLoading = true;
                 await provider.LogoutAsync();
+                IsLoading = false;
 
                 LogoutCompleted?.Invoke(this, new EventArgs());
             }

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,6 @@ public bool IsLoading`
`46`	`46`	`/// The identifier for the <see cref="IsLoading"/> dependency property.`
`47`	`47`	`/// </returns>`
`48`	`48`	`public static readonly DependencyProperty IsLoadingProperty =`
`49`		`- DependencyProperty.Register("IsLoading", typeof(bool), typeof(LoginButton), new PropertyMetadata(true));`
	`49`	`+ DependencyProperty.Register(nameof(IsLoading), typeof(bool), typeof(LoginButton), new PropertyMetadata(true));`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`using System;`
`6`	`6`	`using System.ComponentModel;`
	`7`	`+using System.Diagnostics;`
`7`	`8`	`using System.Threading.Tasks;`
`8`	`9`	`using Microsoft.Toolkit.Graph.Providers;`
`9`	`10`	`using Windows.UI.Xaml;`
`@@ -32,22 +33,15 @@ public LoginButton()`
`32`	`33`	`{`
`33`	`34`	`this.DefaultStyleKey = typeof(LoginButton);`
`34`	`35`
`35`		`- ProviderManager.Instance.ProviderUpdated += (sender, args) =>`
`36`		`- {`
`37`		`- if (!IsLoading && ProviderManager.Instance?.GlobalProvider?.State == ProviderState.Loading)`
`38`		`- {`
`39`		`- IsLoading = true;`
`40`		`- }`
`41`		`-`
`42`		`- LoadData();`
`43`		`- };`
	`36`	`+ ProviderManager.Instance.ProviderUpdated += (sender, args) => LoadData();`
`44`	`37`	`}`
`45`	`38`
`46`	`39`	`/// <inheritdoc/>`
`47`	`40`	`protected override void OnApplyTemplate()`
`48`	`41`	`{`
`49`	`42`	`base.OnApplyTemplate();`
`50`	`43`
	`44`	`+ IsLoading = true;`
`51`	`45`	`LoadData();`
`52`	`46`
`53`	`47`	`if (_loginButton != null)`
`@@ -110,7 +104,11 @@ private async void LoadData()`
`110`	`104`	`return;`
`111`	`105`	`}`
`112`	`106`
`113`		`- if (provider.State == ProviderState.SignedIn)`
	`107`	`+ if (provider.State == ProviderState.Loading)`
	`108`	`+ {`
	`109`	`+ IsLoading = true;`
	`110`	`+ }`
	`111`	`+ else if (provider.State == ProviderState.SignedIn)`
`114`	`112`	`{`
`115`	`113`	`try`
`116`	`114`	`{`
`@@ -122,18 +120,20 @@ private async void LoadData()`
`122`	`120`	`{`
`123`	`121`	`LoginFailed?.Invoke(this, new LoginFailedEventArgs(e));`
`124`	`122`	`}`
	`123`	`+`
	`124`	`+ IsLoading = false;`
`125`	`125`	`}`
`126`	`126`	`else if (provider.State == ProviderState.SignedOut)`
`127`	`127`	`{`
`128`	`128`	`UserDetails = null; // What if this was user provided? Should we not hook into these events then?`
	`129`	`+`
	`130`	`+ IsLoading = false;`
`129`	`131`	`}`
`130`	`132`	`else`
`131`	`133`	`{`
`132`	`134`	`// Provider in Loading state`
`133`		`- return;`
	`135`	`+ Debug.Fail("unsupported state");`
`134`	`136`	`}`
`135`		`-`
`136`		`- IsLoading = false;`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`/// <summary>`
`@@ -142,7 +142,7 @@ private async void LoadData()`
`142`	`142`	`/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>`
`143`	`143`	`public async Task LoginAsync()`
`144`	`144`	`{`
`145`		`- if (UserDetails != null)`
	`145`	`+ if (UserDetails != null \|\| IsLoading)`
`146`	`146`	`{`
`147`	`147`	`return;`
`148`	`148`	`}`
`@@ -153,6 +153,7 @@ public async Task LoginAsync()`
`153`	`153`	`{`
`154`	`154`	`try`
`155`	`155`	`{`
	`156`	`+ IsLoading = true;`
`156`	`157`	`await provider.LoginAsync();`
`157`	`158`
`158`	`159`	`if (provider.State == ProviderState.SignedIn)`
`@@ -171,6 +172,10 @@ public async Task LoginAsync()`
`171`	`172`	`{`
`172`	`173`	`LoginFailed?.Invoke(this, new LoginFailedEventArgs(e));`
`173`	`174`	`}`
	`175`	`+ finally`
	`176`	`+ {`
	`177`	`+ IsLoading = false;`
	`178`	`+ }`
`174`	`179`	`}`
`175`	`180`	`}`
`176`	`181`
`@@ -186,6 +191,11 @@ public async Task LogoutAsync()`
`186`	`191`	`flyout.Hide();`
`187`	`192`	`}`
`188`	`193`
	`194`	`+ if (IsLoading)`
	`195`	`+ {`
	`196`	`+ return;`
	`197`	`+ }`
	`198`	`+`
`189`	`199`	`var cargs = new CancelEventArgs();`
`190`	`200`	`LogoutInitiated?.Invoke(this, cargs);`
`191`	`201`
`@@ -207,7 +217,9 @@ public async Task LogoutAsync()`
`207`	`217`
`208`	`218`	`if (provider != null)`
`209`	`219`	`{`
	`220`	`+ IsLoading = true;`
`210`	`221`	`await provider.LogoutAsync();`
	`222`	`+ IsLoading = false;`
`211`	`223`
`212`	`224`	`LogoutCompleted?.Invoke(this, new EventArgs());`
`213`	`225`	`}`