Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion applications/Unity.GrantManager/global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"version": "10.0.303",
"rollForward": "latestPatch",
"rollForward": "latestFeature",
"allowPrerelease": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@
margin-top: 10px;
}

#reconciliation-report-div,
#audit-logs-div,
#audit-log-settings-div {
margin-top: 0;
}

#audit-logs-div .reconciliation-filter-inputs {
align-items: center;
}
Expand Down Expand Up @@ -119,6 +113,17 @@
margin-top:20px;
}

/* DataTable sections: ScrollResize sizes the scroll body to the viewport so the
table footer sits at the bottom of the page; the card must not clip or scroll it. */
#reconciliation-report-div,
#audit-logs-div,
#ai-prompts-div,
#endpoints-div,
#exception-logs-div {
max-height: none;
overflow: visible;
}

.unity-app-main-container {
margin: auto;
display: flex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,14 @@ $(function () {
$.fn.dataTable.tables({ visible: true, api: true }).columns.adjust().draw(false);
}

// Size the scroll body so the table footer sits at the bottom of the viewport,
// matching initializeDataTable({ fixedHeaders: true }) used by the other admin tables.
function enableScrollResize(dt) {
if ($.fn.dataTable.ScrollResize) {
dt.settings()[0]._scrollResize = new $.fn.dataTable.ScrollResize(dt);
}
}

function initializeDateFilters() {
let range = getDateRange(defaultQuickDateRange);
setDateRangeFilters(defaultQuickDateRange, range);
Expand Down Expand Up @@ -313,6 +321,8 @@ $(function () {
},
externalSearchInputId: '#search',
scrollX: true,
scrollY: 'calc(100vh - 325px)', // Initial value – ScrollResize recalculates dynamically
scrollCollapse: true,
ajax: abp.libs.datatables.createAjax(
unity.grantManager.intakes.submission.getSubmissionsList,
function () {
Expand Down Expand Up @@ -396,6 +406,8 @@ $(function () {
})
);

enableScrollResize(recDt);

// Initialize FilterRow plugin on the button
if ($.fn.dataTable.FilterRow !== 'undefined') {
new $.fn.dataTable.FilterRow(recDt.settings()[0], { // NOSONAR - False positive flag on S1848
Expand Down Expand Up @@ -563,6 +575,8 @@ $(function () {
order: [[0, 'desc']],
searching: false,
scrollX: true,
scrollY: 'calc(100vh - 325px)', // Initial value – ScrollResize recalculates dynamically
scrollCollapse: true,
ajax: abp.libs.datatables.createAjax(
unity.grantManager.history.auditLog.getList,
function () {
Expand Down Expand Up @@ -594,6 +608,8 @@ $(function () {
})
);

enableScrollResize(auditDt);

if ($.fn.dataTable.FilterRow !== undefined) {
new $.fn.dataTable.FilterRow(auditDt.settings()[0], { // NOSONAR - False positive flag on S1848
buttonId: 'audit-filter-button',
Expand Down
Loading