Skip to content
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

Jump to bottom

Prototype pretty colors #178

Merged
merged 3 commits into from
Jul 8, 2022
Merged

Prototype pretty colors #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d30983f
Prototype pretty colors
nathanleclaire Jul 7, 2022
0144c2e
Use DOMPurify cause that will make this safe /s
nathanleclaire Jul 7, 2022
ad475d5
Fix linties
nathanleclaire Jul 8, 2022
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: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,12 @@
"@solana/wallet-adapter-react": "^0.15.4",
"@solana/wallet-adapter-react-ui": "^0.9.6",
"amplitude-js": "^8.12.0",
"ansi_up": "^5.1.0",
"bip39": "^3.0.4",
"bootstrap": "^5.1.3",
"classnames": "^2.3.1",
"dockerode": "^3.3.2",
"dompurify": "^2.3.8",
"electron-cfg": "^1.2.7",
"electron-debug": "^3.2.0",
"electron-log": "^4.4.6",
Expand Down
15 changes: 11 additions & 4 deletions src/renderer/nav/Validator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import {
ButtonToolbar,
} from 'react-bootstrap';
import { debounce } from 'underscore';
import AnsiUp from 'ansi_up';
import DOMPurify from 'dompurify';
import {
Net,
selectValidatorNetworkState,
Expand All @@ -27,6 +29,8 @@ const ipcDockerToast = (dockerIPCMethod: string) => {
});
};

const ansiUp = new AnsiUp();

const Validator = () => {
const [validatorLogs, setValidatorLogs] = useState('');
const filterRef = useRef<HTMLInputElement>({} as HTMLInputElement);
Expand Down Expand Up @@ -84,7 +88,9 @@ const Validator = () => {
switch (method) {
case 'validator-logs':
// eslint-disable-next-line prettier/prettier
setValidatorLogs(res.join("\n"));
setValidatorLogs(
DOMPurify.sanitize(ansiUp.ansi_to_html(res.join('\n')))
);
break;
default:
}
Expand Down Expand Up @@ -245,9 +251,10 @@ const Validator = () => {
/>
</InputGroup>
<div className="overflow-auto">
<pre className="text-xs bg-surface-600 h-full p-2 whitespace-pre-wrap break-all overflow-auto">
{validatorLogs}
</pre>
<pre
className="text-xs bg-surface-600 h-full p-2 whitespace-pre-wrap break-all overflow-auto"
dangerouslySetInnerHTML={{ __html: validatorLogs }}
/>
</div>
</div>
);
Expand Down