#382 - Use ExpenseCardContext where appropriate.

maraf · Jun 9, 2021 · 4c7528a · 4c7528a
1 parent 94121df
commit 4c7528a
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 94 deletions.
diff --git a/src/Money.Blazor.Host/Pages/Overview.razor b/src/Money.Blazor.Host/Pages/Overview.razor
@@ -19,8 +19,6 @@
 </Title>
 <ExceptionPanel />
 
-<Confirm @ref="DeleteConfirm" Message="@DeleteMessage" OnConfirmed="@OnDeleteConfirmed" />
-
 <div class="overview">
     <Loading Context="@Loading" IsOverlay="true">
         @{
@@ -55,12 +53,12 @@
                 <div class="clear"></div>
 
                 <div class="cards">
-                    <CascadingValue Value="@this">
+                    <ExpenseCardContext>
                         @foreach (var item in Items)
                         {
                             <OutcomeCard Model="@item" />
                         }
-                    </CascadingValue>
+                    </ExpenseCardContext>
                 </div>
 
                 <Paging Context="@PagingContext" />
@@ -72,7 +70,3 @@
         }
     </Loading>
 </div>
-
-<OutcomeAmount @ref="AmountEditModal" OutcomeKey="@SelectedItem?.Key" Amount="@(SelectedItem?.Amount?.Value ?? 0)" Currency="@SelectedItem?.Amount?.Currency" />
-<OutcomeDescription @ref="DescriptionEditModal" OutcomeKey="@SelectedItem?.Key" Description="@SelectedItem?.Description" />
-<OutcomeWhen @ref="WhenEditModal" OutcomeKey="@SelectedItem?.Key" When="@(SelectedItem?.When ?? DateTime.MinValue)" />
diff --git a/src/Money.Blazor.Host/Pages/Overview.razor.cs b/src/Money.Blazor.Host/Pages/Overview.razor.cs
@@ -23,16 +23,13 @@ namespace Money.Pages
 {
     public partial class Overview<T> :
         System.IDisposable,
-        OutcomeCard.IContext,
         IEventHandler<OutcomeCreated>,
         IEventHandler<OutcomeDeleted>,
         IEventHandler<OutcomeAmountChanged>,
         IEventHandler<OutcomeDescriptionChanged>,
         IEventHandler<OutcomeWhenChanged>,
         IEventHandler<PulledToRefresh>
     {
-        public CurrencyFormatter CurrencyFormatter { get; private set; }
-
         [Inject]
         public ICommandDispatcher Commands { get; set; }
 
@@ -48,30 +45,18 @@ public partial class Overview<T> :
         [Inject]
         public Navigator Navigator { get; set; }
 
-        [Inject]
-        protected CurrencyFormatterFactory CurrencyFormatterFactory { get; set; }
-
         protected string Title { get; set; }
         protected string SubTitle { get; set; }
 
         protected T SelectedPeriod { get; set; }
         protected IKey CategoryKey { get; set; }
         protected string CategoryName { get; set; }
         protected List<OutcomeOverviewModel> Items { get; set; }
-        protected OutcomeOverviewModel SelectedItem { get; set; }
-
-        protected ModalDialog AmountEditModal { get; set; }
-        protected ModalDialog DescriptionEditModal { get; set; }
-        protected ModalDialog WhenEditModal { get; set; }
 
         protected LoadingContext Loading { get; } = new LoadingContext();
         protected SortDescriptor<OutcomeOverviewSortType> SortDescriptor { get; set; } = new SortDescriptor<OutcomeOverviewSortType>(OutcomeOverviewSortType.ByWhen, SortDirection.Descending);
         protected PagingContext PagingContext { get; set; }
 
-        protected OutcomeOverviewModel Selected { get; set; }
-        protected string DeleteMessage { get; set; }
-        protected Confirm DeleteConfirm { get; set; }
-
         protected override async Task OnInitializedAsync()
         {
             PagingContext = new PagingContext(LoadDataAsync, Loading);
@@ -90,8 +75,7 @@ protected override async Task OnInitializedAsync()
             {
                 Title = $"Expenses in {SelectedPeriod}";
             }
-
-            CurrencyFormatter = await CurrencyFormatterFactory.CreateAsync();
+
             Reload();
         }
 
@@ -137,27 +121,6 @@ protected async void OnSortChanged()
             StateHasChanged();
         }
 
-        protected void OnActionClick(OutcomeOverviewModel model, ModalDialog modal)
-        {
-            SelectedItem = model;
-            modal.Show();
-            StateHasChanged();
-        }
-
-        protected void OnDeleteClick(OutcomeOverviewModel model)
-        {
-            Selected = model;
-            DeleteMessage = $"Do you really want to delete expense '{model.Description}'?";
-            DeleteConfirm.Show();
-            StateHasChanged();
-        }
-
-        protected async void OnDeleteConfirmed()
-        {
-            await Commands.HandleAsync(new DeleteOutcome(Selected.Key));
-            StateHasChanged();
-        }
-
         protected OutcomeOverviewModel FindModel(IEvent payload)
             => Items.FirstOrDefault(o => o.Key.Equals(payload.AggregateKey));
 
@@ -262,23 +225,5 @@ async Task IEventHandler<PulledToRefresh>.HandleAsync(PulledToRefresh payload)
         }
 
         #endregion
