Merge pull request #28 from Ali-YousefiTelori/develop

Fix Event send request
EasyMicroservices · Jan 17, 2024 · 2ea4889 · 2ea4889
2 parents b02fbfa + 9c587aa
commit 2ea4889
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 9 deletions.
diff --git a/...services.UI.TemplateGenerator.Blazor/EasyMicroservices.UI.TemplateGenerator.Blazor.csproj b/...services.UI.TemplateGenerator.Blazor/EasyMicroservices.UI.TemplateGenerator.Blazor.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <Authors>EasyMicroservices</Authors>
     <IsPackable>true</IsPackable>
-    <Version>0.0.0.23</Version>
+    <Version>0.0.0.24</Version>
     <Description>TemplateGenerator UI compoents.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>component,microcomponent,ui,core,templategenerator,generator,template,form,formgenerator</PackageTags>

diff --git a/...lazor/EasyMicroservices.UI.TemplateGenerator.Blazor/Pages/Events/FormItemEventsList.razor b/...lazor/EasyMicroservices.UI.TemplateGenerator.Blazor/Pages/Events/FormItemEventsList.razor
@@ -64,6 +64,8 @@
         }
     }
 
+    [Parameter]
+    [Category("Behavior")]
     public ObservableCollection<FormItemEventContract> FormItemEvents
     {
         get
@@ -72,11 +74,18 @@
         }
         set
         {
+            if (ViewModel.FormItemEvents == value)
+                return;
             ViewModel.FormItemEvents = value;
             StateHasChanged();
+            FormItemEventsChanged.InvokeAsync(value);
         }
     }
 
+
+    [Parameter]
+    public EventCallback<ObservableCollection<FormItemEventContract>> FormItemEventsChanged { get; set; }
+
     AddOrUpdateFormItemEvent AddOrUpdateFormItemEventView;
     SaveChangeBaseDialog<FormItemEventContract> addOrUpdateDialog;
     DeleteBaseDialog<FormItemEventContract> deleteDialog;

diff --git a/...r/EasyMicroservices.UI.TemplateGenerator.Blazor/Pages/FormItems/AddOrUpdateFormItem.razor b/...r/EasyMicroservices.UI.TemplateGenerator.Blazor/Pages/FormItems/AddOrUpdateFormItem.razor
@@ -60,7 +60,7 @@
                 </MudDataGrid>
             </MudTabPanel>
             <MudTabPanel Text="@viewModel.GetInnerTranslatedByKey("Events")">
-                <FormItemEventsList @ref="formItemEventsList" />
+                <FormItemEventsList @ref="formItemEventsList" @bind-FormItemEvents="@viewModel.FormItemEvents" />
             </MudTabPanel>
         </MudTabs>
         <MudButton Variant="Variant.Filled" StartIcon="@Icons.Material.Filled.Save" Color="Color.Info" Disabled="viewModel.IsBusy" OnClick="(arg) => viewModel.SaveCommand.Execute(null)">
@@ -156,7 +156,6 @@
         addDialog.ShowDialog(() =>
         {
             AddOrUpdateFormItemView.ViewModel.Clear();
-            viewModel.FormItemEvents = formItemEventsList.FormItemEvents;
             AddOrUpdateFormItemView.ViewModel.OnSuccess = (contract) =>
             {
                 viewModel.FormItems.Add(contract);
@@ -174,8 +173,8 @@
         {
             AddOrUpdateFormItemView.ViewModel.Clear();
             AddOrUpdateFormItemView.ViewModel.UpdateFormItemContract = formItemContract;
-            if (formItemContract.Events != null)
-                viewModel.FormItemEvents = formItemEventsList.FormItemEvents = new System.Collections.ObjectModel.ObservableCollection<FormItemEventContract>(formItemContract.Events);
+            //if (formItemContract.Events != null)
+            //    viewModel.FormItemEvents = formItemEventsList.FormItemEvents = new System.Collections.ObjectModel.ObservableCollection<FormItemEventContract>(formItemContract.Events);
             AddOrUpdateFormItemView.ViewModel.OnSuccess = (item) =>
             {
                 var index = viewModel.FormItems.IndexOf(formItemContract);

diff --git a/....UI.TemplateGenerator.ViewModels/EasyMicroservices.UI.TemplateGenerator.ViewModels.csproj b/....UI.TemplateGenerator.ViewModels/EasyMicroservices.UI.TemplateGenerator.ViewModels.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <Authors>EasyMicroservices</Authors>
     <IsPackable>true</IsPackable>
-    <Version>0.0.0.23</Version>
+    <Version>0.0.0.24</Version>
     <Description>TemplateGenerator view model.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>component,microcomponent,ui,core,templategenerator,generator,template,form,formgenerator</PackageTags>

diff --git a/...ices.UI.TemplateGenerator.ViewModels/ViewModels/FormItems/AddOrUpdateFormItemViewModel.cs b/...ices.UI.TemplateGenerator.ViewModels/ViewModels/FormItems/AddOrUpdateFormItemViewModel.cs
@@ -149,7 +149,7 @@ FormItemContract GetContract()
             Title = Title,
             Items = FormItems,
             PrimaryFormItemId = SelectedNoParentFormItem?.Id,
-            Events = FormItemEvents
+            Events = CleanCollection(Clone(FormItemEvents.ToList()))
         };
     }
 
@@ -162,7 +162,7 @@ CreateFormItemRequestContract GetCreateContract()
             Title = Title,
             Items = JsonSerializer.Deserialize<List<CreateFormItemContract>>(JsonSerializer.Serialize(FormItems)),
             PrimaryFormItemId = SelectedNoParentFormItem?.Id,
-            Events = FormItemEvents
+            Events = CleanCollection(Clone(FormItemEvents.ToList()))
         };
     }
 
@@ -176,7 +176,7 @@ UpdateFormItemRequestContract GetUpdateContract()
             Title = Title,
             Items = FormItems,
             PrimaryFormItemId = SelectedNoParentFormItem?.Id,
-            Events = FormItemEvents
+            Events = CleanCollection(Clone(FormItemEvents.ToList()))
         };
     }
 
@@ -216,6 +216,37 @@ public async Task LoadConfig()
         }
     }
 
+    T Clone<T>(T data)
+    {
+        return JsonSerializer.Deserialize<T>(JsonSerializer.Serialize(data));
+    }
+
+    ICollection<FormItemEventContract> CleanCollection(ICollection<FormItemEventContract> formItemEvents)
+    {
+        if (formItemEvents == null)
+            return formItemEvents;
+        foreach (var item in formItemEvents)
+        {
+            if (item.EventId > 0)
+                item.Event = null;
+            CleanCollection(item.FormItemEventActions);
+        }
+        return formItemEvents;
+    }
+
+    ICollection<FormItemEventActionContract> CleanCollection(ICollection<FormItemEventActionContract>  formItemEventActions)
+    {
+        if (formItemEventActions == null)
+            return formItemEventActions;
+        foreach (var item in formItemEventActions)
+        {
+            if (item.ActionId > 0)
+                item.Action = null;
+            CleanCollection(item.Children);
+        }
+        return formItemEventActions;
+    }
+
     public void Clear()
     {
         Title = "";