mirror of
https://github.com/pacnpal/Roo-Code.git
synced 2025-12-20 04:11:10 -05:00
Merge pull request #671 from RooVetGit/revert_webview_ui_lint_changes
Revert lint rules in webview-ui too
This commit is contained in:
@@ -1,40 +0,0 @@
|
|||||||
{
|
|
||||||
"root": true,
|
|
||||||
"extends": [
|
|
||||||
"eslint:recommended",
|
|
||||||
"plugin:react/recommended",
|
|
||||||
"plugin:@typescript-eslint/recommended",
|
|
||||||
"plugin:react-hooks/recommended"
|
|
||||||
],
|
|
||||||
"parser": "@typescript-eslint/parser",
|
|
||||||
"plugins": ["react", "@typescript-eslint", "react-hooks"],
|
|
||||||
"rules": {
|
|
||||||
"react/react-in-jsx-scope": "off",
|
|
||||||
"@typescript-eslint/explicit-module-boundary-types": "off",
|
|
||||||
"@typescript-eslint/no-explicit-any": "warn",
|
|
||||||
"react/display-name": "warn",
|
|
||||||
"no-case-declarations": "warn",
|
|
||||||
"react/no-unescaped-entities": "warn",
|
|
||||||
"react/jsx-key": "warn",
|
|
||||||
"no-extra-semi": "warn",
|
|
||||||
"@typescript-eslint/no-var-requires": "warn",
|
|
||||||
"@typescript-eslint/no-unused-vars": [
|
|
||||||
"warn",
|
|
||||||
{
|
|
||||||
"argsIgnorePattern": "^_",
|
|
||||||
"varsIgnorePattern": "^_",
|
|
||||||
"caughtErrorsIgnorePattern": "^_"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"settings": {
|
|
||||||
"react": {
|
|
||||||
"version": "detect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"env": {
|
|
||||||
"browser": true,
|
|
||||||
"es2021": true,
|
|
||||||
"node": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -89,7 +89,7 @@ export const ChatRowContent = ({
|
|||||||
}
|
}
|
||||||
}, [isLast, message.say])
|
}, [isLast, message.say])
|
||||||
const [cost, apiReqCancelReason, apiReqStreamingFailedMessage] = useMemo(() => {
|
const [cost, apiReqCancelReason, apiReqStreamingFailedMessage] = useMemo(() => {
|
||||||
if (message.text != null && message.say === "api_req_started") {
|
if (message.text && message.say === "api_req_started") {
|
||||||
const info: ClineApiReqInfo = JSON.parse(message.text)
|
const info: ClineApiReqInfo = JSON.parse(message.text)
|
||||||
return [info.cost, info.cancelReason, info.streamingFailedMessage]
|
return [info.cost, info.cancelReason, info.streamingFailedMessage]
|
||||||
}
|
}
|
||||||
@@ -183,26 +183,26 @@ export const ChatRowContent = ({
|
|||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
return [
|
return [
|
||||||
apiReqCancelReason != null ? (
|
apiReqCancelReason !== null ? (
|
||||||
apiReqCancelReason === "user_cancelled" ? (
|
apiReqCancelReason === "user_cancelled" ? (
|
||||||
getIconSpan("error", cancelledColor)
|
getIconSpan("error", cancelledColor)
|
||||||
) : (
|
) : (
|
||||||
getIconSpan("error", errorColor)
|
getIconSpan("error", errorColor)
|
||||||
)
|
)
|
||||||
) : cost != null ? (
|
) : cost !== null ? (
|
||||||
getIconSpan("check", successColor)
|
getIconSpan("check", successColor)
|
||||||
) : apiRequestFailedMessage ? (
|
) : apiRequestFailedMessage ? (
|
||||||
getIconSpan("error", errorColor)
|
getIconSpan("error", errorColor)
|
||||||
) : (
|
) : (
|
||||||
<ProgressIndicator />
|
<ProgressIndicator />
|
||||||
),
|
),
|
||||||
apiReqCancelReason != null ? (
|
apiReqCancelReason !== null ? (
|
||||||
apiReqCancelReason === "user_cancelled" ? (
|
apiReqCancelReason === "user_cancelled" ? (
|
||||||
<span style={{ color: normalColor, fontWeight: "bold" }}>API Request Cancelled</span>
|
<span style={{ color: normalColor, fontWeight: "bold" }}>API Request Cancelled</span>
|
||||||
) : (
|
) : (
|
||||||
<span style={{ color: errorColor, fontWeight: "bold" }}>API Streaming Failed</span>
|
<span style={{ color: errorColor, fontWeight: "bold" }}>API Streaming Failed</span>
|
||||||
)
|
)
|
||||||
) : cost != null ? (
|
) : cost !== null ? (
|
||||||
<span style={{ color: normalColor, fontWeight: "bold" }}>API Request</span>
|
<span style={{ color: normalColor, fontWeight: "bold" }}>API Request</span>
|
||||||
) : apiRequestFailedMessage ? (
|
) : apiRequestFailedMessage ? (
|
||||||
<span style={{ color: errorColor, fontWeight: "bold" }}>API Request Failed</span>
|
<span style={{ color: errorColor, fontWeight: "bold" }}>API Request Failed</span>
|
||||||
@@ -510,7 +510,7 @@ export const ChatRowContent = ({
|
|||||||
style={{
|
style={{
|
||||||
...headerStyle,
|
...headerStyle,
|
||||||
marginBottom:
|
marginBottom:
|
||||||
(cost == null && apiRequestFailedMessage) || apiReqStreamingFailedMessage
|
(cost === null && apiRequestFailedMessage) || apiReqStreamingFailedMessage
|
||||||
? 10
|
? 10
|
||||||
: 0,
|
: 0,
|
||||||
justifyContent: "space-between",
|
justifyContent: "space-between",
|
||||||
@@ -524,13 +524,13 @@ export const ChatRowContent = ({
|
|||||||
<div style={{ display: "flex", alignItems: "center", gap: "10px", flexGrow: 1 }}>
|
<div style={{ display: "flex", alignItems: "center", gap: "10px", flexGrow: 1 }}>
|
||||||
{icon}
|
{icon}
|
||||||
{title}
|
{title}
|
||||||
<VSCodeBadge style={{ opacity: cost != null && cost > 0 ? 1 : 0 }}>
|
<VSCodeBadge style={{ opacity: cost ? 1 : 0 }}>
|
||||||
${Number(cost || 0)?.toFixed(4)}
|
${Number(cost || 0)?.toFixed(4)}
|
||||||
</VSCodeBadge>
|
</VSCodeBadge>
|
||||||
</div>
|
</div>
|
||||||
<span className={`codicon codicon-chevron-${isExpanded ? "up" : "down"}`}></span>
|
<span className={`codicon codicon-chevron-${isExpanded ? "up" : "down"}`}></span>
|
||||||
</div>
|
</div>
|
||||||
{((cost == null && apiRequestFailedMessage) || apiReqStreamingFailedMessage) && (
|
{((cost === null && apiRequestFailedMessage) || apiReqStreamingFailedMessage) && (
|
||||||
<>
|
<>
|
||||||
<p style={{ ...pStyle, color: "var(--vscode-errorForeground)" }}>
|
<p style={{ ...pStyle, color: "var(--vscode-errorForeground)" }}>
|
||||||
{apiRequestFailedMessage || apiReqStreamingFailedMessage}
|
{apiRequestFailedMessage || apiReqStreamingFailedMessage}
|
||||||
|
|||||||
@@ -275,7 +275,7 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
|
|||||||
return true
|
return true
|
||||||
} else {
|
} else {
|
||||||
const lastApiReqStarted = findLast(modifiedMessages, (message) => message.say === "api_req_started")
|
const lastApiReqStarted = findLast(modifiedMessages, (message) => message.say === "api_req_started")
|
||||||
if (lastApiReqStarted && lastApiReqStarted.text != null && lastApiReqStarted.say === "api_req_started") {
|
if (lastApiReqStarted && lastApiReqStarted.text && lastApiReqStarted.say === "api_req_started") {
|
||||||
const cost = JSON.parse(lastApiReqStarted.text).cost
|
const cost = JSON.parse(lastApiReqStarted.text).cost
|
||||||
if (cost === undefined) {
|
if (cost === undefined) {
|
||||||
// api request has not finished yet
|
// api request has not finished yet
|
||||||
@@ -660,9 +660,9 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
|
|||||||
if (message.say === "api_req_started") {
|
if (message.say === "api_req_started") {
|
||||||
// get last api_req_started in currentGroup to check if it's cancelled. If it is then this api req is not part of the current browser session
|
// get last api_req_started in currentGroup to check if it's cancelled. If it is then this api req is not part of the current browser session
|
||||||
const lastApiReqStarted = [...currentGroup].reverse().find((m) => m.say === "api_req_started")
|
const lastApiReqStarted = [...currentGroup].reverse().find((m) => m.say === "api_req_started")
|
||||||
if (lastApiReqStarted?.text != null) {
|
if (lastApiReqStarted?.text) {
|
||||||
const info = JSON.parse(lastApiReqStarted.text)
|
const info = JSON.parse(lastApiReqStarted.text)
|
||||||
const isCancelled = info.cancelReason != null
|
const isCancelled = info.cancelReason !== null
|
||||||
if (isCancelled) {
|
if (isCancelled) {
|
||||||
endBrowserSession()
|
endBrowserSession()
|
||||||
result.push(message)
|
result.push(message)
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ const WelcomeView = () => {
|
|||||||
|
|
||||||
const [apiErrorMessage, setApiErrorMessage] = useState<string | undefined>(undefined)
|
const [apiErrorMessage, setApiErrorMessage] = useState<string | undefined>(undefined)
|
||||||
|
|
||||||
const disableLetsGoButton = apiErrorMessage != null
|
const disableLetsGoButton = !!apiErrorMessage
|
||||||
|
|
||||||
const handleSubmit = () => {
|
const handleSubmit = () => {
|
||||||
vscode.postMessage({ type: "apiConfiguration", apiConfiguration })
|
vscode.postMessage({ type: "apiConfiguration", apiConfiguration })
|
||||||
|
|||||||
Reference in New Issue
Block a user