Martchus
/
arch-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid currently visible logs from being collapsed when refreshing details

This commit is contained in:
Martchus 2022-04-17 19:44:32 +02:00
parent 45b172cc2c
commit 2cdbb176ee
2 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
srv/static/js/buildactionspage.js
View File

@ -40,9 +40,9 @@ function queryBuildActions(additionalParams)
return true; return true;
} }
function queryBuildActionDetails(ids) function queryBuildActionDetails(ids, detailsTables)
{ {
AjaxHelper.queryRoute('GET', '/build-action/details?' + AjaxHelper.makeIdParams(ids), showBuildActionDetails, 'build-action-details'); AjaxHelper.queryRoute('GET', '/build-action/details?' + AjaxHelper.makeIdParams(ids), showBuildActionDetails.bind(undefined, detailsTables), 'build-action-details');
return true; return true;
} }
@ -187,17 +187,17 @@ export function handleBuildActionPresetChange()
}); });
} }
function renderBuildActionActions(actionValue, buildAction, refresh) function renderBuildActionActions(actionValue, buildAction, detailsTable)
{ {
const container = document.createElement('span'); const container = document.createElement('span');
if (!refresh) { if (!detailsTable) {
container.className = 'table-row-actions'; container.className = 'table-row-actions';
} }
const id = buildAction.id; const id = buildAction.id;
container.appendChild(CustomRendering.renderIconLink(refresh ? 'table-refresh' : 'magnify', buildAction, function() { container.appendChild(CustomRendering.renderIconLink(detailsTable ? 'table-refresh' : 'magnify', buildAction, function() {
queryBuildActionDetails(id); queryBuildActionDetails(id, detailsTable ? [detailsTable] : undefined);
return false; return false;
}, refresh ? 'Refresh details table' : 'Show details', undefined, '#build-action-details-section?' + id)); }, detailsTable ? 'Refresh details table' : 'Show details', undefined, '#build-action-details-section?' + id));
container.appendChild(CustomRendering.renderIconLink('restart', buildAction, function() { container.appendChild(CustomRendering.renderIconLink('restart', buildAction, function() {
if (window.confirm('Do you really want to clone/restart action ' + id + '?')) { if (window.confirm('Do you really want to clone/restart action ' + id + '?')) {
cloneBuildAction(id); cloneBuildAction(id);
@ -460,7 +460,7 @@ function switchToBuildActions()
SinglePageHelper.updateHashPreventingSectionInitializer('#build-action-section'); SinglePageHelper.updateHashPreventingSectionInitializer('#build-action-section');
} }
function showBuildActionDetails(ajaxRequest) function showBuildActionDetails(detailsTables, ajaxRequest)
{ {
if (!window.globalInfo) { if (!window.globalInfo) {
window.functionsPostponedUntilGlobalInfo.push(showBuildActionDetails.bind(this, ...arguments)); window.functionsPostponedUntilGlobalInfo.push(showBuildActionDetails.bind(this, ...arguments));
@ -470,10 +470,10 @@ function showBuildActionDetails(ajaxRequest)
return; return;
} }
const responseJSON = JSON.parse(ajaxRequest.responseText); const responseJSON = JSON.parse(ajaxRequest.responseText);
return showBuildActionDetails2(Array.isArray(responseJSON) ? responseJSON : [responseJSON]); return showBuildActionDetails2(detailsTables, Array.isArray(responseJSON) ? responseJSON : [responseJSON]);
} }
function showBuildActionDetails2(buildActions) function showBuildActionDetails2(existingDetailsTables, buildActions)
{ {
const buildActionResults = Utils.getAndEmptyElement('build-action-results'); const buildActionResults = Utils.getAndEmptyElement('build-action-results');
let buildActionActions = Utils.getAndEmptyElement('build-action-details-actions'); let buildActionActions = Utils.getAndEmptyElement('build-action-details-actions');
@ -483,14 +483,16 @@ function showBuildActionDetails2(buildActions)
buildActionActions.className = 'heading-actions'; buildActionActions.className = 'heading-actions';
buildActionResults.appendChild(buildActionActions); buildActionResults.appendChild(buildActionActions);
} }
buildActionResults.appendChild(renderBuildActionDetailsTable(buildActionDetails)); const existingTable = existingDetailsTables ? existingDetailsTables.shift() : undefined;
buildActionActions.appendChild(renderBuildActionActions(undefined, buildActionDetails, true)); const newTable = renderBuildActionDetailsTable(buildActionDetails, existingTable);
buildActionResults.appendChild(newTable);
buildActionActions.appendChild(renderBuildActionActions(undefined, buildActionDetails, newTable));
buildActionActions = undefined; buildActionActions = undefined;
}); });
switchToBuildActionDetails(buildActions.map(buildAction => buildAction.id)); switchToBuildActionDetails(buildActions.map(buildAction => buildAction.id));
} }
function renderBuildActionDetailsTable(buildActionDetails) function renderBuildActionDetailsTable(buildActionDetails, existingTable)
{ {
return GenericRendering.renderTableFromJsonObject({ return GenericRendering.renderTableFromJsonObject({
data: buildActionDetails, data: buildActionDetails,
@ -641,7 +643,7 @@ function renderBuildActionDetailsTable(buildActionDetails)
return GenericRendering.renderStandardTableCell(value.data); return GenericRendering.renderStandardTableCell(value.data);
} }
}, },
logfiles: renderBuildActionLogFiles, logfiles: renderBuildActionLogFiles.bind(undefined, existingTable),
artefacts: renderBuildActionArtefacts, artefacts: renderBuildActionArtefacts,
}, },
}); });
@ -690,18 +692,27 @@ function handleBuildActionResponse(ajaxRequest)
switchToBuildActionDetails(); switchToBuildActionDetails();
return; return;
} }
showBuildActionDetails(ajaxRequest); showBuildActionDetails(undefined, ajaxRequest);
} }
function renderBuildActionLogFiles(array, obj) function renderBuildActionLogFiles(existingTable, array, obj)
{ {
return GenericRendering.renderCustomList(array, function(arrayElement) { return GenericRendering.renderCustomList(array, function(arrayElement, liElement) {
const id = 'logfile-' + obj.id + '-' + arrayElement;
const liClass = liElement.className = 'li-' + id;
if (existingTable !== undefined) {
const existingLiElment = existingTable.getElementsByClassName(liClass)[0];
if (existingLiElment) {
existingLiElment.className = null;
return Array.from(existingLiElment.childNodes);
}
}
const params = 'id=' + encodeURIComponent(obj.id) + '&name=' + encodeURIComponent(arrayElement); const params = 'id=' + encodeURIComponent(obj.id) + '&name=' + encodeURIComponent(arrayElement);
const logFilePath = '/build-action/logfile?' + params; const logFilePath = '/build-action/logfile?' + params;
const newWindowPath = 'log.html#' + params; const newWindowPath = 'log.html#' + params;
const targetElement = document.createElement('div'); const targetElement = document.createElement('div');
const streamingSetup = setupTerminalForStreaming({ const streamingSetup = setupTerminalForStreaming({
id: 'logfile-' + obj.id + '-' + arrayElement, id: id,
targetElement: targetElement, targetElement: targetElement,
path: logFilePath, path: logFilePath,
}); });

2
srv/static/js/genericrendering.js
View File

@ -54,7 +54,7 @@ export function renderCustomList(array, customRenderer, compareFunction)
const ul = document.createElement('ul'); const ul = document.createElement('ul');
array.forEach(function(arrayElement) { array.forEach(function(arrayElement) {
const li = document.createElement('li'); const li = document.createElement('li');
const renderedDomElements = customRenderer(arrayElement); const renderedDomElements = customRenderer(arrayElement, li);
if (Array.isArray(renderedDomElements)) { if (Array.isArray(renderedDomElements)) {
renderedDomElements.forEach(function(renderedDomElement) { renderedDomElements.forEach(function(renderedDomElement) {
li.appendChild(renderedDomElement); li.appendChild(renderedDomElement);