Update behaviour of Back Button

itbeard · itbeard · commit 19b54a0f640b · 2022-06-26T18:25:21.000+02:00
diff --git a/Pds/Pds.Web/Pages/BasePageComponent.cs b/Pds/Pds.Web/Pages/BasePageComponent.cs
@@ -27,12 +27,24 @@ protected override void OnInitialized()
         base.OnInitialized();
     }
     
-    protected void GoBack()
+    protected void GoBack(string defaultBackPath)
     {
         _pageState.RemoveCurrent(_navManager.Uri);
         if (_pageState.CanGoBack())
         {
             _navManager.NavigateTo(_pageState.PreviousPage());
         }
+        else
+        {
+            if (!string.IsNullOrEmpty(defaultBackPath))
+            {
+                _navManager.NavigateTo(defaultBackPath);
+            }
+        }
+    }
+    
+    protected void GoBack()
+    {
+        GoBack(null);
     }
 }
diff --git a/Pds/Pds.Web/Pages/Bills/Create.razor b/Pds/Pds.Web/Pages/Bills/Create.razor
@@ -184,7 +184,7 @@ else
             isCreateButtonDisabled = false;
             if (result.IsSuccessStatusCode)
             {
-                NavigationManager.NavigateTo("/bills");
+                GoBack("/bills");
             }
             else
             {
diff --git a/Pds/Pds.Web/Pages/Bills/Edit.razor b/Pds/Pds.Web/Pages/Bills/Edit.razor
@@ -204,7 +204,7 @@ else
             isSaveButtonDisabled = false;
             if (result.IsSuccessStatusCode)
             {
-                NavigationManager.NavigateTo("/bills");
+                GoBack("/bills");
             }
             else
             {
diff --git a/Pds/Pds.Web/Pages/Brands/Create.razor b/Pds/Pds.Web/Pages/Brands/Create.razor
@@ -71,7 +71,7 @@ else
             if (result.IsSuccessStatusCode)
             {
                 await localStorage.ClearAsync();
-                NavigationManager.NavigateTo("/brands");
+                GoBack("/brands");
             }
             else
             {
diff --git a/Pds/Pds.Web/Pages/Brands/Edit.razor b/Pds/Pds.Web/Pages/Brands/Edit.razor
@@ -77,7 +77,7 @@ else
             if (result.IsSuccessStatusCode)
             {
                 await localStorage.ClearAsync();
-                NavigationManager.NavigateTo("/brands");
+                GoBack("/brands");
             }
             else
             {
diff --git a/Pds/Pds.Web/Pages/Clients/Create.razor b/Pds/Pds.Web/Pages/Clients/Create.razor
@@ -69,7 +69,7 @@ else
             isCreateButtonDisabled = false;
             if (result.IsSuccessStatusCode)
             {
-                NavigationManager.NavigateTo("/clients");
+                GoBack("/clients");
             }
             else
             {
diff --git a/Pds/Pds.Web/Pages/Clients/Edit.razor b/Pds/Pds.Web/Pages/Clients/Edit.razor
@@ -75,7 +75,7 @@ else
             isCreateButtonDisabled = false;
             if (result.IsSuccessStatusCode)
             {
-                NavigationManager.NavigateTo("/clients");
+                GoBack("/clients");
             }
             else
             {
diff --git a/Pds/Pds.Web/Pages/Content/Create.razor b/Pds/Pds.Web/Pages/Content/Create.razor
@@ -204,7 +204,7 @@ else
             isCreateButtonDisabled = false;
             if (result.IsSuccessStatusCode)
             {
-                NavigationManager.NavigateTo("/content");
+                GoBack("/content");
             }
             else
             {
diff --git a/Pds/Pds.Web/Pages/Content/Edit.razor b/Pds/Pds.Web/Pages/Content/Edit.razor
@@ -199,7 +199,7 @@ else
             isEditButtonDisabled = false;
             if (result.IsSuccessStatusCode)
             {
-                NavigationManager.NavigateTo("/content");
+                GoBack("/content");
             }
             else
             {
diff --git a/Pds/Pds.Web/Pages/Content/Pay.razor b/Pds/Pds.Web/Pages/Content/Pay.razor
@@ -113,7 +113,7 @@ else
         {
             isCreateButtonDisabled = true;
             await ApiClient.Put<object, PayBillPayload>(TokenProvider, $"bills/{content.Bill.Id}/pay", paymentPayload);
-            NavigationManager.NavigateTo("/content");
+            GoBack("/content");
         }
     }
 
diff --git a/Pds/Pds.Web/Pages/Costs/Create.razor b/Pds/Pds.Web/Pages/Costs/Create.razor
@@ -115,7 +115,7 @@ else
             isCreateButtonDisabled = false;
             if (result.IsSuccessStatusCode)
             {
-                NavigationManager.NavigateTo("/costs");
+                GoBack("/costs");
             }
             else
             {
diff --git a/Pds/Pds.Web/Pages/Costs/Edit.razor b/Pds/Pds.Web/Pages/Costs/Edit.razor
@@ -129,7 +129,7 @@ else
             isSaveButtonDisabled = false;
             if (result.IsSuccessStatusCode)
             {
-                NavigationManager.NavigateTo("/costs");
+                GoBack("/costs");
             }
             else
             {
diff --git a/Pds/Pds.Web/Pages/Gifts/Create.razor b/Pds/Pds.Web/Pages/Gifts/Create.razor
@@ -148,7 +148,7 @@ else
             isCreateButtonDisabled = false;
             if (result.IsSuccessStatusCode)
             {
-                NavigationManager.NavigateTo("/gifts");
+                GoBack("/gifts");
             }
             else
             {
diff --git a/Pds/Pds.Web/Pages/Gifts/Edit.razor b/Pds/Pds.Web/Pages/Gifts/Edit.razor
@@ -164,7 +164,7 @@ else
             isSaveButtonDisabled = false;
             if (result.IsSuccessStatusCode)
             {
-                NavigationManager.NavigateTo("/gifts");
+                GoBack("/gifts");
             }
             else
             {
diff --git a/Pds/Pds.Web/Pages/Persons/Create.razor b/Pds/Pds.Web/Pages/Persons/Create.razor
@@ -147,7 +147,7 @@ else
             isCreateButtonDisabled = false;
             if (result.IsSuccessStatusCode)
             {
-                NavigationManager.NavigateTo("/persons");
+                GoBack("/persons");
             }
             else
             {
diff --git a/Pds/Pds.Web/Pages/Persons/Edit.razor b/Pds/Pds.Web/Pages/Persons/Edit.razor
@@ -162,7 +162,7 @@ else
             isSaveButtonDisabled = false;
             if (result.IsSuccessStatusCode)
             {
-                NavigationManager.NavigateTo("/persons");
+                GoBack("/persons");
             }
             else
             {
diff --git a/Pds/Pds.Web/Pages/Settings/Edit.razor b/Pds/Pds.Web/Pages/Settings/Edit.razor
@@ -79,6 +79,7 @@ else
             isCreateButtonDisabled = false;
             if (result.IsSuccessStatusCode)
             {
+                GoBack("/persons");
                 NavigationManager.NavigateTo("/settings", forceLoad: true);
             }
             else

Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,24 @@ protected override void OnInitialized()`
`27`	`27`	`base.OnInitialized();`
`28`	`28`	`}`
`29`	`29`
`30`		`- protected void GoBack()`
	`30`	`+ protected void GoBack(string defaultBackPath)`
`31`	`31`	`{`
`32`	`32`	`_pageState.RemoveCurrent(_navManager.Uri);`
`33`	`33`	`if (_pageState.CanGoBack())`
`34`	`34`	`{`
`35`	`35`	`_navManager.NavigateTo(_pageState.PreviousPage());`
`36`	`36`	`}`
	`37`	`+ else`
	`38`	`+ {`
	`39`	`+ if (!string.IsNullOrEmpty(defaultBackPath))`
	`40`	`+ {`
	`41`	`+ _navManager.NavigateTo(defaultBackPath);`
	`42`	`+ }`
	`43`	`+ }`
	`44`	`+ }`
	`45`	`+`
	`46`	`+ protected void GoBack()`
	`47`	`+ {`
	`48`	`+ GoBack(null);`
`37`	`49`	`}`
`38`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ else`
`184`	`184`	`isCreateButtonDisabled = false;`
`185`	`185`	`if (result.IsSuccessStatusCode)`
`186`	`186`	`{`
`187`		`- NavigationManager.NavigateTo("/bills");`
	`187`	`+ GoBack("/bills");`
`188`	`188`	`}`
`189`	`189`	`else`
`190`	`190`	`{`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ else`
`204`	`204`	`isSaveButtonDisabled = false;`
`205`	`205`	`if (result.IsSuccessStatusCode)`
`206`	`206`	`{`
`207`		`- NavigationManager.NavigateTo("/bills");`
	`207`	`+ GoBack("/bills");`
`208`	`208`	`}`
`209`	`209`	`else`
`210`	`210`	`{`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ else`
`71`	`71`	`if (result.IsSuccessStatusCode)`
`72`	`72`	`{`
`73`	`73`	`await localStorage.ClearAsync();`
`74`		`- NavigationManager.NavigateTo("/brands");`
	`74`	`+ GoBack("/brands");`
`75`	`75`	`}`
`76`	`76`	`else`
`77`	`77`	`{`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ else`
`77`	`77`	`if (result.IsSuccessStatusCode)`
`78`	`78`	`{`
`79`	`79`	`await localStorage.ClearAsync();`
`80`		`- NavigationManager.NavigateTo("/brands");`
	`80`	`+ GoBack("/brands");`
`81`	`81`	`}`
`82`	`82`	`else`
`83`	`83`	`{`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ else`
`69`	`69`	`isCreateButtonDisabled = false;`
`70`	`70`	`if (result.IsSuccessStatusCode)`
`71`	`71`	`{`
`72`		`- NavigationManager.NavigateTo("/clients");`
	`72`	`+ GoBack("/clients");`
`73`	`73`	`}`
`74`	`74`	`else`
`75`	`75`	`{`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ else`
`75`	`75`	`isCreateButtonDisabled = false;`
`76`	`76`	`if (result.IsSuccessStatusCode)`
`77`	`77`	`{`
`78`		`- NavigationManager.NavigateTo("/clients");`
	`78`	`+ GoBack("/clients");`
`79`	`79`	`}`
`80`	`80`	`else`
`81`	`81`	`{`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ else`
`199`	`199`	`isEditButtonDisabled = false;`
`200`	`200`	`if (result.IsSuccessStatusCode)`
`201`	`201`	`{`
`202`		`- NavigationManager.NavigateTo("/content");`
	`202`	`+ GoBack("/content");`
`203`	`203`	`}`
`204`	`204`	`else`
`205`	`205`	`{`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ else`
`113`	`113`	`{`
`114`	`114`	`isCreateButtonDisabled = true;`
`115`	`115`	`await ApiClient.Put<object, PayBillPayload>(TokenProvider, $"bills/{content.Bill.Id}/pay", paymentPayload);`
`116`		`- NavigationManager.NavigateTo("/content");`
	`116`	`+ GoBack("/content");`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`