Update behaviour of Back Button

it-beard · Jun 26, 2022 · 19b54a0 · 19b54a0
1 parent bafecc6
commit 19b54a0
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 16 deletions.
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