Dev

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/SupplierInfo/SupplierInfo.js

@@ -27,21 +27,21 @@ $(function () {
 
     function validateMatchingSupplierToOrgInfo() {
         const supplierName = (UIElements.supplierName.val() || '').toLowerCase().trim();
-        
+
         if (!supplierName) {
             UIElements.supplierOrgInfoErrorDiv.toggleClass('hidden', true);
             return;
         }
-        let isMatch = true;
+
         const orgName = (UIElements.orgName.val() || '').toLowerCase().trim();
         const nonRegisteredOrgName = (UIElements.nonRegisteredOrgName.val() || '').toLowerCase().trim();
 
-        if(orgName != '') {
-            isMatch = !supplierName || !orgName || supplierName === orgName;
-        } else if(nonRegisteredOrgName != '') {
-            isMatch = !supplierName || !nonRegisteredOrgName || supplierName === nonRegisteredOrgName;
-        }
-        
+        // Match if either orgName or nonRegisteredOrgName matches supplierName
+        const isMatch =
+            (!orgName && !nonRegisteredOrgName) ||
+            supplierName === orgName ||
+            supplierName === nonRegisteredOrgName;
+
         UIElements.supplierOrgInfoErrorDiv.toggleClass('hidden', isMatch);
     }
 

applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js

@@ -163,6 +163,13 @@ function initializeDataTable(options) {
                     data.columns[originalIdx].uniqueKey = originalCol.name;
                 });
 
+                if (Array.isArray(data.order)) {
+                    data.orderByUniqueKey = data.order.map(([colIdx, dir]) => {
+                        const col = data.columns[colIdx];
+                        return col ? { uniqueKey: col.uniqueKey, dir } : null;
+                    }).filter(x => x);
+                }
+
                 let hasFilter =
                     data.columns.some((value) => value.search.search !== '') ||
                     searchValue !== '';
@@ -175,6 +182,16 @@ function initializeDataTable(options) {
                 let stateCorrupted = false;
                 const tableId = settings.sTableId || settings.nTable.id;
                 const aoColumns = settings.aoColumns;
+
+                // Restore order from uniqueKey if available
+                if (Array.isArray(data.orderByUniqueKey)) {
+                    data.order = data.orderByUniqueKey.map(orderObj => {
+                        // Find the current index for this uniqueKey
+                        const idx = data.columns.findIndex(col => col.uniqueKey === orderObj.uniqueKey);
+                        return [idx, orderObj.dir];
+                    }).filter(([idx]) => idx !== -1);
+                }
+
                 data.columns.forEach((column, index) => {
                     if (aoColumns[index] + '' != 'undefined') {
                         const name = aoColumns[index].name;
@@ -209,7 +226,7 @@ function initializeDataTable(options) {
                 try {
                     dtApi = new $.fn.dataTable.Api(settings);
 
-                    if (!dtApi || !dtApi.table().node()) {
+                    if (!dtApi?.table()?.node()) {
                         throw new Error('Invalid DataTable instance.');
                     }
 
@@ -239,7 +256,15 @@ function initializeDataTable(options) {
                         );
                     }
 
-                    dtApi.columns.adjust().draw(false);
+                    if (Array.isArray(data.order) && data.order.length > 0) {
+                        const adjustedOrder = data.order.map(([visualIdx, dir]) => {
+                            const originalIdx = dtApi.colReorder?.transpose?.(visualIdx);
+                            return [originalIdx, dir];
+                        });
+                        dtApi.order(adjustedOrder).draw();
+                    } else {
+                        dtApi.columns.adjust().draw(false);
+                    }
                 } catch (err) {
                     console.warn('StateLoaded failed:', err);
                     const stateKey = `DataTables_${tableId}_${window.location.pathname}`;
@@ -408,10 +433,11 @@ function getSelectColumn(title, dataField, uniqueTableId) {
         className: 'notexport text-center',
         data: dataField,
         name: 'select',
+        index: 0,
         render: function (data) {
             return `<input class="checkbox-select chkbox" id="row_${data}" type="checkbox" value="" title="${title}">`;
         },
-        index: 0,
+
     };
 }
 
@@ -511,26 +537,6 @@ function toggleFilterRow() {
     $(this).popover('toggle');
     $('#dtFilterRow').toggleClass('hidden');
 }
-function updateColvisButtonState($btn, api, colIndex) {
-    const visible = api.column(colIndex).visible();
-    $btn.toggleClass('dt-button-active', visible);
-}
-
-function syncColvisButtonStates(api) {
-    const aoColumns = api.settings()[0].aoColumns;
-
-    let x = $('.dt-button-collection .dt-button');
-    let z = $('.dt-button-collection a.dt-button');
-    $('.dt-button-collection a.dt-button').each(function () {
-        const $btn = $(this);
-        const colName = $btn.attr('data-cv-name');
-
-        const colIndex = aoColumns.findIndex((col) => col.name === colName);
-        if (colIndex !== -1) {
-            updateColvisButtonState($btn, api, colIndex);
-        }
-    });
-}
 
 function findColumnByTitle(title, dataTable) {
     let columnIndex = dataTable

applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs

@@ -81,6 +81,12 @@ public PermissionGrantsDataSeeder(IPermissionDataSeeder permissionDataSeeder)
             GrantApplicationPermissions.Dashboard.RequestApprovedCount,
         ];
 
+        public readonly List<string> SettingManagement_Tags_CommonPermissions = [
+            UnitySelector.SettingManagement.Tags.Default,
+            UnitySelector.SettingManagement.Tags.Update,
+            UnitySelector.SettingManagement.Tags.Delete
+        ];
+
         public async Task SeedAsync(DataSeedContext context)
         {
             // Default permission grants based on role
@@ -109,6 +115,7 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                     GrantManagerPermissions.Intakes.Default,
                     GrantManagerPermissions.ApplicationForms.Default,
 
+                    .. SettingManagement_Tags_CommonPermissions,
                     .. ReviewAndAssessment_CommonPermissions,
                     .. ApplicantInfo_CommonPermissions,
                     .. ProjectInfo_CommonPermissions,
@@ -162,10 +169,8 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                     GrantManagerPermissions.Organizations.ManageProfiles,
                     GrantApplicationPermissions.Approvals.BulkApplicationApproval,
                     GrantApplicationPermissions.Approvals.DeferAfterApproval,
-                    UnitySelector.SettingManagement.Tags.Default,
-                    UnitySelector.SettingManagement.Tags.Update,
-                    UnitySelector.SettingManagement.Tags.Delete,
 
+                    .. SettingManagement_Tags_CommonPermissions,
                     .. ReviewAndAssessment_CommonPermissions,
                     .. ApplicantInfo_CommonPermissions,
                     .. ProjectInfo_CommonPermissions,
@@ -204,6 +209,7 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                     GrantManagerPermissions.ApplicationForms.Default,
 
 
+                    .. SettingManagement_Tags_CommonPermissions,
                     .. ReviewAndAssessment_CommonPermissions,
                     .. ApplicantInfo_CommonPermissions,
                     .. ProjectInfo_CommonPermissions,
@@ -212,9 +218,6 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                     .. Dashboard_CommonPermissions,
 
                     UnitySettingManagementPermissions.BackgroundJobSettings,
-                    UnitySelector.SettingManagement.Tags.Default,
-                    UnitySelector.SettingManagement.Tags.Update,
-                    UnitySelector.SettingManagement.Tags.Delete
                 ], context.TenantId);