Merge pull request #3075 from bcgov/dev

Dev

Author: DarylTodosichuk

applications/Unity.AutoUI/cypress/selectors/registry.json

@@ -232,6 +232,6 @@ function runCli() {
 // Only run the CLI report when this file is executed directly
 // (`node scripts/selector-contract.mjs`) — not when imported as a module by
 // selector-diff-report.mjs.
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (path.resolve(fileURLToPath(import.meta.url)) === path.resolve(process.argv[1] ?? "")) {
   runCli();
 }

applications/Unity.AutoUI/scripts/selector-contract.mjs

@@ -10,6 +10,7 @@
     <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="NPOI" Version="2.7.5" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.13" />
     <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" />

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

@@ -3,8 +3,6 @@
 using Unity.AI.Localization;
 using Unity.AI.Permissions;
 using Unity.AI.Settings;
-using Unity.Modules.Shared.Navigation;
-using Unity.Modules.Shared.Specializations;
 using Unity.Modules.Shared.Permissions;
 using Volo.Abp.Features;
 using Volo.Abp.Settings;
@@ -29,18 +27,6 @@ private static async Task ConfigureMainMenuAsync(MenuConfigurationContext contex
         var featureChecker = context.ServiceProvider.GetRequiredService<IFeatureChecker>();
         var settingProvider = context.ServiceProvider.GetRequiredService<ISettingProvider>();
 
-        var specializationChecker = context.ServiceProvider.GetRequiredService<ISpecializationChecker>();
-        if (!await specializationChecker.IsEnabledAsync(SpecializationConsts.Onboarding))
-        {
-            await context.AddItemAsync(new ApplicationMenuItem(
-                name: AIMenus.Prompts,
-                displayName: "AI Prompts",
-                url: "~/Prompts",
-                icon: "fl fl-ai-prompts",
-                order: 900
-            ).OnlyWhenInRole(IdentityConsts.ITOperationsRoleName));
-        }
-
         var currentUser = context.ServiceProvider.GetRequiredService<ICurrentUser>();
         var isItAdmin = currentUser.IsInRole(IdentityConsts.ITAdminRoleName);
 
@@ -53,7 +39,6 @@ await context.AddItemAsync(new ApplicationMenuItem(
                 name: AIMenus.Reporting,
                 displayName: l["Menu:AIReporting"],
                 url: "~/AIReporting",
-                icon: "fl fl-view-dashboard",
                 order: 9,
                 requiredPermissionName: AIPermissions.Reporting.ReportingDefault
             ));

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Menus/AIMenuContributor.cs

@@ -1,4 +1,8 @@
 $(function () {
+    if ($('#AIPromptsTable').length === 0) {
+        return;
+    }
+
     const l = abp.localization.getResource('AI');
 
     // Prompt-level modals (create / edit prompt rows)
@@ -100,7 +104,7 @@ $(function () {
         reorderEnabled: false,
         languageSetValues: {},
         dataTableName: 'AIPromptsTable',
-        dynamicButtonContainerId: 'dynamicButtonContainerId',
+        dynamicButtonContainerId: $('#ai-prompts-dynamic-buttons').length ? 'ai-prompts-dynamic-buttons' : 'dynamicButtonContainerId',
         useNullPlaceholder: true,
         externalSearchId: 'search-prompts',
         fixedHeaders: true

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.js

@@ -16,12 +16,12 @@
             <abp-button id="btn-save-ai-config"
                         text="Save"
                         icon-type="Other"
-                        icon="fl fl-save"
+                        icon="fa-regular fa-floppy-disk"
                         class="btn unt-btn-primary btn-primary"
                         button-type="Primary" />
             <abp-button id="btn-cancel-ai-config"
                         class="btn unt-btn-outline-primary btn-outline-primary mx-1"
-                        icon-type="Other" icon="fl fl-undo"
+                        icon-type="Other" icon="fa-solid fa-arrow-rotate-left"
                         text="Cancel"
                         abp-tooltip="Cancel changes" />
             <abp-button id="btn-back-ai-config" text="Back"

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIConfiguration/Default.cshtml

@@ -7,6 +7,8 @@ namespace Unity.Flex.Domain.Scoresheets
 {
     public interface IScoresheetRepository : IBasicRepository<Scoresheet, Guid>
     {
+        Task<List<Scoresheet>> GetListByIdsAsync(IReadOnlyCollection<Guid> ids);
+        Task<List<Scoresheet>> GetListByNameAsync(string filter);
         public Task<List<Scoresheet>> GetListWithChildrenAsync();
         public Task<List<Scoresheet>> GetPublishedListAsync();
         public Task<Scoresheet?> GetWithChildrenAsync(Guid id);

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/Scoresheets/IScoresheetRepository.cs

@@ -11,6 +11,22 @@ namespace Unity.Flex.EntityFrameworkCore.Repositories
 {
     public class ScoresheetRepository(IDbContextProvider<FlexDbContext> dbContextProvider) : EfCoreRepository<FlexDbContext, Scoresheet, Guid>(dbContextProvider), IScoresheetRepository
     {
+        public async Task<List<Scoresheet>> GetListByIdsAsync(IReadOnlyCollection<Guid> ids)
+        {
+            var dbSet = await GetDbSetAsync();
+            return await dbSet
+                .Where(scoresheet => ids.Contains(scoresheet.Id))
+                .ToListAsync();
+        }
+
+        public async Task<List<Scoresheet>> GetListByNameAsync(string filter)
+        {
+            var dbSet = await GetDbSetAsync();
+            return await dbSet
+                .Where(scoresheet => scoresheet.Name.Contains(filter) || scoresheet.Title.Contains(filter))
+                .ToListAsync();
+        }
+
         public async Task<Scoresheet> GetAsync(Guid id, bool includeDetails = true)
         {
             var dbSet = await GetDbSetAsync();

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

@@ -109,7 +109,7 @@
                     {
                         var field = entry.CustomField!;
                         <div class="edit_row_field unity-input-group">
-                            <label class="form-label" for="@field.Name">@field.Label <i class="fl fl-pin static-field-indicator" aria-hidden="true" title="@L["DataGrids:PredefinedColumn"]"></i><span class="visually-hidden">(@L["DataGrids:PredefinedColumn"])</span></label>
+                            <label class="form-label" for="@field.Name">@field.Label <i class="fa-solid fa-thumbtack static-field-indicator" aria-hidden="true" title="@L["DataGrids:PredefinedColumn"]"></i><span class="visually-hidden">(@L["DataGrids:PredefinedColumn"])</span></label>
                             @try
                             {
                                 @switch (field.Type)

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/Components/DataGrid/EditDataRowModal.cshtml

@@ -34,7 +34,7 @@
                                 <abp-button text="Import Scoresheet"
                                             id="scoresheet_import_upload_btn"
                                             icon-type="Other"
-                                            icon="fl fl-import"
+                                            icon="fa-solid fa-file-import"
                                             button-type="Light" />
                             </form>
                         </div>
@@ -45,7 +45,7 @@
                             <abp-button text="@L["Scoresheet:Configuration:AddScoresheetButtonText"].Value"
                                         id="add_scoresheet_btn"
                                         icon-type="Other"
-                                        icon="fl fl-plus"
+                                        icon="fa-solid fa-plus"
                                         onclick="openScoresheetModal(null,'Add Scoresheet');"
                                         button-type="Light" />
                         </div>