-
Notifications
You must be signed in to change notification settings - Fork 554
feat(chat): split chat trigger widget #6966
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
Draft
Haroenv
wants to merge
1
commit into
master
Choose a base branch
from
feat/chat-trigger
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+565
−158
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -146,6 +146,10 @@ export type ChatConnectorParams<TUiMessage extends UIMessage = UIMessage> = ( | |
| | { chat: Chat<TUiMessage> } | ||
| | ChatInit<TUiMessage> | ||
| ) & { | ||
| /** | ||
| * Disable validation that requires either a dedicated trigger or AI mode. | ||
| */ | ||
| disableTriggerValidation?: boolean; | ||
| /** | ||
| * Whether to resume an ongoing chat generation stream. | ||
| */ | ||
|
|
@@ -260,6 +264,7 @@ export default (function connectChat<TWidgetParams extends UnknownWidgetParams>( | |
| resume = false, | ||
| tools = {}, | ||
| type = 'chat', | ||
| disableTriggerValidation = false, | ||
| ...options | ||
| } = widgetParams || {}; | ||
|
|
||
|
|
@@ -273,6 +278,7 @@ export default (function connectChat<TWidgetParams extends UnknownWidgetParams>( | |
| let focusInput: ChatRenderState<TUiMessage>['focusInput']; | ||
| let setIsClearing: (value: boolean) => void; | ||
| let setFeedbackState: (messageId: string, state: 'sending' | 0 | 1) => void; | ||
| let hasValidatedEntryPoints = false; | ||
|
|
||
| const agentId = 'agentId' in options ? options.agentId : undefined; | ||
| let feedbackState: ChatRenderState<TUiMessage>['feedbackState'] = {}; | ||
|
|
@@ -332,6 +338,34 @@ export default (function connectChat<TWidgetParams extends UnknownWidgetParams>( | |
| setIsClearing(false); | ||
| }; | ||
|
|
||
| const validateEntryPoints = (instantSearchInstance: InstantSearch) => { | ||
| if (disableTriggerValidation || hasValidatedEntryPoints) { | ||
| return; | ||
| } | ||
|
|
||
| // mainIndex may be absent in test environments or when called from | ||
| // getWidgetRenderState before a full init has taken place. | ||
| if (!instantSearchInstance.mainIndex) { | ||
| return; | ||
| } | ||
|
|
||
| const widgets = instantSearchInstance.mainIndex.getWidgets() as Array<{ | ||
| opensChat?: boolean; | ||
| }>; | ||
|
|
||
| const hasEntryPoint = widgets.some((w) => w.opensChat === true); | ||
|
Comment on lines
+352
to
+356
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should use walkIndex |
||
|
|
||
| if (!hasEntryPoint) { | ||
| throw new Error( | ||
| withUsage( | ||
| 'The `chat` widget requires a way to open the chat. Add a `chatTrigger` widget or enable AI mode on an input widget. Use `disableTriggerValidation: true` to opt out.' | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| hasValidatedEntryPoints = true; | ||
| }; | ||
|
|
||
| const makeChatInstance = (instantSearchInstance: InstantSearch) => { | ||
| let transport; | ||
| const [appId, apiKey] = getAppIdAndApiKey(instantSearchInstance.client); | ||
|
|
@@ -470,6 +504,8 @@ export default (function connectChat<TWidgetParams extends UnknownWidgetParams>( | |
| init(initOptions) { | ||
| const { instantSearchInstance } = initOptions; | ||
|
|
||
| validateEntryPoints(instantSearchInstance); | ||
|
|
||
| _chatInstance = makeChatInstance(instantSearchInstance); | ||
|
|
||
| const render = () => { | ||
|
|
@@ -506,8 +542,7 @@ export default (function connectChat<TWidgetParams extends UnknownWidgetParams>( | |
| render(); | ||
| }; | ||
|
|
||
| const feedback = | ||
| 'feedback' in options ? options.feedback : undefined; | ||
| const feedback = 'feedback' in options ? options.feedback : undefined; | ||
| if (agentId && feedback) { | ||
| const [appId, apiKey] = getAppIdAndApiKey( | ||
| initOptions.instantSearchInstance.client | ||
|
|
@@ -557,6 +592,8 @@ export default (function connectChat<TWidgetParams extends UnknownWidgetParams>( | |
| }, | ||
|
|
||
| render(renderOptions) { | ||
| validateEntryPoints(renderOptions.instantSearchInstance); | ||
|
|
||
| renderFn( | ||
| { | ||
| ...this.getWidgetRenderState(renderOptions), | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The snapshot now includes the
togglebuttonprops="[object Object]"attribute on the root element, which indicatestoggleButtonPropsis still being passed through and spread onto the DOM. Since the toggle button API was removed, update the test setup (and the component usage) to stop passingtoggleButtonPropsso it doesn’t leak unknown attributes into the DOM.