Skip to content

Commit

Permalink
fix(RHELC-1186): diagnosis doesn't show for pre-conversion
Browse files Browse the repository at this point in the history 
We were incorrectly checking the `detail.diagnosis` value as an object when it was, in fact, an array. This PR combines some code for simplicity and properly checks the value and displays it.

To test, in insights account, check `executed_task/5330`. You should be able to expand some of the job details and see that the `diagnosis` field doesn't populate in the details. When running this PR, you should see it.

Please also check that `executed_task/5331` also works correctly by continuing to show `remediations` field.
  • Loading branch information
@johnsonm325
Michael Johnson authored and johnsonm325 committed Nov 3, 2023
1 parent a9c89d2 commit 30bfecb
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 28 deletions.
4 changes: 4 additions & 0 deletions src/App.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,7 @@
font-size: '14px';
font-weight: 500;
}

.remediations-font-family {
font-family: 'overpass-mono', sans-serif;
}
40 changes: 20 additions & 20 deletions src/SmartComponents/CompletedTaskDetails/JobResultsDetails/EntryDetails.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,18 @@ const EntryDetails = ({ entry, taskConstantMapper }) => {
);
};

const renderDiagnosisDetails = () => {
return (
<div>
<span>{detail.diagnosis.context}</span>
</div>
);
};

const renderRemediationsDetails = () => {
return detail.remediations.map((remediation, index) => {
let remediationKey = `remediation-${index}`;
const renderResolutionDetails = (content, type, classname) => {
return content.map((item, index) => {
let key = `${type}-${index}`;
return (
<div key={remediationKey}>
<div key={key}>
{index > 0 ? (
<span>
<br />
</span>
) : null}
<span style={{ fontFamily: 'overpass-mono' }}>
{remediation.type
? `[${remediation.type}] ${remediation.context}`
: `${remediation.context}`}
<span className={classname}>
{item.type ? `[${item.type}] ${item.context}` : `${item.context}`}
</span>
</div>
);
Expand Down Expand Up @@ -75,11 +65,21 @@ const EntryDetails = ({ entry, taskConstantMapper }) => {
return (
<React.Fragment>
{createGrid('Summary', summary)}
{detail?.diagnosis?.context
? createGrid('Diagnosis', renderDiagnosisDetails)
{detail?.diagnosis && detail?.diagnosis?.[0]?.context !== ''
? createGrid(
'Diagnosis',
renderResolutionDetails(detail.diagnosis, 'diagnosis')
)
: null}
{detail?.remediations && detail?.remediations[0]?.context !== ''
? createGrid('Remediation', renderRemediationsDetails)
{detail?.remediations && detail?.remediations?.[0]?.context !== ''
? createGrid(
'Remediation',
renderResolutionDetails(
detail.remediations,
'remediations',
'remediations-font-family'
)
)
: null}
{createGrid('Key', key)}
</React.Fragment>
Expand Down
16 changes: 8 additions & 8 deletions ...omponents/CompletedTaskDetails/__tests__/__snapshots__/CompletedTaskDetails.tests.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2357,7 +2357,7 @@ exports[`CompletedTaskDetails should render expandable rows correctly 1`] = `
>
<div>
<span
style="font-family: overpass-mono;"
class="remediations-font-family"
>
[hint] Please run "grub2-install &lt;GRUB_DEVICE&gt; command manually after upgrade
</span>
Expand Down Expand Up @@ -2536,7 +2536,7 @@ exports[`CompletedTaskDetails should render expandable rows correctly 1`] = `
>
<div>
<span
style="font-family: overpass-mono;"
class="remediations-font-family"
>
[hint] Make sure there are no SElinux related warnings after the upgrade and enable SElinux manually afterwards. Notice: You can ignore the "/root/tmp_leapp_py3" SElinux warnings.
</span>
Expand Down Expand Up @@ -2715,7 +2715,7 @@ exports[`CompletedTaskDetails should render expandable rows correctly 1`] = `
>
<div>
<span
style="font-family: overpass-mono;"
class="remediations-font-family"
>
[hint] If you wish to receive updates for the latest released version of the target system, run \`subscription-manager release --unset\` after the upgrade.
</span>
Expand Down Expand Up @@ -3272,7 +3272,7 @@ exports[`CompletedTaskDetails should render expandable rows correctly 1`] = `
>
<div>
<span
style="font-family: overpass-mono;"
class="remediations-font-family"
>
[hint] Please run "grub2-install &lt;GRUB_DEVICE&gt; command manually after upgrade
</span>
Expand Down Expand Up @@ -3451,7 +3451,7 @@ exports[`CompletedTaskDetails should render expandable rows correctly 1`] = `
>
<div>
<span
style="font-family: overpass-mono;"
class="remediations-font-family"
>
[hint] Set AllowZoneDrifting=no in /etc/firewalld/firewalld.conf
</span>
Expand All @@ -3461,7 +3461,7 @@ exports[`CompletedTaskDetails should render expandable rows correctly 1`] = `
<br />
</span>
<span
style="font-family: overpass-mono;"
class="remediations-font-family"
>
[command] sed -i "s/^AllowZoneDrifting=.*/AllowZoneDrifting=no/" /etc/firewalld/firewalld.conf
</span>
Expand Down Expand Up @@ -3640,7 +3640,7 @@ exports[`CompletedTaskDetails should render expandable rows correctly 1`] = `
>
<div>
<span
style="font-family: overpass-mono;"
class="remediations-font-family"
>
[hint] Consult the VDO to LVM conversion process documentation for how to perform the conversion.
</span>
Expand Down Expand Up @@ -3819,7 +3819,7 @@ exports[`CompletedTaskDetails should render expandable rows correctly 1`] = `
>
<div>
<span
style="font-family: overpass-mono;"
class="remediations-font-family"
>
[hint] Make sure there are no SElinux related warnings after the upgrade and enable SElinux manually afterwards. Notice: You can ignore the "/root/tmp_leapp_py3" SElinux warnings.
</span>
Expand Down

0 comments on commit 30bfecb

Please sign in to comment.