Dev

First working solution with new Rx library
b-straub · Apr 19, 2024 · 6d0e4fe · 6d0e4fe
1 parent 1976bd5
commit 6d0e4fe
Show file tree

Hide file tree

Showing 17 changed files with 112 additions and 89 deletions.
diff --git a/DexieNETCloudSample/Aministration/Administration.razor b/DexieNETCloudSample/Aministration/Administration.razor
@@ -15,7 +15,8 @@
             }
         </CardHeaderContent>
         <CardHeaderActions>
-            <MudButtonAsyncRx Color="Color.Primary" Variant="Variant.Filled" StateCommand=@Service.CancellableCommandAsync ExecuteAsyncCallback=@GetUsers CancelText="Cancel Get Users">
+            <MudButtonAsyncRx Color="Color.Primary" Variant="Variant.Filled" StateCommand=@Service.CancellableCommandAsync 
+                ExecuteAsyncCallback=@GetUsers DeferredNotification=@true CancelText="Cancel Get Users">
                 Get Users
             </MudButtonAsyncRx>
         </CardHeaderActions>

diff --git a/DexieNETCloudSample/Aministration/Administration.razor.cs b/DexieNETCloudSample/Aministration/Administration.razor.cs
@@ -20,6 +20,8 @@ public partial class Administration
             var result = await dialog.Result;
             if (!result.Canceled)
             {
+                stateCommandAsync.NotifyChanging();
+                await Task.Delay(2000, stateCommandAsync.CancellationToken);
                 await stateCommandAsync.ExecuteAsync(Service.GetUsers((CloudKeyData)result.Data));
             }
         };

diff --git a/DexieNETCloudSample/Components/InvitesForm.razor b/DexieNETCloudSample/Components/InvitesForm.razor
@@ -21,14 +21,16 @@
         <MudTd DataLabel="Accept" Style="text-align:center">
             <MudIconButtonRx Color="Color.Success" Icon=@Icons.Material.Outlined.AddCircleOutline
                     StateCommand=@Service.CommandAsync
+                    CanChangeCallback=@ToDoListService.CanAcceptInvite(context)
                     ExecuteCallback=@Service.AcceptInvite(context)
                     ConfirmExecutionAsync=@(async () => await ConfirmInvite(true)) />
         </MudTd>
         <MudTd DataLabel="Reject" Style="text-align:center">
             <MudIconButtonRx Color="Color.Success" Icon=@Icons.Material.Outlined.RemoveCircleOutline
                              StateCommand=@Service.CommandAsync
+                             CanChangeCallback=@ToDoListService.CanRejectInvite(context)
                              ExecuteCallback=@Service.RejectInvite(context)
-                             ConfirmExecutionAsync=@(async () => await ConfirmInvite(true)) />
+                             ConfirmExecutionAsync=@(async () => await ConfirmInvite(false)) />
         </MudTd>
     </RowTemplate>
 </MudTable>

diff --git a/DexieNETCloudSample/Components/MemberForm.razor b/DexieNETCloudSample/Components/MemberForm.razor
@@ -11,7 +11,9 @@
         <MudTh>Role</MudTh>
     </HeaderContent>
     <RowTemplate>
-        <MemberRow List=@List Member=@context />
+        <RxBLStateScope TScope=@ToDoListMemberService.MemberRowScope TService=@ToDoListMemberService ScopeFactory=@Service.CreateRowScope>
+            <MemberRow List=@List Member=@context />
+        </RxBLStateScope>
     </RowTemplate>
 </MudTable>
 

diff --git a/DexieNETCloudSample/Components/MemberRow.razor b/DexieNETCloudSample/Components/MemberRow.razor
@@ -5,12 +5,15 @@
     <MudText>@MemberName(Member)</MudText>
 </MudTd>
 <MudTd DataLabel="Role">
-    <MudSelectAsyncRx StateGroupAsync=@Service.MemberRoleSelection InitializeCallback=@Service.GetInitialMemberRole(Member) ChangingAsyncCallback=@Service.MemberRoleChangingAsync(Member)
+    <MudSelectAsyncRx StateGroupAsync=@Scope.MemberRoleSelection InitializeCallback=@Scope.GetInitialMemberRole(Member) 
+        CanChangeCallback=@(Scope.CanChangeMemberRole(Member)) ChangingAsyncCallback=@Scope.MemberRoleChangingAsync(Member)
         HideDisabled=@true Variant="Variant.Outlined" AnchorOrigin="Origin.BottomCenter" />
 </MudTd>
 <MudTd>
     <MudFabAsyncRx Color=@(_currentMemberAction is MemberAction.ACCEPT ? Color.Success : Color.Error)
