Skip to content
Merged
Changes from all commits
Commits
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
23 changes: 7 additions & 16 deletions src/Frontend/src/components/failedmessages/EditRetryDialog2.vue
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,6 @@ function resetBodyChanges() {
localMessage.value.isBodyChanged = false;
}

function findHeadersByKey(key: string) {
return localMessage.value.headers.find((header: HeaderWithEditing) => header.key === key);
}

function getContentType() {
const header = findHeadersByKey("NServiceBus.ContentType");
return header?.value;
}

function getMessageIntent() {
const intent = findHeadersByKey("NServiceBus.MessageIntent");
return intent?.value;
}

function removeHeadersMarkedAsRemoved() {
localMessage.value.headers = localMessage.value.headers.filter((header: HeaderWithEditing) => !header.isMarkedAsRemoved);
}
Expand All @@ -122,6 +108,11 @@ async function retryEditedMessage() {
}

function initializeMessageBodyAndHeaders() {
function getHeaderValue(key: string) {
const header = local.headers.find((header: HeaderWithEditing) => header.key === key);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i realise this works because of hoisting, but this function is declared before local is.

Suggested change
const header = local.headers.find((header: HeaderWithEditing) => header.key === key);
const header = headers.value.find((header: HeaderWithEditing) => header.key === key);

return header?.value;
}

origMessageBody = body.value.data.value ?? "";
const local = <LocalMessageState>{
isBodyChanged: false,
Expand All @@ -135,13 +126,13 @@ function initializeMessageBodyAndHeaders() {
messageBody: body.value.data.value ?? "",
};

const contentType = getContentType();
const contentType = getHeaderValue("NServiceBus.ContentType");
local.bodyContentType = contentType;
const parsedContentType = parseContentType(contentType);
local.isContentTypeSupported = parsedContentType.isSupported;
local.language = parsedContentType.language;

const messageIntent = getMessageIntent();
const messageIntent = getHeaderValue("NServiceBus.MessageIntent");
local.isEvent = messageIntent === "Publish";

for (let index = 0; index < headers.value.data.length; index++) {
Expand Down