Respect isHtml prop in primary output

bdukes · bdukes · commit eaf6ff4bee98 · 2025-06-13T12:30:02.000-05:00
diff --git a/Dnn.AdminExperience/ClientSide/Prompt.Web/src/components/Output.jsx b/Dnn.AdminExperience/ClientSide/Prompt.Web/src/components/Output.jsx
@@ -42,12 +42,9 @@ export class Output extends Component {
 
             return result;
         }
-        else if (props.isHtml) {
-            return <TextLine key={DomKey.get("output")} txt={props.output}/>;
-        }
         else if (props.output) {
-            const style = props.isError ? "dnn-prompt-error" : `dnn-prompt-${props.style === "cmd" ? "cmd" : "ok"}`;
-            return <TextLine key={DomKey.get("output")} txt={props.output} css={style}/>;
+            const style = props.isHtml ? '' : props.isError ? "dnn-prompt-error" : `dnn-prompt-${props.style === "cmd" ? "cmd" : "ok"}`;
+            return <TextLine key={DomKey.get("output")} txt={props.output} css={style} isHtml={props.isHtml}/>;
         }
     }
 
diff --git a/Dnn.AdminExperience/ClientSide/Prompt.Web/src/components/TextLine.jsx b/Dnn.AdminExperience/ClientSide/Prompt.Web/src/components/TextLine.jsx
@@ -3,12 +3,13 @@ import PropTypes from "prop-types";
 import Html from "./Html";
 import DomKey from "../services/DomKey";
 
-const TextLine = ({txt, css}) => {
+const TextLine = ({txt, css, isHtml}) => {
     if (!txt) {
         return null;
     }
     const textLines = txt.split("\\n");
-    const rows = textLines.map((line) => line ? <span key={DomKey.get("textline")} className={css}><Html html={line} /></span> : null).reduce((prev,current) => {
+    const rows = textLines.map((line) => line ? <span key={DomKey.get("textline")} className={css}>{isHtml ? <Html html={line} /> : line}</span> : null)
+        .reduce((prev,current) => {
         if (current !== "" && current !== null && current !== undefined) {
             return [...prev,current];
         }
@@ -21,7 +22,8 @@ TextLine.defaultProps = { css: "dnn-prompt-cmd" };
 
 TextLine.propTypes = {
     txt: PropTypes.string.isRequired,
-    css: PropTypes.string
+    css: PropTypes.string,
+    isHtml: PropTypes.bool
 };
 
 export default TextLine;

Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,9 @@ export class Output extends Component {`
`42`	`42`
`43`	`43`	`return result;`
`44`	`44`	`}`
`45`		`- else if (props.isHtml) {`
`46`		`- return <TextLine key={DomKey.get("output")} txt={props.output}/>;`
`47`		`- }`
`48`	`45`	`else if (props.output) {`
`49`		- const style = props.isError ? "dnn-prompt-error" : `dnn-prompt-${props.style === "cmd" ? "cmd" : "ok"}`;
`50`		`- return <TextLine key={DomKey.get("output")} txt={props.output} css={style}/>;`
	`46`	+ const style = props.isHtml ? '' : props.isError ? "dnn-prompt-error" : `dnn-prompt-${props.style === "cmd" ? "cmd" : "ok"}`;
	`47`	`+ return <TextLine key={DomKey.get("output")} txt={props.output} css={style} isHtml={props.isHtml}/>;`
`51`	`48`	`}`
`52`	`49`	`}`
`53`	`50`