-        StartIcon=@GetMemberActionIcon() Size="Size.Small" StateCommand=@Service.CommandAsync ConfirmExecutionAsync=@ConfirmChangeMemberStateAsync ExecuteAsyncCallback=@Service.ChangeMemberState(Member) />
+        StartIcon=@GetMemberActionIcon() Size="Size.Small" StateCommand=@Service.CommandAsync 
+        CanChangeCallback=@Service.CanChangeMemberState(Member)
+        ConfirmExecutionAsync=@ConfirmChangeMemberStateAsync ExecuteAsyncCallback=@Service.ChangeMemberState(Member) />
     @if (_isOwnList && _currentMemberAction is not MemberAction.OWNER)
     {
         <MudIcon Class="ml-4" Color=@(_currentMemberState is MemberState.ACCEPTED ? Color.Success : Color.Error) Icon=@GetMemberStateIcon() />
@@ -30,6 +33,9 @@
     [Parameter, EditorRequired]
     public required Member Member { get; init; }
 
+    [CascadingParameter]
+    public required ToDoListMemberService.MemberRowScope Scope { get; set; }
+
     private MemberAction _currentMemberAction = MemberAction.NONE;
     private MemberState _currentMemberState = MemberState.NONE;
     private bool _isOwnList = false;

diff --git a/DexieNETCloudSample/Components/ToDoDBItemAddOrUpdate.razor b/DexieNETCloudSample/Components/ToDoDBItemAddOrUpdate.razor
@@ -6,15 +6,15 @@
 }
 else
 {
-    <MudIconButtonAsyncRx StateCommand=@Service.CommandAsync CanChangeCallback=@(() => Service.CanUpdate(Item)) Color="Color.Info" Icon=@Icons.Material.Filled.Edit ExecuteAsyncCallback=@ShowAddUpdateDialog />
+    <MudIconButtonAsyncRx StateCommand=@Service.CommandAsync CanChangeCallback=@Service.CanUpdateItem(Item) Color="Color.Info" Icon=@Icons.Material.Filled.Edit ExecuteAsyncCallback=@ShowAddUpdateDialog />
 }
 
 @code {
     [Parameter, EditorRequired]
     public required bool AddMode { get; init; }
 
     [Parameter, EditorRequired]
-    public required ToDoDBItem? Item { get; init; }
+    public required ToDoDBItem Item { get; init; }
 
     [Inject]
     public required IDialogService DialogService { get; init; }

diff --git a/DexieNETCloudSample/Components/ToDoList.razor b/DexieNETCloudSample/Components/ToDoList.razor
@@ -75,7 +75,7 @@
                     </MudTd>
                     <MudTd DataLabel="Edit" Style="text-align:center">
                         <MudIconButtonAsyncRx Color="Color.Info" Icon=@Icons.Material.Filled.Edit
-                                              StateCommand=@Service.CommandAsync ExecuteAsyncCallback=@AddOrUpdate(context) />
+                                              StateCommand=@Service.CommandAsync CanChangeCallback=@Service.CanUpdateItem(context) ExecuteAsyncCallback=@AddOrUpdate(context) />
                     </MudTd>
                     <MudTd DataLabel="DeleteItem" Style="text-align:center">
                         <MudIconButtonAsyncRx Color="Color.Error" Icon=@Icons.Material.Filled.Delete StateCommand=@Service.CommandAsync CanChangeCallback=@Service.CanDeleteItem(context)

diff --git a/DexieNETCloudSample/Components/ToDoList.razor.cs b/DexieNETCloudSample/Components/ToDoList.razor.cs
@@ -61,15 +61,5 @@ private async Task<bool> ConfirmDelete(DeleteType type)
 
             return true;
         }
-
-        private Func<IStateCommandAsync, Task> DeleteList(ToDoDBList list) => async commandAsync =>
-        {
-            var confirmed = await ConfirmDelete(DeleteType.One);
-
-            if (confirmed)
-            {
-                await commandAsync.ExecuteAsync(Service.DeleteItem(list));
-            }
-        };
     }
 }
diff --git a/DexieNETCloudSample/Dexie/Services/CrudService.State.cs b/DexieNETCloudSample/Dexie/Services/CrudService.State.cs
@@ -43,7 +43,7 @@ await DbService.DB.Transaction(async _ =>
 
         public Func<bool> CanUpdateItem(T value) => () => CanUpdate(value);
 
-        public virtual bool CanUpdate(T? item)
+        protected virtual bool CanUpdate(T? value)
         {
             return true;
         }
@@ -93,7 +93,7 @@ await DbService.DB.Transaction(async _ =>
 
         private bool CanClearItemsDo()
         {
-            return Items.Any(CanDelete);
+            return ItemsState.Value.Any(CanDelete);
         }
     }
 }
