Encapsulate DataDictionaryRepository

src/Core/DataDictionary/Services/ActionsService.cs

@@ -18,7 +18,7 @@ public class ActionsService(IValidationDictionary validationDictionary,
         IDataDictionaryRepository dataDictionaryRepository,
         IEnumerable<IExpressionProvider> expressionProviders,
         IEnumerable<IPluginHandler> pluginHandlers)
-    : BaseService(validationDictionary, dataDictionaryRepository,stringLocalizer)
+    : DataDictionaryServiceBase(validationDictionary, dataDictionaryRepository,stringLocalizer)
 {
     public async Task<bool> DeleteActionAsync(string elementName, string actionName, ActionSource context, string fieldName = null)
     {

src/Core/DataDictionary/Services/ApiService.cs

@@ -9,7 +9,7 @@ namespace JJMasterData.Core.DataDictionary.Services;
 public class ApiService(IValidationDictionary validationDictionary,
         IDataDictionaryRepository dataDictionaryRepository,
         IStringLocalizer<MasterDataResources> stringLocalizer)
-    : BaseService(validationDictionary, dataDictionaryRepository,stringLocalizer)
+    : DataDictionaryServiceBase(validationDictionary, dataDictionaryRepository,stringLocalizer)
 {
     public async Task<bool> SetFormElementWithApiValidation(FormElement formElement)
     {

src/Core/DataDictionary/Services/BaseService.cs → src/Core/DataDictionary/Services/DataDictionaryServiceBase.cs

@@ -11,11 +11,12 @@
 
 namespace JJMasterData.Core.DataDictionary.Services;
 
-public abstract class BaseService(IValidationDictionary validationDictionary, 
+public abstract class DataDictionaryServiceBase(
+    IValidationDictionary validationDictionary, 
     IDataDictionaryRepository dataDictionaryRepository,
     IStringLocalizer<MasterDataResources> stringLocalizer)
 {
-    public IDataDictionaryRepository DataDictionaryRepository { get; } = dataDictionaryRepository;
+    protected IDataDictionaryRepository DataDictionaryRepository { get; } = dataDictionaryRepository;
     protected IStringLocalizer<MasterDataResources> StringLocalizer { get; } = stringLocalizer;
 
     protected void AddError(string field, string message)
@@ -40,6 +41,11 @@ public ValueTask<FormElement> GetFormElementAsync(string elementName)
     {
         return DataDictionaryRepository.GetFormElementAsync(elementName);
     }
+
+    public Task<List<string>> GetNameListAsync()
+    {
+        return DataDictionaryRepository.GetNameListAsync();
+    }
 
     public bool ValidateName(string name)
     {

src/Core/DataDictionary/Services/ElementService.cs

@@ -28,7 +28,7 @@ public class ElementService(
         IDataDictionaryRepository dataDictionaryRepository,
         DataDictionaryFormElementFactory dataDictionaryFormElementFactory,
         IMasterDataUrlHelper urlHelper)
-    : BaseService(validationDictionary, dataDictionaryRepository, stringLocalizer)
+    : DataDictionaryServiceBase(validationDictionary, dataDictionaryRepository, stringLocalizer)
 {
     #region Add Dictionary
 
@@ -263,4 +263,9 @@ public Task CreateStructureIfNotExistsAsync()
     {
         return DataDictionaryRepository.CreateStructureIfNotExistsAsync();
     }
+
+    public Task DeleteAsync(string? elementName)
+    {
+        return DataDictionaryRepository.DeleteAsync(elementName);
+    }
 }

src/Core/DataDictionary/Services/EntityService.cs

@@ -10,7 +10,7 @@ namespace JJMasterData.Core.DataDictionary.Services;
 public class EntityService(IValidationDictionary validationDictionary,
         IDataDictionaryRepository dataDictionaryRepository,
         IStringLocalizer<MasterDataResources> stringLocalizer)
-    : BaseService(validationDictionary, dataDictionaryRepository,stringLocalizer)
+    : DataDictionaryServiceBase(validationDictionary, dataDictionaryRepository,stringLocalizer)
 {
     private async Task<bool> ValidateEntity(Entity entity, string originName)
     {

src/Core/DataDictionary/Services/FieldService.cs

@@ -15,7 +15,7 @@ public class FieldService(IValidationDictionary validationDictionary,
         IDataDictionaryRepository dataDictionaryRepository,
         IEnumerable<IExpressionProvider> expressionProviders,
         IStringLocalizer<MasterDataResources> stringLocalizer)
-    : BaseService(validationDictionary, dataDictionaryRepository,stringLocalizer)
+    : DataDictionaryServiceBase(validationDictionary, dataDictionaryRepository,stringLocalizer)
 {
     public async Task<bool> SaveFieldAsync(string elementName, FormElementField field, string originalName)
     {

src/Core/DataDictionary/Services/IndexesService.cs

@@ -9,7 +9,7 @@ namespace JJMasterData.Core.DataDictionary.Services;
 public class IndexesService(IValidationDictionary validationDictionary,
         IDataDictionaryRepository dataDictionaryRepository,
         IStringLocalizer<MasterDataResources> stringLocalizer)
-    : BaseService(validationDictionary, dataDictionaryRepository,stringLocalizer)
+    : DataDictionaryServiceBase(validationDictionary, dataDictionaryRepository,stringLocalizer)
 {
     public async Task<bool> SaveAsync(string id, string index, ElementIndex elementIndex)
     {

src/Core/DataDictionary/Services/PanelService.cs

@@ -15,7 +15,7 @@ public class PanelService(IValidationDictionary validationDictionary,
         IEnumerable<IExpressionProvider> expressionProviders,
         IDataDictionaryRepository dataDictionaryRepository,
         IStringLocalizer<MasterDataResources> stringLocalizer)
-    : BaseService(validationDictionary, dataDictionaryRepository,stringLocalizer)
+    : DataDictionaryServiceBase(validationDictionary, dataDictionaryRepository,stringLocalizer)
 {
     private IEnumerable<IExpressionProvider> ExpressionProviders { get; } = expressionProviders;
 

src/Core/DataDictionary/Services/RelationshipsService.cs

@@ -14,7 +14,7 @@ public class RelationshipsService(IValidationDictionary validationDictionary,
         IDataDictionaryRepository dataDictionaryRepository,
         IStringLocalizer<MasterDataResources> stringLocalizer,
         PanelService panelService)
-    : BaseService(validationDictionary, dataDictionaryRepository,stringLocalizer)
+    : DataDictionaryServiceBase(validationDictionary, dataDictionaryRepository,stringLocalizer)
 {
     public async Task SaveElementRelationship(ElementRelationship elementRelationship, int? id, string elementName)
     {

src/Core/DataDictionary/Services/UIOptionsService.cs

@@ -9,7 +9,7 @@ namespace JJMasterData.Core.DataDictionary.Services;
 
 public class UIOptionsService(IValidationDictionary validationDictionary,
         IDataDictionaryRepository dataDictionaryRepository, IStringLocalizer<MasterDataResources> stringLocalizer)
-    : BaseService(validationDictionary, dataDictionaryRepository,stringLocalizer)
+    : DataDictionaryServiceBase(validationDictionary, dataDictionaryRepository,stringLocalizer)
 {
     private async Task<bool> ValidateOptions(FormElementOptions options, string elementName)
     {

src/Web/Areas/DataDictionary/Controllers/ActionsController.cs

@@ -16,7 +16,7 @@ public class ActionsController(ActionsService actionsService,
 {
     public async Task<ActionResult> Index(string elementName)
     {
-        var formElement = await actionsService.DataDictionaryRepository.GetFormElementAsync(elementName);
+        var formElement = await actionsService.GetFormElementAsync(elementName);
         var model = new ActionsListViewModel(elementName, "Actions")
         {
             GridTableActions = formElement.Options.GridTableActions.GetAllSorted(),
@@ -36,7 +36,7 @@ public async Task<IActionResult> Edit(string elementName, string actionName, Act
             throw new ArgumentNullException(nameof(elementName));
 
 
-        var formElement = await actionsService.DataDictionaryRepository.GetFormElementAsync(elementName);
+        var formElement = await actionsService.GetFormElementAsync(elementName);
 
         var action = context switch
         {
@@ -414,7 +414,7 @@ private async Task PopulateViewBag(string elementName, BasicAction basicAction,
         ViewBag.FieldName = fieldName!;
         var formElement = await actionsService.GetFormElementAsync(elementName);
         ViewBag.FormElement = formElement;
-        ViewBag.CodeMirrorHintList = JsonConvert.SerializeObject(BaseService.GetAutocompleteHintsList(formElement, includeAdditionalHints:false));
+        ViewBag.CodeMirrorHintList = JsonConvert.SerializeObject(DataDictionaryServiceBase.GetAutocompleteHintsList(formElement, includeAdditionalHints:false));
 
         if (basicAction is InternalAction internalAction)
         {

src/Web/Areas/DataDictionary/Controllers/ApiController.cs

@@ -10,15 +10,15 @@ public class ApiController(ApiService apiService) : DataDictionaryController
 {
     public async Task<ActionResult> Index(string elementName)
     {
-        var dic = await apiService.DataDictionaryRepository.GetFormElementAsync(elementName);
+        var dic = await apiService.GetFormElementAsync(elementName);
         var model = PopulateViewModel(dic);
 
         return View(model);
     }
 
     public async Task<ActionResult> Edit(string elementName)
     {
-        var dic = await apiService.DataDictionaryRepository.GetFormElementAsync(elementName);
+        var dic = await apiService.GetFormElementAsync(elementName);
         var model = PopulateViewModel(dic);
 
         return View(model);
@@ -27,7 +27,7 @@ public async Task<ActionResult> Edit(string elementName)
     [HttpPost]
     public async Task<ActionResult> Edit(ApiViewModel apiViewModel)
     {
-        var formElement = await apiService.DataDictionaryRepository.GetFormElementAsync( apiViewModel.ElementName);
+        var formElement = await apiService.GetFormElementAsync( apiViewModel.ElementName);
         formElement.ApiOptions = apiViewModel.ApiOptions;
         formElement.EnableSynchronism = apiViewModel.EnableSynchronism;
         formElement.SynchronismMode = apiViewModel.SynchronismMode;

src/Web/Areas/DataDictionary/Controllers/ElementController.cs

@@ -187,7 +187,7 @@ public async Task<IActionResult> Delete()
 
         foreach (var elementName in elementNamesToDelete)
         {
-            await elementService.DataDictionaryRepository.DeleteAsync(elementName);
+            await elementService.DeleteAsync(elementName);
         }
 
         return RedirectToAction(nameof(Index));

src/Web/Areas/DataDictionary/Controllers/FieldController.cs

@@ -95,7 +95,7 @@ public async Task<IActionResult> Sort(string elementName, string fieldsOrder)
     [HttpPost]
     public async Task<IActionResult> Copy(string elementName, FormElementField? field)
     {
-        var dictionary = await fieldService.DataDictionaryRepository.GetFormElementAsync(elementName);
+        var dictionary = await fieldService.GetFormElementAsync(elementName);
         await fieldService.CopyFieldAsync(dictionary, field);
         if (!ModelState.IsValid)
             ViewBag.Error = fieldService.GetValidationSummary().GetHtml();
@@ -208,7 +208,7 @@ private async Task PopulateViewBag(FormElement formElement, FormElementField? fi
         ViewBag.MenuId = "Fields";
         ViewBag.FormElement = formElement;
         ViewBag.ElementName = formElement.Name;
-        ViewBag.CodeMirrorHintList = JsonConvert.SerializeObject(BaseService.GetAutocompleteHintsList(formElement));
+        ViewBag.CodeMirrorHintList = JsonConvert.SerializeObject(DataDictionaryServiceBase.GetAutocompleteHintsList(formElement));
 
         // ASP.NET Core enforces 30MB (~28.6 MiB) max request body size limit, be it Kestrel and HttpSys.
         // Under normal circumstances, there is no need to increase the size of the HTTP request.

src/Web/Areas/DataDictionary/Controllers/PanelController.cs

@@ -115,7 +115,7 @@ private void PopulateViewBag(FormElement formElement, FormElementPanel panel)
         ViewBag.PanelId = panel.PanelId;
         ViewBag.Panels = formElement.Panels;
         ViewBag.AvailableFields = GetAvailableFields(formElement);
-        ViewBag.CodeMirrorHintList = JsonConvert.SerializeObject(BaseService.GetAutocompleteHintsList(formElement));
+        ViewBag.CodeMirrorHintList = JsonConvert.SerializeObject(DataDictionaryServiceBase.GetAutocompleteHintsList(formElement));
         ViewBag.SelectedFields = (panel.PanelId > 0) ?
             formElement.Fields.FindAll(x => x.PanelId == panel.PanelId) : [];
     }

src/Web/Areas/DataDictionary/Controllers/RelationshipsController.cs

@@ -148,7 +148,7 @@ private async Task<List<SelectListItem>> GetForeignKeysSelectList(string childEl
         }
         else
         {
-            var formElement = await relationshipsService.DataDictionaryRepository.GetFormElementAsync(childElementName);
+            var formElement = await relationshipsService.GetFormElementAsync(childElementName);
             selectList.AddRange(formElement.Fields.Select(field => new SelectListItem(field.Name, field.Name)));
         }
 
@@ -157,7 +157,7 @@ private async Task<List<SelectListItem>> GetForeignKeysSelectList(string childEl
 
     private async Task<List<SelectListItem>> GetElementsSelectList(string childElementName)
     {
-        var list = await relationshipsService.DataDictionaryRepository.GetNameListAsync();
+        var list = await relationshipsService.GetNameListAsync();
 
         var selectList = list.Select(name => new SelectListItem(name, name)).OrderBy(n=>n.Text).ToList();
 
@@ -202,11 +202,11 @@ private async Task<RelationshipsLayoutDetailsViewModel> CreateLayoutDetailsViewM
         string elementName,
         int id)
     {
-        var formElement = await relationshipsService.DataDictionaryRepository.GetFormElementAsync(elementName);
+        var formElement = await relationshipsService.GetFormElementAsync(elementName);
 
         var relationship = formElement.Relationships.GetById(id);
 
-        ViewBag.CodeMirrorHintList = JsonConvert.SerializeObject(BaseService.GetAutocompleteHintsList(formElement));
+        ViewBag.CodeMirrorHintList = JsonConvert.SerializeObject(DataDictionaryServiceBase.GetAutocompleteHintsList(formElement));
 
         return new RelationshipsLayoutDetailsViewModel(elementName, "Relationships")
         {

src/Web/Areas/DataDictionary/Controllers/UIOptionsController.cs

@@ -32,7 +32,7 @@ public async Task<ActionResult> Edit(FormElementOptions uIMetadataOptions, strin
 
     private async Task<FormElementOptions> Populate(string elementName)
     {
-        var dicParser = await optionsService!.DataDictionaryRepository.GetFormElementAsync(elementName);
+        var dicParser = await optionsService.GetFormElementAsync(elementName);
         var uIOptions = dicParser.Options;
         ViewBag.MenuId = "Options";
         ViewBag.ElementName = elementName;