cleanup

Author: complyue

src/core/webview/ClineProvider.ts

@@ -722,7 +722,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 		content security policy of your webview to only allow scripts that have a specific nonce
 		create a content security policy meta tag so that only loading scripts with a nonce is allowed
 		As your extension grows you will likely want to add custom styles, fonts, and/or images to your webview. If you do, you will need to update the content security policy meta tag to explicity allow for these resources. E.g.
-				<meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src ${webview.cspSource}; font-src ${webview.cspSource}; img-src ${webview.cspSource} https:; script-src 'nonce-${nonce}' https://us-assets.i.posthog.com; connect-src https://openrouter.ai https://api.requesty.ai https://us.i.posthog.com https://us-assets.i.posthog.com;">
+				<meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src ${webview.cspSource}; font-src ${webview.cspSource}; img-src ${webview.cspSource} https:; script-src 'nonce-${nonce}';">
 		- 'unsafe-inline' is required for styles due to vscode-webview-toolkit's dynamic style injection
 		- since we pass base64 images to the webview, we need to specify img-src ${webview.cspSource} data:;
 

webview-ui/src/components/settings/AutoApproveToggle.tsx

@@ -25,7 +25,6 @@ type AutoApproveConfig = {
 	descriptionKey: string
 	icon: string
 	testId: string
-	order?: number
 }
 
 export const autoApproveSettingsConfig: Record<AutoApproveSetting, AutoApproveConfig> = {
@@ -35,71 +34,62 @@ export const autoApproveSettingsConfig: Record<AutoApproveSetting, AutoApproveCo
 		descriptionKey: "settings:autoApprove.readOnly.description",
 		icon: "eye",
 		testId: "always-allow-readonly-toggle",
-		order: 1,
 	},
 	alwaysAllowWrite: {
 		key: "alwaysAllowWrite",
 		labelKey: "settings:autoApprove.write.label",
 		descriptionKey: "settings:autoApprove.write.description",
 		icon: "edit",
 		testId: "always-allow-write-toggle",
-		order: 2,
 	},
 	alwaysAllowBrowser: {
 		key: "alwaysAllowBrowser",
 		labelKey: "settings:autoApprove.browser.label",
 		descriptionKey: "settings:autoApprove.browser.description",
 		icon: "globe",
 		testId: "always-allow-browser-toggle",
-		order: 3,
 	},
 	alwaysApproveResubmit: {
 		key: "alwaysApproveResubmit",
 		labelKey: "settings:autoApprove.retry.label",
 		descriptionKey: "settings:autoApprove.retry.description",
 		icon: "refresh",
 		testId: "always-approve-resubmit-toggle",
-		order: 4,
 	},
 	alwaysAllowMcp: {
 		key: "alwaysAllowMcp",
 		labelKey: "settings:autoApprove.mcp.label",
 		descriptionKey: "settings:autoApprove.mcp.description",
 		icon: "plug",
 		testId: "always-allow-mcp-toggle",
-		order: 5,
 	},
 	alwaysAllowExtTools: {
 		key: "alwaysAllowExtTools",
 		labelKey: "settings:autoApprove.ext.label",
 		descriptionKey: "settings:autoApprove.ext.description",
 		icon: "extensions",
 		testId: "always-allow-ext-tools-toggle",
-		order: 6,
 	},
 	alwaysAllowModeSwitch: {
 		key: "alwaysAllowModeSwitch",
 		labelKey: "settings:autoApprove.modeSwitch.label",
 		descriptionKey: "settings:autoApprove.modeSwitch.description",
 		icon: "sync",
 		testId: "always-allow-mode-switch-toggle",
-		order: 7,
 	},
 	alwaysAllowSubtasks: {
 		key: "alwaysAllowSubtasks",
 		labelKey: "settings:autoApprove.subtasks.label",
 		descriptionKey: "settings:autoApprove.subtasks.description",
 		icon: "list-tree",
 		testId: "always-allow-subtasks-toggle",
-		order: 8,
 	},
 	alwaysAllowExecute: {
 		key: "alwaysAllowExecute",
 		labelKey: "settings:autoApprove.execute.label",
 		descriptionKey: "settings:autoApprove.execute.description",
 		icon: "terminal",
 		testId: "always-allow-execute-toggle",
-		order: 9,
 	},
 }
 
@@ -110,9 +100,6 @@ type AutoApproveToggleProps = AutoApproveToggles & {
 export const AutoApproveToggle = ({ onToggle, ...props }: AutoApproveToggleProps) => {
 	const { t } = useAppTranslation()
 
-	// Sort buttons by order property
-	const orderedSettings = Object.values(autoApproveSettingsConfig).sort((a, b) => (a.order || 0) - (b.order || 0))
-
 	return (
 		<div
 			className={cn(
@@ -121,7 +108,7 @@ export const AutoApproveToggle = ({ onToggle, ...props }: AutoApproveToggleProps
 				"[@media(min-width:800px)]:grid-cols-5",
 				"[@media(min-width:1200px)]:grid-cols-5",
 			)}>
-			{orderedSettings.map(({ key, descriptionKey, labelKey, icon, testId }) => (
+			{Object.values(autoApproveSettingsConfig).map(({ key, descriptionKey, labelKey, icon, testId }) => (
 				<Button
 					key={key}
 					variant={props[key] ? "default" : "outline"}