Skip to content

Commit ba92bcb

Browse files
VixtirHaarolean
andauthored
FE: Messages: Explode partitions list in API (#331)
Co-authored-by: Roman Zabaluev <gpg@haarolean.dev>
1 parent 42c236d commit ba92bcb

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

frontend/src/lib/hooks/api/topicMessages.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ export const useTopicMessages = ({
9494
default:
9595
}
9696

97-
searchParams.getAll(MessagesFilterKeys.partitions).forEach((value) => {
98-
requestParams.append(MessagesFilterKeys.partitions, value);
99-
});
100-
97+
const partitions = searchParams.get(MessagesFilterKeys.partitions);
98+
if (partitions !== null) {
99+
requestParams.append(MessagesFilterKeys.partitions, partitions);
100+
}
101101
const { nextCursor, setNextCursor } = useMessageFiltersStore.getState();
102102

103103
const tempCompareUrl = new URLSearchParams(requestParams);

frontend/src/lib/hooks/useMessagesFilters.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ export function useMessagesFilters() {
9292

9393
const search = searchParams.get(MessagesFilterKeys.stringFilter) || '';
9494

95-
const partitions = searchParams.getAll(MessagesFilterKeys.partitions);
95+
const partitions = (searchParams.get(MessagesFilterKeys.partitions) || '')
96+
.split(',')
97+
.filter((v) => v);
9698

9799
const smartFilterId =
98100
searchParams.get(MessagesFilterKeys.activeFilterId) ||
@@ -166,9 +168,12 @@ export function useMessagesFilters() {
166168
setSearchParams((params) => {
167169
params.delete(MessagesFilterKeys.partitions);
168170

169-
values.forEach((option) => {
170-
params.append(MessagesFilterKeys.partitions, option.value);
171-
});
171+
if (values.length) {
172+
params.append(
173+
MessagesFilterKeys.partitions,
174+
values.map((v) => v.value).join(',')
175+
);
176+
}
172177

173178
return params;
174179
});

0 commit comments

Comments
 (0)