Skip to content
Merged
Show file tree
Hide file tree
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
7 changes: 5 additions & 2 deletions src/common/panel/chat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -257,11 +257,14 @@ export class ChatPanel implements vscode.WebviewViewProvider {
const sesssion = await supabase.auth.getSession();
const userLoggined = sesssion.data.session ? true : false;

const chatEnabled =
(localChatUsing && chatServerIsWorking) || (cloudUsing && cloudChatUsing);
const chatEnabled = localChatUsing || (cloudUsing && cloudChatUsing);
const chatIsWorking =
(cloudUsing && cloudChatUsing && userLoggined) ||
(chatServerIsWorking && localChatUsing);

return {
chatEnabled: chatEnabled,
chatIsWorking: chatIsWorking,
userLoggined: userLoggined,
};
}
Expand Down
5 changes: 4 additions & 1 deletion webviews/src/hooks/useSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { vscode } from "../utilities/vscode";
type ConfigurationType = {
chatEnabled: boolean;
userLoggined: boolean;
chatIsWorking: boolean;
};

interface SettingsContextType {
Expand All @@ -26,19 +27,21 @@ export const SettingsProvider = ({
const settings = await vscode.getSettings();
if (
settings.chatEnabled !== lastSettings?.chatEnabled ||
settings.chatIsWorking !== lastSettings?.chatIsWorking ||
settings.userLoggined !== lastSettings?.userLoggined
) {
lastSettings = settings;

setConfiguration({
chatEnabled: settings.chatEnabled,
chatIsWorking: settings.chatIsWorking,
userLoggined: settings.userLoggined,
});
}
};
getSettings();

const interval = setInterval(getSettings, 5000);
const interval = setInterval(getSettings, 1000);
return () => {
clearInterval(interval);
};
Expand Down
16 changes: 13 additions & 3 deletions webviews/src/routes/chat/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ import { useMessageListener } from "../../hooks/messageListener";
import TextArea from "../../components/text-area";
import { useChat } from "../../hooks/useChat";
import styles from "./style.module.css";
import { useSettings } from "../../hooks/useSettings";

export const ChatInstance = () => {
let { chatId } = useParams() as { chatId?: string };
const { chatId } = useParams() as { chatId?: string };

const {
handleSubmit,
Expand All @@ -21,6 +22,8 @@ export const ChatInstance = () => {
stop,
} = useChat(chatId === "new-chat" ? undefined : chatId);

const settings = useSettings();

useMessageListener("start-new-chat", () => {
startNewChat();
});
Expand Down Expand Up @@ -59,15 +62,22 @@ export const ChatInstance = () => {
<TextArea
value={input}
onChange={(value) => setInput(value || "")}
onSubmit={handleSubmit}
onSubmit={
settings.configuration.chatIsWorking ? handleSubmit : () => true
}
buttonEnd={
<VSCodeButton
appearance="icon"
disabled={!settings.configuration.chatIsWorking}
onClick={isLoading ? stop : handleSubmit}
>
<span
className={`codicon ${
isLoading ? "codicon-debug-stop" : "codicon-send"
settings.configuration.chatIsWorking
? isLoading
? "codicon-debug-stop"
: "codicon-send"
: "codicon-loading codicon-modifier-spin"
}`}
></span>
</VSCodeButton>
Expand Down
2 changes: 1 addition & 1 deletion webviews/src/routes/requireInit/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Navigate, Outlet } from "react-router-dom";
import { useSettings } from "../../hooks/useSettings";

export function RequireInit() {
let settings = useSettings();
const settings = useSettings();

if (!settings.configuration.chatEnabled) {
return <Navigate to="/init" />;
Expand Down
1 change: 1 addition & 0 deletions webviews/src/utilities/vscode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ class VSCodeAPIWrapper {
public getSettings() {
return new Promise<{
chatEnabled: boolean;
chatIsWorking: boolean;
userLoggined: boolean;
}>((resolve) => {
this.postMessageCallback(
Expand Down