diff --git a/DexieNETCloudSample/Dexie/Services/CrudService.cs b/DexieNETCloudSample/Dexie/Services/CrudService.cs
@@ -10,7 +10,7 @@ namespace DexieNETCloudSample.Dexie.Services
 {
     public abstract partial class CrudService<T> : RxBLService, IDisposable where T : IIDPrimaryIndex, IDBStore, IDBCloudEntity
     {
-        public IEnumerable<T> Items { get; private set; }
+        public IState<IEnumerable<T>> ItemsState { get; }
         public bool IsDBOpen => DbService.DB is not null;
 
         // Transformers
@@ -23,7 +23,8 @@ public abstract partial class CrudService<T> : RxBLService, IDisposable where T
 
         public CrudService(IServiceProvider serviceProvider)
         {
-            Items = [];
+            ItemsState = this.CreateState(Enumerable.Empty<T>());
+
             DbService = serviceProvider.GetRequiredService<DexieCloudService>();
         }
 
@@ -46,9 +47,9 @@ protected override ValueTask ContextReadyAsync()
         }
 
 
-        public bool CanUpdate<Q>(T? item, Expression<Func<T, Q>> query)
+        public bool CanUpdate<Q>(IDBCloudEntity? entity, Expression<Func<T, Q>> query)
         {
-            return item is not null && (Permissions?.CanUpdate(item, query)).True();
+            return entity is not null && (Permissions?.CanUpdate(entity, query)).True();
         }
 
         public void Dispose()
@@ -89,8 +90,7 @@ private void InitDB()
 #if DEBUG
                 Console.WriteLine($"CRUD new items: {l.Aggregate(string.Empty, (p, n) => p += n.ToString())}");
 #endif
-                Items = l;
-                StateHasChanged();
+                ItemsState.Value = l;
             }));
 
             Permissions = GetTable().CreateUsePermissions();

diff --git a/DexieNETCloudSample/Dexie/Services/ToDoItemService.State.cs b/DexieNETCloudSample/Dexie/Services/ToDoItemService.State.cs
@@ -36,16 +36,16 @@ public Func<bool> CanToggledItemCompleted(ToDoDBItem? item) => () =>
 
         public Func<bool> CanDeleteCompletedItems => () =>
         {
-            var item = Items.Where(i => i.Completed).FirstOrDefault();
+            var item = ItemsState.Value.Where(i => i.Completed).FirstOrDefault();
             return CanDelete(item);
         };
 
 
         public Func<bool> CanProvide() => () =>
         {
-            if (Items is not null)
+            if (ItemsState is not null)
             {
-                var item = Items.Where(i => i.Completed).FirstOrDefault();
+                var item = ItemsState.Value.Where(i => i.Completed).FirstOrDefault();
                 return CanDelete(item);
             }
 

diff --git a/DexieNETCloudSample/Dexie/Services/ToDoItemService.cs b/DexieNETCloudSample/Dexie/Services/ToDoItemService.cs
@@ -19,7 +19,14 @@ public async Task SubmitAsync()
             {
                 ArgumentNullException.ThrowIfNull(service.CurrentList.Value);
                 var newItem = ToDoDBItem.Create(Text.Value, DueDateDate.Value + DueDateTime.Value, service.CurrentList.Value, item);
-                await service.CommandAsync.ExecuteAsync(service.AddItem(newItem));
+                if (item is null)
+                {
+                    await service.CommandAsync.ExecuteAsync(service.AddItem(newItem));
+                }
+                else
+                {
+                    await service.CommandAsync.ExecuteAsync(service.UpdateItem(newItem));
+                }
             }
             public bool CanSubmit()
             {
@@ -32,12 +39,12 @@ public bool CanSubmit()
 
             public Func<string, bool> CanUpdateText => _ =>
             {
-                return service.CanUpdate(item, i => i.Text);
+                return service.CanUpdate(service.CurrentList.Value, i => i.Text);
             };
 
             public Func<DateTime, bool> CanUpdateDueDate => _ =>
             {
-                return service.CanUpdate(item, i => i.DueDate);
+                return service.CanUpdate(service.CurrentList.Value, i => i.DueDate);
             };
 
             public static Func<string, StateValidation> ValidateText => v =>
@@ -60,7 +67,7 @@ public bool CanSubmit()
 
             public Func<TimeSpan, bool> CanUpdateTime => _ =>
             {
-                return service.CanUpdate(item, i => i.DueDate);
+                return service.CanUpdate(service.CurrentList.Value, i => i.DueDate);
             };
 
             private static DateTime? NoSeconds(DateTime? dateTime)
@@ -75,7 +82,7 @@ public bool CanSubmit()
             }
         }
 
