Test

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/WorksheetInstances/IWorksheetInstanceAppService.cs

@@ -6,7 +6,7 @@ namespace Unity.Flex.WorksheetInstances
 {
     public interface IWorksheetInstanceAppService : IApplicationService
     {
-        Task<WorksheetInstanceDto> GetByCorrelationAnchorAsync(Guid correlationId, string correlationProvider, Guid? worksheetId, string uiAnchor);
+        Task<WorksheetInstanceDto> GetByCorrelationAnchorAsync(Guid correlationId, string correlationProvider, Guid worksheetId, string uiAnchor);
         Task<WorksheetInstanceDto> CreateAsync(CreateWorksheetInstanceDto dto);
         Task UpdateAsync(PersistWorksheetIntanceValuesDto dto);
     }

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Worksheets/CustomDataFieldDto.cs

@@ -1,11 +1,13 @@
 using System;
+using System.Collections.Generic;
 
 namespace Unity.Flex.Worksheets
 {
     public class CustomDataFieldDto
     {
         public dynamic? CustomFields { get; set; }
         public Guid CorrelationId { get; set; }
-        public Guid WorksheetId { get; set; }
+        public Guid WorksheetId { get; set; }        // Keep for backward compatibility
+        public List<Guid> WorksheetIds { get; set; } = new List<Guid>(); // NEW - multiple worksheets support
     }
 }

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Worksheets/IWorksheetAppService.cs

@@ -10,7 +10,7 @@ public interface IWorksheetAppService : IApplicationService
         Task<WorksheetDto> GetAsync(Guid id);
         Task<List<WorksheetDto>> GetListAsync();
         Task<List<WorksheetDto>> GetListByCorrelationAsync(Guid correlationId, string correlationProvider);
-        Task<WorksheetDto?> GetByCorrelationAnchorAsync(Guid correlationId, string correlationProvider, string uiAnchor);
+        Task<List<WorksheetDto>> GetListByCorrelationAnchorAsync(Guid correlationId, string correlationProvider, string uiAnchor);
         Task<WorksheetDto> CreateAsync(CreateWorksheetDto dto);
         Task<WorksheetSectionDto> CreateSectionAsync(Guid id, CreateSectionDto dto);
         Task<WorksheetDto> EditAsync(Guid id, EditWorksheetDto dto);

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/Services/WorksheetsManager.cs

@@ -42,7 +42,12 @@ public async Task PersistWorksheetData(PersistWorksheetIntanceValuesEto eventDat
             Worksheet? worksheet;
             if (string.IsNullOrEmpty(eventData.FormDataName))
             {
-                worksheet = await worksheetRepository.GetByCorrelationAnchorAsync(eventData.SheetCorrelationId, eventData.SheetCorrelationProvider, eventData.UiAnchor, true);
+                if (eventData.WorksheetId == Guid.Empty)
+                {
+                    // WorksheetId is not set; cannot proceed.
+                    return;
+                }
+                worksheet = await worksheetRepository.GetAsync(eventData.WorksheetId, true);
             }
             else
             {

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/WorksheetInstances/IWorksheetInstanceRepository.cs

@@ -8,7 +8,6 @@ namespace Unity.Flex.Domain.WorksheetInstances
     public interface IWorksheetInstanceRepository : IBasicRepository<WorksheetInstance, Guid>
     {
         Task<WorksheetInstance?> GetByCorrelationAnchorWorksheetAsync(Guid correlationId, string correlationProvider, Guid worksheetId, string uiAnchor, bool includeDetails);
-        Task<WorksheetInstance?> GetByCorrelationAnchorAsync(Guid correlationId, string correlationProvider, string uiAnchor, bool includeDetails);        
         Task<List<WorksheetInstance>> GetByWorksheetCorrelationAsync(Guid worksheetId, string uiAnchor, Guid worksheetCorrelationId, string worksheetCorrelationProvider);
         Task<WorksheetInstance?> GetWithValuesAsync(Guid worksheetInstanceId);
         Task<bool> ExistsAsync(Guid worksheetId, Guid instanceCorrelationId, string instanceCorrelationProvider, Guid sheetCorrelationId, string sheetCorrelationProvider, string? uiAnchor);

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/Worksheets/IWorksheetRepository.cs

@@ -9,7 +9,7 @@ public interface IWorksheetRepository : IBasicRepository<Worksheet, Guid>
     {
         Task<Worksheet> GetAsync(Guid id, bool includeDetails = true);
         Task<List<Worksheet>> GetListAsync(bool includeDetails = false);
-        Task<Worksheet?> GetByCorrelationAnchorAsync(Guid correlationId, string correlationProvider, string uiAnchor, bool includeDetails = false);
+        Task<List<Worksheet>> GetListByCorrelationAnchorAsync(Guid correlationId, string correlationProvider, string uiAnchor, bool includeDetails = false);
         Task<Worksheet?> GetByCorrelationByNameAsync(Guid correlationId, string correlationProvider, string name, bool includeDetails = false);
         Task<Worksheet?> GetByNameAsync(string name, bool includeDetails = false);
         Task<Worksheet?> GetBySectionAsync(Guid id, bool includeDetails = false);

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/EntityFrameworkCore/Repositories/WorksheetInstanceRepository.cs

@@ -26,19 +26,6 @@ public class WorksheetInstanceRepository(IDbContextProvider<FlexDbContext> dbCon
                         && s.UiAnchor == uiAnchor);
         }
 
-        public async Task<WorksheetInstance?> GetByCorrelationAnchorAsync(Guid correlationId,
-           string correlationProvider,
-           string uiAnchor,
-           bool includeDetails)
-        {
-            var dbSet = await GetDbSetAsync();
-
-            return await dbSet.IncludeDetails(includeDetails)
-                .FirstOrDefaultAsync(s => s.CorrelationId == correlationId
-                        && s.CorrelationProvider == correlationProvider
-                        && s.UiAnchor == uiAnchor);
-        }
-
         public async Task<List<WorksheetInstance>> GetByWorksheetCorrelationAsync(Guid worksheetId,
             string uiAnchor,
             Guid worksheetCorrelationId,

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/EntityFrameworkCore/Repositories/WorksheetRepository.cs

@@ -11,13 +11,28 @@ namespace Unity.Flex.EntityFrameworkCore.Repositories
 {
     public class WorksheetRepository(IDbContextProvider<FlexDbContext> dbContextProvider) : EfCoreRepository<FlexDbContext, Worksheet, Guid>(dbContextProvider), IWorksheetRepository
     {
-        public async Task<Worksheet?> GetByCorrelationAnchorAsync(Guid correlationId, string correlationProvider, string uiAnchor, bool includeDetails = false)
+        public async Task<List<Worksheet>> GetListByCorrelationAnchorAsync(Guid correlationId, string correlationProvider, string uiAnchor, bool includeDetails = false)
         {
             var dbSet = await GetDbSetAsync();
 
-            return await dbSet
-                    .IncludeDetails(includeDetails)
-                    .FirstOrDefaultAsync(s => s.Links.Any(s => s.CorrelationId == correlationId && s.CorrelationProvider == correlationProvider && s.UiAnchor == uiAnchor));
+            // First, get the worksheet IDs with their order from Links
+            var worksheetIdsWithOrder = await dbSet
+                .SelectMany(w => w.Links)
+                .Where(l => l.CorrelationId == correlationId && l.CorrelationProvider == correlationProvider && l.UiAnchor == uiAnchor)
+                .Select(l => new { l.WorksheetId, l.Order })
+                .ToListAsync();
+
+            var worksheetIds = worksheetIdsWithOrder.Select(w => w.WorksheetId).ToList();
+
+            // Then get the full worksheets
+            var worksheets = await dbSet
+                .IncludeDetails(includeDetails)
+                .Where(w => worksheetIds.Contains(w.Id))
+                .ToListAsync();
+
+            // Finally, order them in memory using the order we retrieved
+            var orderLookup = worksheetIdsWithOrder.ToDictionary(w => w.WorksheetId, w => w.Order ?? 0);
+            return worksheets.OrderBy(w => orderLookup[w.Id]).ToList();
         }
 
         public async Task<Worksheet?> GetByCorrelationByNameAsync(Guid correlationId, string correlationProvider, string name, bool includeDetails = false)

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/EntityFrameworkCore/WorksheetQueryableExtensions.cs

@@ -12,7 +12,8 @@ public static IQueryable<Worksheet> IncludeDetails(this IQueryable<Worksheet> qu
         {
             return !include ? queryable : queryable
                 .Include(s => s.Sections.OrderBy(s => s.Order))
-                    .ThenInclude(s => s.Fields.OrderBy(s => s.Order));
+                    .ThenInclude(s => s.Fields.OrderBy(s => s.Order))
+                .Include(s => s.Links);
         }
 
         public static IQueryable<WorksheetInstance> IncludeDetails(this IQueryable<WorksheetInstance> queryable, bool include = true)

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Worksheets/WorksheetAppService.cs

@@ -33,13 +33,11 @@ public virtual async Task<List<WorksheetDto>> GetListByCorrelationAsync(Guid cor
             return ObjectMapper.Map<List<Worksheet>, List<WorksheetDto>>(worksheets);
         }
 
-        public virtual async Task<WorksheetDto?> GetByCorrelationAnchorAsync(Guid correlationId, string correlationProvider, string uiAnchor)
+        public virtual async Task<List<WorksheetDto>> GetListByCorrelationAnchorAsync(Guid correlationId, string correlationProvider, string uiAnchor)
         {
-            var worksheet = await worksheetRepository.GetByCorrelationAnchorAsync(correlationId, correlationProvider, uiAnchor, true);
+            var worksheets = await worksheetRepository.GetListByCorrelationAnchorAsync(correlationId, correlationProvider, uiAnchor, true);
 
-            if (worksheet == null) return null;
-
-            return ObjectMapper.Map<Worksheet, WorksheetDto>(worksheet);
+            return ObjectMapper.Map<List<Worksheet>, List<WorksheetDto>>(worksheets);
         }
 
         public virtual async Task<WorksheetDto> CreateAsync(CreateWorksheetDto dto)

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Worksheets/WorksheetInstanceAppService.cs

@@ -9,12 +9,9 @@ namespace Unity.Flex.WorksheetInstances
     [Authorize]
     public class WorksheetInstanceAppService(IWorksheetInstanceRepository worksheetInstanceRepository, WorksheetsManager worksheetsManager) : FlexAppService, IWorksheetInstanceAppService
     {
-        public virtual async Task<WorksheetInstanceDto> GetByCorrelationAnchorAsync(Guid correlationId, string correlationProvider, Guid? worksheetId, string uiAnchor)
+        public virtual async Task<WorksheetInstanceDto> GetByCorrelationAnchorAsync(Guid correlationId, string correlationProvider, Guid worksheetId, string uiAnchor)
         {
-            if (worksheetId == null)
-                return ObjectMapper.Map<WorksheetInstance?, WorksheetInstanceDto>(await worksheetInstanceRepository.GetByCorrelationAnchorAsync(correlationId, correlationProvider, uiAnchor, true));
-            else
-                return ObjectMapper.Map<WorksheetInstance?, WorksheetInstanceDto>(await worksheetInstanceRepository.GetByCorrelationAnchorWorksheetAsync(correlationId, correlationProvider, worksheetId.Value, uiAnchor, true));
+            return ObjectMapper.Map<WorksheetInstance?, WorksheetInstanceDto>(await worksheetInstanceRepository.GetByCorrelationAnchorWorksheetAsync(correlationId, correlationProvider, worksheetId, uiAnchor, true));
         }
 
         public virtual async Task<WorksheetInstanceDto> CreateAsync(CreateWorksheetInstanceDto dto)

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Worksheets/WorksheetLinkAppService.cs

@@ -50,13 +50,13 @@ private static async Task AddAndUnorphanLinksAsync(IWorksheetLinkRepository work
             List<WorksheetLinkDto> refreshedLinks)
         {
             // Add new
-            foreach (var (worksheetId, anchor, _) in dto.WorksheetAnchors)
+            foreach (var (worksheetId, anchor, order) in dto.WorksheetAnchors)
             {
                 if (worksheetLinks.Find(s => s.CorrelationId == dto.CorrelationId
                     && s.CorrelationProvider == dto.CorrelationProvider
                         && s.WorksheetId == worksheetId) == null)
                 {
-                    var newLink = new WorksheetLink(Guid.NewGuid(), worksheetId, dto.CorrelationId, dto.CorrelationProvider, anchor);
+                    var newLink = new WorksheetLink(Guid.NewGuid(), worksheetId, dto.CorrelationId, dto.CorrelationProvider, anchor, order);
 
                     var worksheetInstances = await worksheetInstanceRepository
                         .GetByWorksheetCorrelationAsync(worksheetId, ORPHANED, dto.CorrelationId, dto.CorrelationProvider);

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/BCAddressWidget/BCAddressWidget.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
+using System;
 using System.Threading.Tasks;
 using Unity.Flex.Web.Views.Shared.Components.WorksheetInstanceWidget.ViewModels;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
@@ -16,12 +17,13 @@ namespace Unity.Flex.Web.Views.Shared.Components.BCAddressWidget
         AutoInitialize = true)]
     public class BCAddressWidget : AbpViewComponent
     {
-        public async Task<IViewComponentResult> InvokeAsync(WorksheetFieldViewModel? fieldModel, string modelName)
+        public async Task<IViewComponentResult> InvokeAsync(WorksheetFieldViewModel? fieldModel, string modelName, Guid? worksheetId = null)
         {            
             return View(await Task.FromResult(new BCAddressViewModel()
             {                
                 Field = fieldModel,
-                Name = modelName
+                Name = modelName,
+                WorksheetId = worksheetId
             }));
         }
     }

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/BCAddressWidget/BCAddressWidgetController.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using System;
 using Unity.Flex.Web.Views.Shared.Components.WorksheetInstanceWidget.ViewModels;
 using Unity.Modules.Shared.Utils;
 using Volo.Abp.AspNetCore.Mvc;
@@ -12,14 +13,14 @@ public class BCAddressWidgetController : AbpController
     {
         [HttpGet]
         [Route("Refresh")]
-        public IActionResult Refresh(WorksheetFieldViewModel? fieldModel, string modelName)
+        public IActionResult Refresh(WorksheetFieldViewModel? fieldModel, string modelName, Guid? worksheetId = null)
         {
             if (!ModelState.IsValid)
             {
                 Logger.LogWarning("Invalid model state for Refresh: {ModelName}, {FieldModel}", modelName.SanitizeField(), fieldModel?.Id.ToString());
                 return ViewComponent(typeof(BCAddressWidget));
             }
-            return ViewComponent(typeof(BCAddressWidget), new { fieldModel, modelName });
+            return ViewComponent(typeof(BCAddressWidget), new { fieldModel, modelName, worksheetId });
         }
     }
 }

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CheckboxGroupWidget/CheckboxGroupWidget.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
+using System;
 using System.Threading.Tasks;
 using Unity.Flex.Web.Views.Shared.Components.WorksheetInstanceWidget.ViewModels;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
@@ -16,9 +17,9 @@ namespace Unity.Flex.Web.Views.Shared.Components.CheckboxGroupWidget
         AutoInitialize = true)]
     public class CheckboxGroupWidget : AbpViewComponent
     {
-        public async Task<IViewComponentResult> InvokeAsync(WorksheetFieldViewModel? fieldModel, string modelName)
+        public async Task<IViewComponentResult> InvokeAsync(WorksheetFieldViewModel? fieldModel, string modelName, Guid? worksheetId = null)
         {
-            return View(await Task.FromResult(new CheckboxGroupViewModel() { Field = fieldModel, Name = modelName }));
+            return View(await Task.FromResult(new CheckboxGroupViewModel() { Field = fieldModel, Name = modelName, WorksheetId = worksheetId }));
         }
     }
 

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CheckboxGroupWidget/CheckboxGroupWidgetController.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
+using System;
 using Unity.Flex.Web.Views.Shared.Components.WorksheetInstanceWidget.ViewModels;
 using Volo.Abp.AspNetCore.Mvc;
 
@@ -10,12 +11,12 @@ public class CheckboxGroupWidgetController : AbpController
     {
         [HttpGet]
         [Route("Refresh")]
-        public IActionResult Refresh(WorksheetFieldViewModel? fieldModel, string modelName)
+        public IActionResult Refresh(WorksheetFieldViewModel? fieldModel, string modelName, Guid? worksheetId = null)
         {
 
             if (ModelState.IsValid)
             {
-                return ViewComponent(typeof(CheckboxGroupWidget), new { fieldModel, modelName });
+                return ViewComponent(typeof(CheckboxGroupWidget), new { fieldModel, modelName, worksheetId });
 
             }
             else

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CheckboxGroupWidget/Default.cshtml

@@ -7,29 +7,34 @@
 
 @if (Model.Field != null)
 {
+
     <fieldset>
         <legend></legend>
         @{
             var checkedValues = Model.Field?.CurrentValue?.GetCheckedOptions() ?? [];
             foreach (var option in ((CheckboxGroupDefinition?)Model.Field?.Definition?.ConvertDefinition(Model.Field.Type))?.Options ?? [])
-            {
+            {                
+                var optionId = Model.WorksheetId.HasValue
+                    ? $"{Model.Field?.Name}.{Model.Name}.{Model.Field?.Id}.{option.Key}.{Model.WorksheetId}"
+                    : $"{Model.Field?.Name}.{Model.Name}.{Model.Field?.Id}.{option.Key}";
+
                 <div class="custom-fields-checkbox-wrapper">
                     @if (checkedValues.Contains(option.Key))
                     {
                         <input type="@Model.Field?.Type.ConvertInputType()"
-                               id="@($"{Model.Field?.Name}.{Model.Name}.{Model.Field?.Id}.{option.Key}")"
-                               name="@($"{Model.Field?.Name}.{Model.Name}.{Model.Field?.Id}.{option.Key}")"
+                               id="@optionId"
+                               name="@optionId"
                                onchange="@($"notifyFieldChange('{Model.Name}', '{Model.Field?.UiAnchor}', this)")"
                                checked />
                     }
                     else
                     {
                         <input type="@Model.Field?.Type.ConvertInputType()"
-                               id="@($"{Model.Field?.Name}.{Model.Name}.{Model.Field?.Id}.{option.Key}")"
-                               name="@($"{Model.Field?.Name}.{Model.Name}.{Model.Field?.Id}.{option.Key}")"
+                               id="@optionId"
+                               name="@optionId"
                                onchange="@($"notifyFieldChange('{Model.Name}','{Model.Field?.UiAnchor}', this)")" />
                     }
-                    <label for="@($"{Model.Field?.Name}.{Model.Name}.{Model.Field?.Id}")">@($"{option.Label}")</label>
+                    <label for="@optionId">@($"{option.Label}")</label>
                 </div>
             }
         }

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CheckboxWidget/CheckboxWidget.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
+using System;
 using System.Threading.Tasks;
 using Unity.Flex.Web.Views.Shared.Components.WorksheetInstanceWidget.ViewModels;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
@@ -16,9 +17,9 @@ namespace Unity.Flex.Web.Views.Shared.Components.CheckboxWidget
         AutoInitialize = true)]
     public class CheckboxWidget : AbpViewComponent
     {
-        public async Task<IViewComponentResult> InvokeAsync(WorksheetFieldViewModel? fieldModel, string modelName)
+        public async Task<IViewComponentResult> InvokeAsync(WorksheetFieldViewModel? fieldModel, string modelName, Guid? worksheetId = null)
         {
-            return View(await Task.FromResult(new CheckboxViewModel() { Field = fieldModel, Name = modelName }));
+            return View(await Task.FromResult(new CheckboxViewModel() { Field = fieldModel, Name = modelName, WorksheetId = worksheetId }));
         }
     }
 

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CheckboxWidget/CheckboxWidgetController.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using System;
 using Unity.Flex.Web.Views.Shared.Components.WorksheetInstanceWidget.ViewModels;
 using Unity.Modules.Shared.Utils;
 using Volo.Abp.AspNetCore.Mvc;
@@ -12,15 +13,15 @@ public class CheckboxWidgetController : AbpController
     {
         [HttpGet]
         [Route("Refresh")]
-        public IActionResult Refresh(WorksheetFieldViewModel? fieldModel, string modelName)
+        public IActionResult Refresh(WorksheetFieldViewModel? fieldModel, string modelName, Guid? worksheetId = null)
         {
             if (!ModelState.IsValid)
             {
                 Logger.LogWarning("Invalid model state for Refresh: {ModelName}", modelName.SanitizeField());
                 return ViewComponent(typeof(CheckboxWidget));
             }
 
-            return ViewComponent(typeof(CheckboxWidget), new { fieldModel, modelName });
+            return ViewComponent(typeof(CheckboxWidget), new { fieldModel, modelName, worksheetId });
         }
     }
 }