Skip to content

Commit 925aae2

Browse files
committed
fix show header value when only binary value is available
1 parent 22d84d9 commit 925aae2

File tree

5 files changed

+21
-7
lines changed

5 files changed

+21
-7
lines changed

config/dynamic/asyncApi/parsing.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func (r *MessageRef) Parse(config *dynamic.Config, reader dynamic.Reader) error
9494
r.Value.ContentType = cfg.DefaultContentType
9595
}
9696
if r.Value.ContentType == "" {
97-
log.Warn("content type is missing, using application/json ")
97+
log.Warn("content type is missing, using application/json")
9898
r.Value.ContentType = "application/json"
9999
}
100100
}

examples/mokapi/kafka.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ export let events = [
277277
messageId: 'shopOrder',
278278
headers: {
279279
foo: { value: 'bar', binary: '' },
280+
bar: { value: '', binary: 'dmFsdWUgYXMgYmluYXJ5'}
280281
}
281282
}
282283
},

providers/asyncapi3/message.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func (r *MessageRef) parse(config *dynamic.Config, reader dynamic.Reader) error
109109
r.Value.ContentType = cfg.DefaultContentType
110110
}
111111
if r.Value.ContentType == "" {
112-
log.Warn("content type is missing, using application/json ")
112+
log.Warn("content type is missing, using application/json")
113113
r.Value.ContentType = "application/json"
114114
}
115115
}

webui/src/components/dashboard/kafka/KafkaMessages.vue

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ interface DialogData {
5151
key: string
5252
message: string
5353
source: Source
54-
headers: { [name: string]: { value: string, binary: string} }
54+
headers: KafkaHeader
5555
contentType: string
5656
contentTypeTitle: string
5757
isAvro: boolean
@@ -175,8 +175,14 @@ function key(data: KafkaEventData | null): string {
175175
}
176176
return ''
177177
}
178-
function formatBinary(s: string): string {
179-
return atob(s)
178+
function formatHeaderValue(v: KafkaHeaderValue) {
179+
if (v.value !== '') {
180+
return v.value
181+
}
182+
if (v.binary !== '') {
183+
return atob(v.binary)
184+
}
185+
return ''
180186
}
181187
</script>
182188

@@ -241,7 +247,7 @@ function formatBinary(s: string): string {
241247
<tbody>
242248
<tr v-for="(value, name) of message.headers" :key="name">
243249
<td>{{ name }}</td>
244-
<td>{{ value.value ?? formatBinary(value.binary) }}</td>
250+
<td>{{ formatHeaderValue(value) }}</td>
245251
</tr>
246252
</tbody>
247253
</table>

webui/src/types/kafka.d.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,14 @@ declare interface KafkaEventData {
7373
schemaId: number;
7474
messageId: string
7575
partition: number;
76-
headers: { [name: string]: { value: string, binary: string} }
76+
headers: KafkaHeader
77+
}
78+
79+
declare interface KafkaHeader { [name: string]: KafkaHeaderValue }
80+
81+
declare interface KafkaHeaderValue {
82+
value: string;
83+
binary: string;
7784
}
7885

7986
declare interface KafkaValue {

0 commit comments

Comments
 (0)