Skip to content

Commit 1052c3d

Browse files
NilumilakNilumilak
committed
fixes after review
1 parent 19ff0a6 commit 1052c3d

File tree

1 file changed

+32
-99
lines changed

1 file changed

+32
-99
lines changed

‎frontend/src/lib/hooks/useMessagesFiltersFields.ts

Lines changed: 32 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { PollingMode } from 'generated-sources';
21
import { MessagesFilterKeysTypes } from 'lib/types';
32
import { MessagesFilterKeys } from 'lib/constants';
43
import { useLocalStorage } from 'lib/hooks/useLocalStorage';
@@ -47,108 +46,42 @@ export function useMessagesFiltersFields(topicName: string) {
4746

4847
const initMessagesFiltersFields = (params: URLSearchParams) => {
4948
const topicMessagesFilters = messageFilters[topicName];
50-
if (params.size === 0 && !!topicMessagesFilters) {
51-
if (topicMessagesFilters.mode) {
52-
params.set(MessagesFilterKeys.mode, topicMessagesFilters.mode);
53-
if (
54-
topicMessagesFilters.mode === PollingMode.FROM_OFFSET ||
55-
topicMessagesFilters.mode === PollingMode.TO_OFFSET
56-
) {
57-
if (topicMessagesFilters.offset) {
58-
params.set(MessagesFilterKeys.offset, topicMessagesFilters.offset);
59-
}
60-
}
6149

62-
if (
63-
topicMessagesFilters.mode === PollingMode.FROM_TIMESTAMP ||
64-
topicMessagesFilters.mode === PollingMode.TO_TIMESTAMP
65-
) {
66-
if (topicMessagesFilters.timestamp) {
67-
params.set(
68-
MessagesFilterKeys.timestamp,
69-
topicMessagesFilters.timestamp
70-
);
71-
}
72-
}
73-
}
74-
if (topicMessagesFilters.partitions) {
75-
params.set(
76-
MessagesFilterKeys.partitions,
77-
topicMessagesFilters.partitions
78-
);
79-
}
80-
if (topicMessagesFilters.keySerde) {
81-
params.set(MessagesFilterKeys.keySerde, topicMessagesFilters.keySerde);
82-
}
83-
if (topicMessagesFilters.valueSerde) {
84-
params.set(
85-
MessagesFilterKeys.valueSerde,
86-
topicMessagesFilters.valueSerde
87-
);
88-
}
89-
if (topicMessagesFilters.stringFilter) {
90-
params.set(
91-
MessagesFilterKeys.stringFilter,
92-
topicMessagesFilters.stringFilter
93-
);
94-
}
95-
} else {
96-
const MessagesFiltersMode = params.get(MessagesFilterKeys.mode);
97-
if (MessagesFiltersMode) {
98-
removeMessagesFilterFields();
99-
setMessagesFiltersField(MessagesFilterKeys.mode, MessagesFiltersMode);
100-
const MessagesFiltersOffset = params.get(MessagesFilterKeys.offset);
101-
if (MessagesFiltersOffset) {
102-
setMessagesFiltersField(
103-
MessagesFilterKeys.offset,
104-
MessagesFiltersOffset
105-
);
106-
}
107-
const MessagesFiltersTimestamp = params.get(
108-
MessagesFilterKeys.timestamp
109-
);
110-
if (MessagesFiltersTimestamp) {
111-
setMessagesFiltersField(
112-
MessagesFilterKeys.timestamp,
113-
MessagesFiltersTimestamp
114-
);
115-
}
50+
const setTopicMessageFiltersFromLocalStorage = (
51+
key: keyof MessagesFilterFieldsType
52+
) => {
53+
if (topicMessagesFilters[key]) {
54+
params.set(MessagesFilterKeys[key], topicMessagesFilters[key]);
11655
}
56+
};
11757

118-
const MessageFiltersPartitions = params.get(
119-
MessagesFilterKeys.partitions
120-
);
121-
if (MessageFiltersPartitions) {
122-
setMessagesFiltersField(
123-
MessagesFilterKeys.partitions,
124-
MessageFiltersPartitions
125-
);
126-
}
127-
const MessagesFiltersKeySerde = params.get(MessagesFilterKeys.keySerde);
128-
if (MessagesFiltersKeySerde) {
129-
setMessagesFiltersField(
130-
MessagesFilterKeys.keySerde,
131-
MessagesFiltersKeySerde
132-
);
133-
}
134-
const MessagesFiltersValueSerde = params.get(
135-
MessagesFilterKeys.valueSerde
136-
);
137-
if (MessagesFiltersValueSerde) {
138-
setMessagesFiltersField(
139-
MessagesFilterKeys.valueSerde,
140-
MessagesFiltersValueSerde
141-
);
142-
}
143-
const MessagesFiltersStringFilter = params.get(
144-
MessagesFilterKeys.stringFilter
145-
);
146-
if (MessagesFiltersStringFilter) {
147-
setMessagesFiltersField(
148-
MessagesFilterKeys.stringFilter,
149-
MessagesFiltersStringFilter
150-
);
58+
const setTopicMessageFiltersFromUrlParams = (
59+
key: keyof MessagesFilterFieldsType
60+
) => {
61+
const filters = params.get(MessagesFilterKeys[key]);
62+
if (filters) {
63+
setMessagesFiltersField(key, filters);
15164
}
65+
};
66+
67+
// if url params are empty and topicMessagesFilters from local storage are existing then we apply them
68+
if (params.size === 0 && !!topicMessagesFilters) {
69+
setTopicMessageFiltersFromLocalStorage(MessagesFilterKeys.mode);
70+
setTopicMessageFiltersFromLocalStorage(MessagesFilterKeys.offset);
71+
setTopicMessageFiltersFromLocalStorage(MessagesFilterKeys.timestamp);
72+
setTopicMessageFiltersFromLocalStorage(MessagesFilterKeys.partitions);
73+
setTopicMessageFiltersFromLocalStorage(MessagesFilterKeys.keySerde);
74+
setTopicMessageFiltersFromLocalStorage(MessagesFilterKeys.valueSerde);
75+
setTopicMessageFiltersFromLocalStorage(MessagesFilterKeys.stringFilter);
76+
} else {
77+
removeMessagesFilterFields();
78+
setTopicMessageFiltersFromUrlParams(MessagesFilterKeys.mode);
79+
setTopicMessageFiltersFromUrlParams(MessagesFilterKeys.offset);
80+
setTopicMessageFiltersFromUrlParams(MessagesFilterKeys.timestamp);
81+
setTopicMessageFiltersFromUrlParams(MessagesFilterKeys.partitions);
82+
setTopicMessageFiltersFromUrlParams(MessagesFilterKeys.keySerde);
83+
setTopicMessageFiltersFromUrlParams(MessagesFilterKeys.valueSerde);
84+
setTopicMessageFiltersFromUrlParams(MessagesFilterKeys.stringFilter);
15285
}
15386
};
15487

0 commit comments

Comments
 (0)