github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-08-11 13:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow skipping formating error (#1183)

Browse Source 
Co-authored-by: Leon <>
This commit is contained in:
leon-up9 2022-07-04 16:24:23 +03:00 committed by GitHub
parent d6944d467c
commit 5f73c2d50a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui-common/src/components/EntryDetailed/EntrySections/EntrySections.tsx
View File

@ -117,7 +117,8 @@ interface EntryBodySectionProps {
selector?: string, selector?: string,
} }
export const formatRequest = (body: any, contentType: string, decodeBase64: boolean = true, isBase64Encoding: boolean = false, isPretty: boolean = true): string => { export const formatRequest = (bodyRef: any, contentType: string, decodeBase64: boolean = true, isBase64Encoding: boolean = false, isPretty: boolean = true): string => {
const { body } = bodyRef
if (!decodeBase64 || !body) return body; if (!decodeBase64 || !body) return body;
const chunk = body.slice(0, MAXIMUM_BYTES_TO_FORMAT); const chunk = body.slice(0, MAXIMUM_BYTES_TO_FORMAT);
@ -144,12 +145,24 @@ export const formatRequest = (body: any, contentType: string, decodeBase64: bool
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
bodyRef.body = bodyBuf
throw error throw error
} }
return bodyBuf; return bodyBuf;
} }
export const formatRequestWithOutError = (body: any, contentType: string, decodeBase64: boolean = true, isBase64Encoding: boolean = false, isPretty: boolean = true): string => {
const bodyRef = { body }
try {
return formatRequest(bodyRef, contentType, decodeBase64, isBase64Encoding, isPretty)
} catch (error) {
console.warn(error)
}
return bodyRef.body
}
export const EntryBodySection: React.FC<EntryBodySectionProps> = ({ export const EntryBodySection: React.FC<EntryBodySectionProps> = ({
title, title,
color, color,
@ -173,8 +186,9 @@ export const EntryBodySection: React.FC<EntryBodySectionProps> = ({
}, [isLineNumbersGreaterThenOne, isPretty]) }, [isLineNumbersGreaterThenOne, isPretty])
const formatTextBody = useCallback((body) => { const formatTextBody = useCallback((body) => {
const bodyRef = { body }
try { try {
return formatRequest(body, contentType, decodeBase64, isBase64Encoding, isPretty) return formatRequest(bodyRef, contentType, decodeBase64, isBase64Encoding, isPretty)
} catch (error) { } catch (error) {
if (String(error).includes("More than one message in")) { if (String(error).includes("More than one message in")) {
if (isDecodeGrpc) if (isDecodeGrpc)
@ -183,6 +197,8 @@ export const EntryBodySection: React.FC<EntryBodySectionProps> = ({
console.warn(error); console.warn(error);
} }
} }
return bodyRef.body
}, [isPretty, contentType, isDecodeGrpc, decodeBase64, isBase64Encoding]) }, [isPretty, contentType, isDecodeGrpc, decodeBase64, isBase64Encoding])
const formattedText = useMemo(() => formatTextBody(content), [formatTextBody, content]); const formattedText = useMemo(() => formatTextBody(content), [formatTextBody, content]);

4
ui-common/src/components/modals/ReplayRequestModal/ReplayRequestModal.tsx
View File

@ -14,7 +14,7 @@ import styles from './ReplayRequestModal.module.sass'
import closeIcon from "assets/close.svg" import closeIcon from "assets/close.svg"
import spinnerImg from "assets/spinner.svg" import spinnerImg from "assets/spinner.svg"
import refreshImg from "assets/refresh.svg" import refreshImg from "assets/refresh.svg"
import { formatRequest } from "../../EntryDetailed/EntrySections/EntrySections"; import { formatRequestWithOutError } from "../../EntryDetailed/EntrySections/EntrySections";
import entryDataAtom from "../../../recoil/entryData"; import entryDataAtom from "../../../recoil/entryData";
import { AutoRepresentation, TabsEnum } from "../../EntryDetailed/EntryViewer/AutoRepresentation"; import { AutoRepresentation, TabsEnum } from "../../EntryDetailed/EntryViewer/AutoRepresentation";
import useDebounce from "../../../hooks/useDebounce" import useDebounce from "../../../hooks/useDebounce"
@ -175,7 +175,7 @@ const ReplayRequestModal: React.FC<ReplayRequestModalProps> = ({ isOpen, onClose
</Fragment> </Fragment>
break; break;
case RequestTabs.Body: case RequestTabs.Body:
const formatedCode = formatRequest(postData || "", request?.postData?.mimeType) const formatedCode = formatRequestWithOutError(postData || "", request?.postData?.mimeType)
innerComponent = <div className={styles.codeEditor}> innerComponent = <div className={styles.codeEditor}>
<CodeEditor language={request?.postData?.mimeType.split("/")[1]} <CodeEditor language={request?.postData?.mimeType.split("/")[1]}
code={Utils.isJson(formatedCode) ? JSON.stringify(JSON.parse(formatedCode || "{}"), null, 2) : formatedCode} code={Utils.isJson(formatedCode) ? JSON.stringify(JSON.parse(formatedCode || "{}"), null, 2) : formatedCode}