Skip to content

Show name for structures and pre format tasks #2458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
henrikek merged 2 commits into from
Jan 25, 2026
Merged

Show name for structures and pre format tasks #2458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
145247f
Show name for structures and pre format tasks
henrikek Jan 25, 2026
d4ee42c
Fix linting
henrikek Jan 25, 2026
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
1 change: 0 additions & 1 deletion ESSArch_Core/frontend/static/frontend/scripts/controllers/AgentModalInstanceCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,6 @@ export default class AgentModalInstanceCtrl {
},
refresh: function (search) {
return $ctrl.getLanguages(search).then(function () {
this.options = $ctrl.options.language.choices;
return $ctrl.options.language.choices;
});
},
Expand Down
2 changes: 0 additions & 2 deletions ESSArch_Core/frontend/static/frontend/scripts/controllers/ArchiveModalInstanceCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ export default class ArchiveModalInstanceCtrl {
$ctrl.initStructureSearch = null;
}
return $ctrl.getStructures(search).then(function () {
this.options = $ctrl.options.structures;
return $ctrl.options.structures;
});
},
Expand Down Expand Up @@ -178,7 +177,6 @@ export default class ArchiveModalInstanceCtrl {
$ctrl.initAgentSearch = null;
}
return $ctrl.getAgents(search).then(function () {
this.options = $ctrl.options.agents;
return $ctrl.options.agents;
});
},
Expand Down
7 changes: 4 additions & 3 deletions ESSArch_Core/frontend/static/frontend/scripts/services/structureName.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
const StructureName = ($filter, $translate) => {
function getNameWithVersion(structure) {
const versionTestructuret = $translate.instant('VERSION');
if (!structure) return '';
const versionText = $translate.instant('VERSION');
return (
structure.name +
' ' +
versionTestructuret +
versionText +
' ' +
structure.version +
(structure.start_date !== null || structure.end_date !== null
Expand All @@ -15,7 +16,7 @@ const StructureName = ($filter, $translate) => {
);
}
return {
// getNameWithVersion: getNameWithVersion,
getNameWithVersion: getNameWithVersion,
parseStructureNames: function (structures) {
structures.forEach(function (structure) {
structure.name_with_version = getNameWithVersion(structure);
Expand Down
20 changes: 14 additions & 6 deletions ESSArch_Core/frontend/static/frontend/styles/modules/step_task.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,20 @@
}
}

.param-value {
word-break: normal;
pre {
overflow-x: scroll;
white-space: pre-wrap;
}
.result-table {
table-layout: fixed;
width: 100%;
}

.result-table .result-value {
overflow: auto;
}

.result-table .result-value pre {
max-width: 100%;
max-height: 300px;
overflow: auto;
white-space: pre;
}

.step-task-info {
Expand Down
25 changes: 11 additions & 14 deletions ESSArch_Core/frontend/static/frontend/views/modals/task_info_modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,27 +95,24 @@
</div>

<br />
<table class="table">
<table class="table result-table">
<tbody>
<tr>
<td>
<div style="max-height: 300px; overflow-y: auto">
<b>{{ "STATE_TREE.ARGUMENTS" | translate }}:</b>
<table class="table">
<tbody>
{{ $ctrl.getArgsString(currentStepTask.args_parsed) }}
<span ng-if="currentStepTask.args_parsed.length === 0"> {{'NO_ARGUMENTS' | translate}} </span>
</tbody>
</table>
<b>{{ "STATE_TREE.ARGUMENTS" | translate }}:</b>
<span ng-if="currentStepTask.args_parsed.length === 0"> {{'NO_ARGUMENTS' | translate}} <br /><br /></span>
<div ng-if="currentStepTask.args_parsed.length > 0">
<pre>{{ $ctrl.getArgsString(currentStepTask.args_parsed) }}</pre>
</div>

<b>{{ ("PARAMETERS" | translate) + ":" }}</b>
<span ng-if="angular.equals(currentStepTask.params_parsed, {})"> {{'NO_PARAMETERS' | translate}} </span>
<div style="max-height: 300px; overflow-y: auto">
<b>{{ ("PARAMETERS" | translate) + ":" }}</b>
<span ng-if="angular.equals(currentStepTask.params_parsed, {})"> {{'NO_PARAMETERS' | translate}} </span>
<table class="table">
<tbody>
<tr ng-repeat="(key, value) in currentStepTask.params_parsed track by $index">
<td>{{ key }}</td>
<td class="param-value">
<td class="result-value">
<pre>{{ value | json }}</pre>
</td>
</tr>
Expand All @@ -127,9 +124,9 @@
</tbody>
<tbody>
<tr ng-if="currentStepTask.status == 'SUCCESS'">
<td>
<td class="result-value">
<b>{{ ("RESULT" | translate) + ":" }}</b>
{{ currentStepTask.result }}
<pre>{{ currentStepTask.result }}</pre>
</td>
</tr>
<tr
Expand Down
Loading