Skip to content

fix: Search Messages crashes on 429 from server #974 #975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
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
21 changes: 18 additions & 3 deletions packages/react/src/views/MessageAggregators/SearchMessages.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,26 @@ const SearchMessages = () => {
const { RCInstance } = useContext(RCContext);
const [text, setText] = useState('');
const [messageList, setMessageList] = useState([]);
const [cooldown, setCooldown] = useState(false);
const [loading, setLoading] = useState(false);

const handleInputChange = (e) => {
setText(e.target.value);
};

const searchMessages = useCallback(async () => {
const { messages } = await RCInstance.getSearchMessages(text);
setMessageList(messages);
const data = await RCInstance.getSearchMessages(text);
if (data.success) {
const { messages } = data;
setMessageList(messages);
setLoading(false);
} else {
setMessageList([]);
setCooldown(true);
setTimeout(() => {
setCooldown(false);
}, 20000);
}
}, [text, RCInstance]);

const debouncedSearch = useCallback(
Expand All @@ -28,17 +40,19 @@ const SearchMessages = () => {
);

useEffect(() => {
if (cooldown) return;
if (!text.trim()) {
if (messageList.length > 0) {
setMessageList([]);
}
} else {
setLoading(true)
debouncedSearch();
}
return () => {
debouncedSearch.cancel();
};
}, [text, debouncedSearch, messageList.length]);
}, [text, debouncedSearch, messageList.length, cooldown]);

return (
<MessageAggregator
Expand All @@ -50,6 +64,7 @@ const SearchMessages = () => {
handleInputChange,
placeholder: 'Search Messages',
}}
fetching={loading}
searchFiltered={messageList}
shouldRender={(msg) => !!msg}
viewType={viewType}
Expand Down