-
+
+
+
Message body cannot be empty
Reset changes
{{ localMessage.bodyUnavailable }}
@@ -369,9 +353,4 @@ onMounted(() => {
overflow-y: auto;
padding-right: 15px;
}
-
-.modal-msg-editor :deep(textarea) {
- height: 100%;
- margin-top: 20px;
-}
diff --git a/src/Frontend/src/components/failedmessages/MessageRedirectForBackwardsCompatibility.vue b/src/Frontend/src/components/failedmessages/MessageRedirectForBackwardsCompatibility.vue
index 00203b686..43fcad227 100644
--- a/src/Frontend/src/components/failedmessages/MessageRedirectForBackwardsCompatibility.vue
+++ b/src/Frontend/src/components/failedmessages/MessageRedirectForBackwardsCompatibility.vue
@@ -11,3 +11,6 @@ onMounted(async () => {
await router.push({ path: routeLinks.messages.message.link(id.toString()), query: { back: routeLinks.failedMessage.failedMessages.link } });
});
+
+
+
diff --git a/src/Frontend/src/components/messages/BodyView.vue b/src/Frontend/src/components/messages/BodyView.vue
index ef667251b..d4b90a8ca 100644
--- a/src/Frontend/src/components/messages/BodyView.vue
+++ b/src/Frontend/src/components/messages/BodyView.vue
@@ -1,15 +1,20 @@
Could not find message body. This could be because the message URL is invalid or the corresponding message was processed and is no longer tracked by ServiceControl.
Message body unavailable.
- {{ props.message.messageBody }}
+
+ Message body cannot be displayed because content type "{{ props.message.contentType }}" is not supported.
diff --git a/src/Frontend/src/components/messages/MessageView.vue b/src/Frontend/src/components/messages/MessageView.vue
index 60a3f6e24..c7635e2ee 100644
--- a/src/Frontend/src/components/messages/MessageView.vue
+++ b/src/Frontend/src/components/messages/MessageView.vue
@@ -19,10 +19,11 @@ import Message from "@/resources/Message";
import { NServiceBusHeaders } from "@/resources/Header";
import { useConfiguration } from "@/composables/configuration";
import { useIsMassTransitConnected } from "@/composables/useIsMassTransitConnected";
-import { parse, stringify } from "lossless-json";
import BodyView from "@/components/messages/BodyView.vue";
import HeadersView from "@/components/messages/HeadersView.vue";
import StackTraceView from "@/components/messages/StacktraceView.vue";
+import { stringify, parse } from "lossless-json";
+import xmlFormat from "xml-formatter";
let refreshInterval: number | undefined;
let pollingFaster = false;
@@ -150,116 +151,19 @@ async function downloadBody(message: ExtendedFailedMessage) {
}
try {
- switch (response.headers.get("content-type")) {
- case "application/json": {
- const jsonBodyRaw = await response.text();
- const jsonBody = parse(jsonBodyRaw.replace(/\\"|"(?:\\"|[^"])*"|(\/\/.*|\/\*[\s\S]*?\*\/)/g, (m, g) => (g ? "" : m)));
- message.messageBody = formatJson(jsonBody);
- return;
- }
- case "text/xml": {
- const xmlBody = await response.text();
- message.messageBody = formatXml(xmlBody);
- return;
- }
- default: {
- message.messageBody = await response.text();
- }
- }
- } catch {
- message.bodyUnavailable = true;
- }
-}
-
-// taken from https://github.com/krtnio/angular-pretty-xml/blob/master/src/angular-pretty-xml.js
-function formatXml(xml: string) {
- function createShiftArr(step: string) {
- let space: string;
- if (isNaN(parseInt(step))) {
- // argument is string
- space = step;
- } else {
- // argument is integer
- space = " ".repeat(parseInt(step));
- }
-
- const shift = ["\n"]; // array of shifts
+ const contentType = response.headers.get("content-type");
+ message.contentType = contentType ?? "text/plain";
+ message.messageBody = await response.text();
- for (let ix = 0; ix < 100; ix++) {
- shift.push(shift[ix] + space);
+ if (contentType === "application/json") {
+ message.messageBody = stringify(parse(message.messageBody), null, 2) ?? message.messageBody;
}
-
- return shift;
- }
-
- const indent = "\t";
-
- const arr = xml
- .replace(/>\s*<")
- .replace(/ or //
- if (arr[i].indexOf("-->") !== -1 || arr[i].indexOf("]>") !== -1 || arr[i].indexOf("!DOCTYPE") !== -1) {
- inComment = false;
- }
- } else if (arr[i].indexOf("-->") !== -1 || arr[i].indexOf("]>") !== -1) {
- // end comment or //
- string += arr[i];
- inComment = false;
- } else if (
- /^<\w/.test(arr[i - 1]) &&
- /^<\/\w/.test(arr[i]) && //
//
- m1 &&
- m2 &&
- m1[0] === m2[0].replace("/", "")
- ) {
- string += arr[i];
- if (!inComment) depth--;
- } else if (arr[i].search(/<\w/) !== -1 && arr[i].indexOf("") === -1) {
- //
//
- string += !inComment ? shift[depth++] + arr[i] : arr[i];
- } else if (arr[i].search(/<\w/) !== -1 && arr[i].indexOf("... //
- string += !inComment ? shift[depth] + arr[i] : arr[i];
- } else if (arr[i].search(/<\//) > -1) {
- // //
- string += !inComment ? shift[--depth] + arr[i] : arr[i];
- } else if (arr[i].indexOf("/>") !== -1) {
- //
//
- string += !inComment ? shift[depth] + arr[i] : arr[i];
- } else if (arr[i].indexOf(" //
- string += shift[depth] + arr[i];
- } else if (arr[i].indexOf("xmlns:") !== -1 || arr[i].indexOf("xmlns=") !== -1) {
- // xmlns //
- string += shift[depth] + arr[i];
- } else {
- string += arr[i];
+ if (contentType === "text/xml") {
+ message.messageBody = xmlFormat(message.messageBody, { indentation: " ", collapseContent: true });
}
+ } catch {
+ message.bodyUnavailable = true;
}
-
- return string.trim();
-}
-
-function formatJson(json: unknown) {
- return stringify(json, null, 2) as string;
}
function togglePanel(panelNum: number) {
@@ -446,7 +350,7 @@ onUnmounted(() => {