Dev

applications/Unity.GrantManager/.env.example

@@ -54,7 +54,7 @@ AuthServer__OidcSignoutCallback="http://localhost:44342/signout-callback-oidc"
 ##S3__SecretAccessKey="******************"
 ##S3__ApplicationS3Folder="Unity/Application"
 ##S3__AssessmentS3Folder="Unity/Adjudication"
-##S3__DisallowedFileTypes="[ "exe" , "sh" , "ksh" , "bat" , "cmd" ]"
+##S3__AllowedFileTypes=["pdf","doc","docx","xls","xlsx","ppt","pptx","jpg","jpeg","png","gif","txt","csv","zip","odt","ods","odp","rtf","bmp","tif","tiff","webp","heic","heif","eml","msg"]
 ##S3__MaxFileSize="25"
 ##S3__EmailAttachmentMaxFileSize="20"
 ##S3__EmailAttachmentsTotalMaxFileSize="25"

applications/Unity.GrantManager/Directory.Build.props

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <!-- Explicitly reference compatible version to avoid transitive dependency warnings -->
-    <PackageReference Include="Microsoft.Extensions.Compliance.Abstractions" Version="10.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Compliance.Abstractions" Version="10.8.0" />
 
   </ItemGroup>
 

applications/Unity.GrantManager/common.props

@@ -19,7 +19,7 @@
   <ItemGroup>
     <!-- Add direct reference to the patched Scriban to ensure all projects importing common.props
          use the safe version (pins transitive consumers that do not specify a version). -->
-    <PackageReference Include="Scriban" Version="7.2.0" />
+    <PackageReference Include="Scriban" Version="7.2.5" />
   </ItemGroup>
 
 </Project>

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Responses/FormWorksheetResponse.cs

@@ -1,69 +1,6 @@
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
 namespace Unity.AI.Responses;
 
 public class FormWorksheetResponse
 {
     public string Worksheet { get; set; } = string.Empty;
-
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-
-    [JsonPropertyName("title")]
-    public string Title { get; set; } = string.Empty;
-
-    [JsonPropertyName("version")]
-    public uint Version { get; set; } = 1;
-
-    [JsonPropertyName("published")]
-    public bool Published { get; set; }
-
-    [JsonPropertyName("reportColumns")]
-    public string ReportColumns { get; set; } = string.Empty;
-
-    [JsonPropertyName("reportKeys")]
-    public string ReportKeys { get; set; } = string.Empty;
-
-    [JsonPropertyName("reportViewName")]
-    public string ReportViewName { get; set; } = string.Empty;
-
-    [JsonPropertyName("sections")]
-    public List<FormWorksheetSectionResponse> Sections { get; set; } = [];
-}
-
-public class FormWorksheetSectionResponse
-{
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-
-    [JsonPropertyName("order")]
-    public uint Order { get; set; }
-
-    [JsonPropertyName("fields")]
-    public List<FormWorksheetFieldResponse> Fields { get; set; } = [];
-}
-
-public class FormWorksheetFieldResponse
-{
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-
-    [JsonPropertyName("key")]
-    public string Key { get; set; } = string.Empty;
-
-    [JsonPropertyName("label")]
-    public string Label { get; set; } = string.Empty;
-
-    [JsonPropertyName("type")]
-    public int Type { get; set; }
-
-    [JsonPropertyName("order")]
-    public uint Order { get; set; }
-
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; } = true;
-
-    [JsonPropertyName("definition")]
-    public string? Definition { get; set; }
 }

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Unity.AI.Application.Contracts.csproj

@@ -6,15 +6,15 @@
     <RootNamespace>Unity.AI</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Authorization" Version="10.3.0" />
-    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="10.3.0" />
-    <PackageReference Include="Volo.Abp.Features" Version="10.3.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="10.3.0" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="10.5.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="10.5.0" />
+    <PackageReference Include="Volo.Abp.Features" Version="10.5.0" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="10.5.0" />
     <ProjectReference Include="..\Unity.AI.Domain.Shared\Unity.AI.Shared.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Update="ConfigureAwait.Fody" Version="3.3.2" />
