Merge main into feature/disable-sspc

aws-toolkit-automation · web-flow · commit 71e83b57e523 · 2025-09-26T18:08:10.000-07:00
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt
@@ -295,24 +295,15 @@ class CodeWhispererConfigurable(private val project: Project) :
                         ToolkitConnectionManagerListener.TOPIC,
                         object : ToolkitConnectionManagerListener {
                             override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
-                                enabled(isCodeWhispererEnabled(project) && !isSso)
+                                enabled(isCodeWhispererEnabled(project))
                             }
                         }
                     )
 
-                    enabled(invoke && !isSso)
+                    enabled(invoke)
 
-                    if (isSso) {
-                        bindSelected({ false }, {})
-                    } else {
-                        bindSelected(codeWhispererSettings::isMetricOptIn, codeWhispererSettings::toggleMetricOptIn)
-                    }
+                    bindSelected(codeWhispererSettings::isMetricOptIn, codeWhispererSettings::toggleMetricOptIn)
                 }.comment(message("aws.settings.codewhisperer.configurable.opt_out.tooltip"))
-                if (isSso) {
-                    label(message("aws.settings.codewhisperer.configurable.controlled_by_admin")).applyToComponent {
-                        font = font.deriveFont(Font.ITALIC).deriveFont((font.size - 1).toFloat())
-                    }.enabled(false)
-                }
             }
         }
     }.also {

Original file line number	Diff line number	Diff line change
`@@ -295,24 +295,15 @@ class CodeWhispererConfigurable(private val project: Project) :`
`295`	`295`	`ToolkitConnectionManagerListener.TOPIC,`
`296`	`296`	`object : ToolkitConnectionManagerListener {`
`297`	`297`	`override fun activeConnectionChanged(newConnection: ToolkitConnection?) {`
`298`		`- enabled(isCodeWhispererEnabled(project) && !isSso)`
	`298`	`+ enabled(isCodeWhispererEnabled(project))`
`299`	`299`	`}`
`300`	`300`	`}`
`301`	`301`	`)`
`302`	`302`
`303`		`- enabled(invoke && !isSso)`
	`303`	`+ enabled(invoke)`
`304`	`304`
`305`		`- if (isSso) {`
`306`		`- bindSelected({ false }, {})`
`307`		`- } else {`
`308`		`- bindSelected(codeWhispererSettings::isMetricOptIn, codeWhispererSettings::toggleMetricOptIn)`
`309`		`- }`
	`305`	`+ bindSelected(codeWhispererSettings::isMetricOptIn, codeWhispererSettings::toggleMetricOptIn)`
`310`	`306`	`}.comment(message("aws.settings.codewhisperer.configurable.opt_out.tooltip"))`
`311`		`- if (isSso) {`
`312`		`- label(message("aws.settings.codewhisperer.configurable.controlled_by_admin")).applyToComponent {`
`313`		`- font = font.deriveFont(Font.ITALIC).deriveFont((font.size - 1).toFloat())`
`314`		`- }.enabled(false)`
`315`		`- }`
`316`	`307`	`}`
`317`	`308`	`}`
`318`	`309`	`}.also {`