-        public IEnumerable<ToDoDBItem> ToDoItems => Items ?? [];
+        public IEnumerable<ToDoDBItem> ToDoItems => ItemsState.Value;
         public IState<ToDoDBList?> CurrentList { get; }
 
         private ToDoDB? _db;
@@ -108,7 +115,7 @@ public override bool CanAdd()
             return (Permissions?.CanAdd(CurrentList.Value)).True();
         }
 
-        public override bool CanUpdate(ToDoDBItem? item)
+        protected override bool CanUpdate(ToDoDBItem? item)
         {
             return CanUpdate(item, i => i.Text) || CanUpdate(item, i => i.DueDate);
         }

diff --git a/DexieNETCloudSample/Dexie/Services/ToDoListMemberService.State.cs b/DexieNETCloudSample/Dexie/Services/ToDoListMemberService.State.cs
@@ -7,6 +7,57 @@ namespace DexieNETCloudSample.Dexie.Services
 {
     public partial class ToDoListMemberService
     {
+        public class MemberRowScope(ToDoListMemberService service) : RxBLStateScope<ToDoListMemberService>(service)
+        {
+            private static readonly MemberRoleSelection[] _roleSelections =
+             [
+                new(MemberRole.OWNER),
+                new(MemberRole.ADMIN),
+                new(MemberRole.USER),
+                new(MemberRole.GUEST),
+            ];
+
+            public IStateGroupAsync<MemberRoleSelection> MemberRoleSelection =
+                            service.CreateStateGroupAsync(_roleSelections);
+
+            public Func<MemberRoleSelection> GetInitialMemberRole(Member? member) => () =>
+            {
+                ArgumentNullException.ThrowIfNull(member);
+                var role = Service.GetMemberRole(member);
+
+                MemberRoleSelection? initialSelection = null;
+
+                foreach (var roleSelection in _roleSelections)
+                {
+                    var displayName = Service.GetRoleDisplayName(roleSelection.Role);
+                    roleSelection.RoleName = displayName;
+                    if (roleSelection.Role == role)
+                    {
+                        initialSelection = roleSelection;
+                    }
+                }
+
+                ArgumentNullException.ThrowIfNull(initialSelection);
+                return initialSelection;
+            };
+
+            public Func<MemberRoleSelection, MemberRoleSelection, Task> MemberRoleChangingAsync(Member member) => async (or, nr) =>
+            {
+                await Service.ChangeAccess(member, or.Role, nr.Role);
+            };
+
+            public Func<bool> CanChangeMemberRole(Member member) => () =>
+            {
+                return Service.CanUpdateRole(member);
+            };
+
+            public bool IsMemberRoleDisabled(Member member, int index)
+            {
+                var role = _roleSelections[index].Role;
+                return !Service.CanChangeToRole(member, role);
+            }
+        }
+
         public Func<bool> CanSetList(ToDoDBList? list) => () =>
         {
             return list is not null && list != List.Value;
@@ -50,50 +101,5 @@ public Func<bool> CanChangeMemberState(Member? member) => () =>
                 _ => false
             };
         };
-
-        private static readonly MemberRoleSelection[] _roleSelections =
-        [
-            new(MemberRole.OWNER),
-            new(MemberRole.ADMIN),
-            new(MemberRole.USER),
-            new(MemberRole.GUEST),
-        ];
-
-        public Func<MemberRoleSelection> GetInitialMemberRole(Member? member) => () =>
-        {
-            ArgumentNullException.ThrowIfNull(member);
-            var role = GetMemberRole(member);
-
-            MemberRoleSelection? initialSelection = null;
-
-            foreach (var roleSelection in _roleSelections)
-            {
-                var displayName = GetRoleDisplayName(roleSelection.Role);
-                roleSelection.RoleName = displayName;
-                if (roleSelection.Role == role)
-                {
-                    initialSelection = roleSelection;
-                }
-            }
-
-            ArgumentNullException.ThrowIfNull(initialSelection);
-            return initialSelection;
-        };
-
-        public Func<MemberRoleSelection, MemberRoleSelection, Task> MemberRoleChangingAsync(Member member) => async (or, nr) =>
-        {
-            await ChangeAccess(member, or.Role, nr.Role);
-        };
-
-        public Func<bool> CanChangeMemberRole(Member member) => () =>
-        {
-            return CanUpdateRole(member);
-        };
-
-        public bool IsMemberRoleDisabled(Member member, int index)
-        {
-            var role = _roleSelections[index].Role;
-            return !CanChangeToRole(member, role);
-        }
     }
 }