-    <PackageReference Update="Fody" Version="6.9.2">
+    <PackageReference Update="ConfigureAwait.Fody" Version="3.4.1" />
+    <PackageReference Update="Fody" Version="6.9.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIProviderPayloadValidator.cs

@@ -129,18 +129,10 @@ public static AIResponseValidationResult ValidateFormWorksheetJson(string respon
                 return AIResponseValidationResult.Invalid("Form worksheet response was not valid JSON.");
             }
 
-            if (!root.TryGetProperty("title", out var title)
-                || title.ValueKind != JsonValueKind.String
-                || string.IsNullOrWhiteSpace(title.GetString()))
+            if (!root.TryGetProperty("fields", out var fields)
+                || fields.ValueKind != JsonValueKind.Array)
             {
-                return AIResponseValidationResult.Invalid("Form worksheet response is missing a non-empty 'title'.");
-            }
-
-            if (!root.TryGetProperty("sections", out var sections)
-                || sections.ValueKind != JsonValueKind.Array
-                || sections.GetArrayLength() == 0)
-            {
-                return AIResponseValidationResult.Invalid("Form worksheet response must include at least one section.");
+                return AIResponseValidationResult.Invalid("Form worksheet response must include a 'fields' array.");
             }
 
             return AIResponseValidationResult.Success();

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIPromptDataSeeder.cs

@@ -848,8 +848,8 @@ Return only valid JSON in the exact mapping shape requested.
 
     // ── v2/form-worksheet.system.txt ───────────────────────────────────────
     private const string FormWorksheetSystemV2 = """
-        You are a worksheet definition generator for Unity Grant Manager.
-        Generate a recommended worksheet definition JSON that can be used to create a Flex worksheet.
+        You are a custom-field suggestion generator for Unity Grant Manager.
+        Recommend only the additional fields needed for a Flex worksheet.
         Return only valid JSON.
         """;
 
@@ -860,47 +860,30 @@ Return only valid JSON.
 
         OUTPUT
         {
-          "Name": "<string>",
-          "Title": "<string>",
-          "Version": <number>,
-          "Published": true,
-          "Sections": [
-            {
-              "Name": "<string>",
-              "Order": 1,
-              "Fields": [
-                {
-                  "Name": "<string>",
-                  "Key": "<string>",
-                  "Label": "<string>",
-                  "Type": <number>,
-                  "Definition": "<string>"
-                }
-              ]
-            }
-          ],
-          "ReportColumns": "<string>",
-          "ReportKeys": "<string>",
-          "ReportViewName": "<string>"
+          "fields": [
+            { "key": "<string>", "label": "<string>", "type": "Text" }
+          ]
         }
 
         Rules:
-        - Return one worksheet definition JSON object only.
+        - Return one field-suggestion JSON object only.
         - chefsFields contains the available CHEFS source fields.
         - unityCoreFields contains existing Unity core fields. Do not create a custom field when one of these already fits.
-        - existingMapping contains any current confirmed Unity-to-CHEFS mappings. Do not duplicate those mappings with a custom field.
-        - existingWorksheets contains the previous AI worksheet definition, if one exists. Refine it rather than duplicating its custom fields.
+        - existingMapping contains the current saved Unity-to-CHEFS mappings. Do not duplicate those mappings with a custom field.
+        - existingCustomFields is a flattened list of fields from worksheets currently linked to this form version. Each entry includes its worksheet name, field name, label, and type. Do not create duplicate custom fields.
         - formSchema contains detailed CHEFS control configuration when labels and types need more context.
         - Use the provided form context to decide which custom fields are genuinely needed.
         - Prefer existing Unity core fields when they already satisfy the need.
         - Only create additional worksheet custom fields when the form genuinely needs them.