-
-        #region OutcomeCard.IContext
-
-        bool OutcomeCard.IContext.HasEdit => true;
-
-        void OutcomeCard.IContext.EditAmount(OutcomeOverviewModel model)
-            => OnActionClick(model, AmountEditModal);
-
-        void OutcomeCard.IContext.EditDescription(OutcomeOverviewModel model)
-            => OnActionClick(model, DescriptionEditModal);
-
-        void OutcomeCard.IContext.EditWhen(OutcomeOverviewModel model)
-            => OnActionClick(model, WhenEditModal);
-
-        void OutcomeCard.IContext.Delete(OutcomeOverviewModel model)
-            => OnDeleteClick(model);
-
-        #endregion
     }
 }
diff --git a/src/Money.Blazor.Host/Pages/Search.razor b/src/Money.Blazor.Host/Pages/Search.razor
@@ -36,12 +36,12 @@
         else
         {
             <div class="cards">
-                <CascadingValue Value="@this">
+                <ExpenseCardContext>
                     @foreach (var item in Models)
                     {
                         <OutcomeCard Model="@item" />
                     }
-                </CascadingValue>
+                </ExpenseCardContext>
             </div>
 
             <Paging Context="@PagingContext" />

diff --git a/src/Money.Blazor.Host/Pages/Search.razor.cs b/src/Money.Blazor.Host/Pages/Search.razor.cs
@@ -5,7 +5,6 @@
 using Money.Models.Queries;
 using Money.Models.Sorting;
 using Money.Services;
-using Neptuo;
 using Neptuo.Queries;
 using System;
 using System.Collections.Generic;
@@ -15,7 +14,7 @@
 
 namespace Money.Pages
 {
-    public partial class Search : OutcomeCard.IContext, System.IDisposable
+    public partial class Search : System.IDisposable
     {
         public static readonly SortDescriptor<OutcomeOverviewSortType> DefaultSort = new SortDescriptor<OutcomeOverviewSortType>(OutcomeOverviewSortType.ByWhen, SortDirection.Descending);
 
@@ -102,23 +101,5 @@ protected async Task<PagingLoadStatus> LoadPageAsync()
                 return PagingLoadStatus.LastPage;
             }
         }
-
-        #region OutcomeCard.IContext
-
-        bool OutcomeCard.IContext.HasEdit => false;
-
-        void OutcomeCard.IContext.EditAmount(OutcomeOverviewModel model)
-            => throw Ensure.Exception.NotSupported();
-
-        void OutcomeCard.IContext.EditDescription(OutcomeOverviewModel model)
-            => throw Ensure.Exception.NotSupported();
-
-        void OutcomeCard.IContext.EditWhen(OutcomeOverviewModel model)
-            => throw Ensure.Exception.NotSupported();
-
-        void OutcomeCard.IContext.Delete(OutcomeOverviewModel model)
-            => throw Ensure.Exception.NotSupported();
-
-        #endregion
     }
 }
diff --git a/src/Money.Blazor.Host/wwwroot/css/site.css b/src/Money.Blazor.Host/wwwroot/css/site.css
@@ -313,9 +313,6 @@ h4 {
   max-width: 900px;
   margin: 0 auto; }
 
-.search .controls {
-  display: none; }
-
 .cards {
   margin: 20px 0; }
   .cards .row:first-child {