refactor: rebase // fix conflicts

Author: catrielmuller

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

@@ -120,9 +120,13 @@ type SectionName = (typeof sectionNames)[number] // kilocode_change
 type SettingsViewProps = {
 	onDone: () => void
 	targetSection?: string
+	editingProfile?: string // kilocode_change - profile to edit
 }
 
-const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, targetSection }, ref) => {
+// kilocode_change start - editingProfile
+const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>((props, ref) => {
+	const { onDone, targetSection, editingProfile } = props
+	// kilocode_change end - editingProfile
 	const { t } = useAppTranslation()
 
 	const extensionState = useExtensionState()
@@ -270,8 +274,26 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 		setCachedState((prevCachedState) => ({ ...prevCachedState, ...extensionState }))
 		prevApiConfigName.current = currentApiConfigName
 		setChangeDetected(false)
-		setEditingApiConfigName(currentApiConfigName || "default") // kilocode_change: Sync editing profile when active profile changes
-	}, [currentApiConfigName, extensionState])
+		// kilocode_change start - Don't reset editingApiConfigName if we have an editingProfile prop (from auth return)
+		if (!editingProfile) {
+			setEditingApiConfigName(currentApiConfigName || "default")
+		}
+		// kilocode_change end
+	}, [currentApiConfigName, extensionState, editingProfile]) // kilocode_change
+
+	// kilocode_change start: Set editing profile when prop changes (from auth return)
+	useEffect(() => {
+		if (editingProfile) {
+			console.log("[SettingsView] Setting editing profile from prop:", editingProfile)
+			setEditingApiConfigName(editingProfile)
+			isLoadingProfileForEditing.current = true
+			vscode.postMessage({
+				type: "getProfileConfigurationForEditing",
+				text: editingProfile,
+			})
+		}
+	}, [editingProfile])
+	// kilocode_change end
 
 	// kilocode_change start
 	const isLoadingProfileForEditing = useRef(false)
@@ -741,6 +763,32 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 		}
 	}, [targetSection]) // kilocode_change
 
+	// kilocode_change start - Listen for messages to restore editing profile after auth
+	useEffect(() => {
+		const handleMessage = (event: MessageEvent) => {
+			const message = event.data
+			if (
+				message.type === "action" &&
+				message.action === "settingsButtonClicked" &&
+				message.values?.editingProfile
+			) {
+				const profileToEdit = message.values.editingProfile as string
+				console.log("[SettingsView] Restoring editing profile:", profileToEdit)
+				setEditingApiConfigName(profileToEdit)
+				// Request the profile's configuration for editing
+				isLoadingProfileForEditing.current = true
+				vscode.postMessage({
+					type: "getProfileConfigurationForEditing",
+					text: profileToEdit,
+				})
+			}
+		}
+
+		window.addEventListener("message", handleMessage)
+		return () => window.removeEventListener("message", handleMessage)
+	}, [])
+	// kilocode_change end
+
 	// Function to scroll the active tab into view for vertical layout
 	const scrollToActiveTab = useCallback(() => {
 		const activeTabElement = tabRefs.current[activeTab]
@@ -958,7 +1006,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 									setApiConfigurationField={setApiConfigurationField}
 									errorMessage={errorMessage}
 									setErrorMessage={setErrorMessage}
-									currentApiConfigName={currentApiConfigName}
+									currentApiConfigName={editingApiConfigName}
 								/>
 								{/* kilocode_change end - pass editing profile name */}
 							</Section>