-        - Keep the worksheet structure valid for Flex.
+        - Do not include a worksheet title, sections, order, publish state, reporting fields, enabled flag, or field definition.
+        - Each key and label must be non-empty. Do not repeat a key.
+        - type must be one of: Text, TextArea, Numeric, Currency, Date, DateTime, Email, Phone, YesNo, Checkbox. Use the type name, never a number.
         - Return valid plain JSON only.
         """;
 
     private const string FormWorksheetMetadataV2 = """
         {
-          "DATA": "Serialized JSON payload containing form metadata, CHEFS fields, Unity core fields, the current mapping, form schema, and the existing AI worksheet."
+          "DATA": "Serialized JSON payload containing form metadata, CHEFS fields, Unity core fields, the current mapping, form schema, and custom fields from worksheets currently linked to the form version."
         }
         """;
 

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Unity.AI.Application.csproj

@@ -6,31 +6,30 @@
     <RootNamespace>Unity.AI</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.10" />
     <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="NPOI" Version="2.7.5" />
-    <PackageReference Include="PdfPig" Version="0.1.13" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="10.3.0" />
-    <PackageReference Include="Volo.Abp.Mapperly" Version="10.3.0" />
+    <PackageReference Include="PdfPig" Version="0.1.15" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="10.5.0" />
+    <PackageReference Include="Volo.Abp.Mapperly" Version="10.5.0" />
     <PackageReference Include="Riok.Mapperly" Version="4.3.1" />
-    <PackageReference Include="Volo.Abp.Ddd.Application" Version="10.3.0" />
-    <PackageReference Include="Volo.Abp.DistributedLocking" Version="10.3.0" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="10.3.0" />
-    <PackageReference Include="Volo.Abp.Features" Version="10.3.0" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="10.3.0" />
-    <!-- Explicit references to fix vulnerable transitive dependencies -->
-    <PackageReference Include="AWSSDK.Core" Version="4.0.5" />
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.7" />
+    <PackageReference Include="Volo.Abp.Ddd.Application" Version="10.5.0" />
+    <PackageReference Include="Volo.Abp.DistributedLocking" Version="10.5.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="10.5.0" />
+    <PackageReference Include="Volo.Abp.Features" Version="10.5.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="10.5.0" />
+    <!-- Explicit reference to fix vulnerable transitive dependency -->
+    <PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.10" />
     <ProjectReference Include="..\..\..\..\modules\Unity.Flex\src\Unity.Flex.Application\Unity.Flex.Application.csproj" />
     <ProjectReference Include="..\..\..\..\src\Unity.GrantManager.Application.Contracts\Unity.GrantManager.Application.Contracts.csproj" />
     <ProjectReference Include="..\..\..\..\src\Unity.GrantManager.Domain\Unity.GrantManager.Domain.csproj" />
     <ProjectReference Include="..\..\..\Unity.SharedKernel\Unity.SharedKernel.csproj" />
     <ProjectReference Include="..\Unity.AI.Application.Contracts\Unity.AI.Application.Contracts.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Update="ConfigureAwait.Fody" Version="3.3.2" />
-    <PackageReference Update="Fody" Version="6.9.2">
+    <PackageReference Update="ConfigureAwait.Fody" Version="3.4.1" />
+    <PackageReference Update="Fody" Version="6.9.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Unity.AI.Shared.csproj

@@ -10,12 +10,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="10.3.0" />
-    <PackageReference Include="Volo.Abp.Validation" Version="10.3.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="10.5.0" />
+    <PackageReference Include="Volo.Abp.Validation" Version="10.5.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.10" />
   </ItemGroup>
 
   <ItemGroup>
@@ -24,8 +24,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="ConfigureAwait.Fody" Version="3.3.2" />
-    <PackageReference Update="Fody" Version="6.9.2">
+    <PackageReference Update="ConfigureAwait.Fody" Version="3.4.1" />
+    <PackageReference Update="Fody" Version="6.9.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Unity.AI.Web.csproj

@@ -12,16 +12,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Mapperly" Version="10.3.0" />
+    <PackageReference Include="Volo.Abp.Mapperly" Version="10.5.0" />
     <PackageReference Include="Riok.Mapperly" Version="4.3.1" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="10.3.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Web" Version="10.3.0" />
-    <!-- Explicit reference to fix vulnerable transitive dependency -->
-    <PackageReference Include="AWSSDK.Core" Version="4.0.5" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="10.5.0" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Web" Version="10.5.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.10" />
   </ItemGroup>
 
   <ItemGroup>
@@ -40,8 +38,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="ConfigureAwait.Fody" Version="3.3.2" />
-    <PackageReference Update="Fody" Version="6.9.2">
+    <PackageReference Update="ConfigureAwait.Fody" Version="3.4.1" />
+    <PackageReference Update="Fody" Version="6.9.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Unity.Flex.Application.Contracts.csproj

@@ -9,22 +9,22 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.3" />
-		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.3" />
-		<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.3" />
-		<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="10.3.0" />
-		<PackageReference Include="Volo.Abp.Authorization" Version="10.3.0" />
-		<PackageReference Include="Volo.Abp.UI" Version="10.3.0" />
-		<PackageReference Include="Volo.Abp.Validation" Version="10.3.0" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.10" />
+		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.10" />
+		<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.10" />
+		<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="10.5.0" />
+		<PackageReference Include="Volo.Abp.Authorization" Version="10.5.0" />
+		<PackageReference Include="Volo.Abp.UI" Version="10.5.0" />
+		<PackageReference Include="Volo.Abp.Validation" Version="10.5.0" />
 	</ItemGroup>
 
 	<ItemGroup>	  
 	  <ProjectReference Include="..\Unity.Flex.Shared\Unity.Flex.Shared.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Update="ConfigureAwait.Fody" Version="3.3.2" />
-		<PackageReference Update="Fody" Version="6.9.2">
+		<PackageReference Update="ConfigureAwait.Fody" Version="3.4.1" />
+		<PackageReference Update="Fody" Version="6.9.3">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		</PackageReference>

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Unity.Flex.Application.csproj

@@ -9,24 +9,24 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.3" />
-		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.3" />
-		<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.3" />
-		<PackageReference Include="Volo.Abp.Autofac" Version="10.3.0" />
-		<PackageReference Include="Volo.Abp.Mapperly" Version="10.3.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.10" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.10" />
+		<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.10" />
+		<PackageReference Include="Volo.Abp.Autofac" Version="10.5.0" />
+		<PackageReference Include="Volo.Abp.Mapperly" Version="10.5.0" />
 		<PackageReference Include="Riok.Mapperly" Version="4.3.1" />
-		<PackageReference Include="Volo.Abp.Ddd.Application" Version="10.3.0" />
-		<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="10.3.0" />
-		<PackageReference Include="Volo.Abp.Http.Client" Version="10.3.0" />
-		<PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="10.3.0" />
-		<PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="10.3.0" />
+		<PackageReference Include="Volo.Abp.Ddd.Application" Version="10.5.0" />
+		<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="10.5.0" />
+		<PackageReference Include="Volo.Abp.Http.Client" Version="10.5.0" />
+		<PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="10.5.0" />
+		<PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="10.5.0" />
 		<ProjectReference Include="..\..\..\..\src\Unity.GrantManager.Application.Contracts\Unity.GrantManager.Application.Contracts.csproj" />
 		<ProjectReference Include="..\Unity.Flex.Application.Contracts\Unity.Flex.Application.Contracts.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Update="ConfigureAwait.Fody" Version="3.3.2" />
-		<PackageReference Update="Fody" Version="6.9.2">
+		<PackageReference Update="ConfigureAwait.Fody" Version="3.4.1" />
+		<PackageReference Update="Fody" Version="6.9.3">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		</PackageReference>