Skip to content

Commit 41bda5e

Browse files
committed
Fix incorrectly migrated prop name in MessageSearch
1 parent 0fdc97b commit 41bda5e

File tree

11 files changed

+28
-22
lines changed

11 files changed

+28
-22
lines changed

src/modules/MessageSearch/__test__/MessageSearchUI.integration.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const mockLocalizationContext = {
2121
};
2222

2323
const defaultMockState = {
24-
isQueryInvalid: false,
24+
isInvalid: false,
2525
searchString: '',
2626
requestString: '',
2727
currentChannel: null,
@@ -89,7 +89,7 @@ describe('MessageSearchUI Integration Tests', () => {
8989
it('handles error state and retry', async () => {
9090
const handleRetryToConnect = jest.fn();
9191
renderComponent(
92-
{ isQueryInvalid: true, searchString: 'error query', requestString: 'error query' },
92+
{ isInvalid: true, searchString: 'error query', requestString: 'error query' },
9393
{ handleRetryToConnect },
9494
);
9595
expect(screen.getByText(mockStringSet.PLACE_HOLDER__RETRY_TO_CONNECT)).toBeInTheDocument();

src/modules/MessageSearch/components/MessageSearchUI/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export const MessageSearchUI: React.FC<MessageSearchUIProps> = ({
3535
}: MessageSearchUIProps) => {
3636
const {
3737
state: {
38-
isQueryInvalid,
38+
isInvalid,
3939
searchString,
4040
requestString,
4141
currentChannel,
@@ -83,7 +83,7 @@ export const MessageSearchUI: React.FC<MessageSearchUIProps> = ({
8383
return stringSet.NO_TITLE;
8484
};
8585

86-
if (isQueryInvalid && searchString && requestString) {
86+
if (isInvalid && searchString && requestString) {
8787
return renderPlaceHolderError?.() || (
8888
<div className="sendbird-message-search">
8989
<PlaceHolder

src/modules/MessageSearch/context/MessageSearchProvider.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export interface MessageSearchState extends MessageSearchProviderProps {
2828
channelUrl: string;
2929
allMessages: ClientSentMessages[];
3030
loading: boolean;
31-
isQueryInvalid: boolean;
31+
isInvalid: boolean;
3232
initialized: boolean;
3333
currentChannel: GroupChannel | null;
3434
currentMessageSearchQuery: MessageSearchQuery | null;
@@ -45,7 +45,7 @@ const initialState: MessageSearchState = {
4545
channelUrl: '',
4646
allMessages: [],
4747
loading: false,
48-
isQueryInvalid: false,
48+
isInvalid: false,
4949
initialized: false,
5050
currentChannel: null,
5151
currentMessageSearchQuery: null,
@@ -162,9 +162,7 @@ const MessageSearchProvider: React.FC<MessageSearchProviderProps> = ({
162162
);
163163
};
164164

165-
/**
166-
* Keep this function for backward compatibility.
167-
*/
165+
// Keep this function for backward compatibility.
168166
const useMessageSearchContext = () => {
169167
const { state, actions } = useMessageSearch();
170168
return { ...state, ...actions };

src/modules/MessageSearch/context/__tests__/MessageSearch.migration.spec.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,13 @@ describe('MessageSearch Migration Compatibility Tests', () => {
5959
'children',
6060
'requestString',
6161
'retryCount',
62+
'setRetryCount',
6263
'selectedMessageId',
6364
'setSelectedMessageId',
6465
'scrollRef',
6566
'allMessages',
6667
'loading',
68+
'isInvalid',
6769
'currentChannel',
6870
'currentMessageSearchQuery',
6971
'hasMoreResult',

src/modules/MessageSearch/context/__test__/MessageSearchProvider.spec.tsx renamed to src/modules/MessageSearch/context/__tests__/MessageSearchProvider.spec.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ describe('MessageSearchProvider', () => {
5555
const initialState = {
5656
allMessages: [],
5757
loading: false,
58-
isQueryInvalid: false,
58+
isInvalid: false,
5959
initialized: false,
6060
currentChannel: null,
6161
currentMessageSearchQuery: null,
@@ -113,7 +113,7 @@ describe('MessageSearchProvider', () => {
113113
expect(newState.channelUrl).toBe(newUrl);
114114
expect(newState.allMessages).toEqual(initialState.allMessages);
115115
expect(newState.loading).toBe(initialState.loading);
116-
expect(newState.isQueryInvalid).toBe(initialState.isQueryInvalid);
116+
expect(newState.isInvalid).toBe(initialState.isInvalid);
117117
});
118118
});
119119
});
@@ -154,7 +154,7 @@ describe('MessageSearchProvider', () => {
154154
expect(updatedState.initialized).toBe(true);
155155
// Verify other states remain unchanged
156156
expect(updatedState.loading).toBe(initialState.loading);
157-
expect(updatedState.isQueryInvalid).toBe(initialState.isQueryInvalid);
157+
expect(updatedState.isInvalid).toBe(initialState.isInvalid);
158158
expect(updatedState.allMessages).toEqual(initialState.allMessages);
159159
expect(updatedState.hasMoreResult).toBe(initialState.hasMoreResult);
160160
});
@@ -175,7 +175,7 @@ describe('MessageSearchProvider', () => {
175175
await waitFor(() => {
176176
const updatedState = result.current.state;
177177
expect(updatedState.loading).toBe(false);
178-
expect(updatedState.isQueryInvalid).toBe(false);
178+
expect(updatedState.isInvalid).toBe(false);
179179
// Verify other states remain unchanged
180180
expect(updatedState.allMessages).toEqual(initialState.allMessages);
181181
expect(updatedState.currentChannel).toBe(initialState.currentChannel);
@@ -205,7 +205,7 @@ describe('MessageSearchProvider', () => {
205205
expect(updatedState.hasMoreResult).toBe(true);
206206
expect(updatedState.currentMessageSearchQuery).toEqual(mockQuery);
207207
// Verify other states remain unchanged
208-
expect(updatedState.isQueryInvalid).toBe(initialState.isQueryInvalid);
208+
expect(updatedState.isInvalid).toBe(initialState.isInvalid);
209209
expect(updatedState.initialized).toBe(initialState.initialized);
210210
});
211211
});
@@ -264,7 +264,7 @@ describe('MessageSearchProvider', () => {
264264
result.current.actions.setQueryInvalid();
265265
await waitFor(() => {
266266
const updatedState = result.current.state;
267-
expect(updatedState.isQueryInvalid).toBe(true);
267+
expect(updatedState.isInvalid).toBe(true);
268268
// Verify other states remain unchanged
269269
expect(updatedState.allMessages).toEqual(initialState.allMessages);
270270
expect(updatedState.loading).toBe(initialState.loading);
@@ -291,7 +291,7 @@ describe('MessageSearchProvider', () => {
291291
const updatedState = result.current.state;
292292
expect(updatedState.allMessages).toEqual([]);
293293
// Verify other states remain unchanged
294-
expect(updatedState.isQueryInvalid).toBe(initialState.isQueryInvalid);
294+
expect(updatedState.isInvalid).toBe(initialState.isInvalid);
295295
expect(updatedState.currentChannel).toBe(initialState.currentChannel);
296296
});
297297
});

src/modules/MessageSearch/context/__test__/useGetSearchedMessages.spec.ts renamed to src/modules/MessageSearch/context/__tests__/useGetSearchedMessages.spec.ts

File renamed without changes.

src/modules/MessageSearch/context/__test__/useMessageSearch.spec.tsx renamed to src/modules/MessageSearch/context/__tests__/useMessageSearch.spec.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ describe('useMessageSearch', () => {
3737
expect(result.current.state).toEqual(expect.objectContaining({
3838
allMessages: [],
3939
loading: false,
40-
isQueryInvalid: false,
40+
isInvalid: false,
4141
initialized: false,
4242
currentChannel: null,
4343
currentMessageSearchQuery: null,
@@ -63,7 +63,7 @@ describe('useMessageSearch', () => {
6363
result.current.actions.startMessageSearch();
6464
});
6565

66-
expect(result.current.state.isQueryInvalid).toBe(false);
66+
expect(result.current.state.isInvalid).toBe(false);
6767
expect(result.current.state.loading).toBe(false);
6868
});
6969

@@ -89,7 +89,7 @@ describe('useMessageSearch', () => {
8989
result.current.actions.setQueryInvalid();
9090
});
9191

92-
expect(result.current.state.isQueryInvalid).toBe(true);
92+
expect(result.current.state.isInvalid).toBe(true);
9393
});
9494

9595
it('updates state when getNextSearchedMessages is called', () => {

src/modules/MessageSearch/context/__test__/useScrollCallback.spec.ts renamed to src/modules/MessageSearch/context/__tests__/useScrollCallback.spec.ts

File renamed without changes.

src/modules/MessageSearch/context/__test__/useSearchStringEffect.spec.ts renamed to src/modules/MessageSearch/context/__tests__/useSearchStringEffect.spec.ts

File renamed without changes.

src/modules/MessageSearch/context/__test__/useSetChannel.spec.ts renamed to src/modules/MessageSearch/context/__tests__/useSetChannel.spec.ts

File renamed without changes.

0 commit comments

Comments
 (0)