Skip to content

Commit 5a4e5ed

Browse files
authored
Migrate from UI DSL v1 to v2 -7 (#3838)
* refactor sam init panel * fixed detekt
1 parent 8c35b37 commit 5a4e5ed

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamInitSelectionPanel.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import com.intellij.ui.IdeBorderFactory
1010
import com.intellij.ui.SimpleListCellRenderer
1111
import com.intellij.ui.components.JBLabel
1212
import com.intellij.ui.components.panels.Wrapper
13-
import com.intellij.ui.layout.panel
13+
import com.intellij.ui.dsl.builder.AlignX
14+
import com.intellij.ui.dsl.builder.panel
1415
import com.intellij.util.text.SemVer
1516
import software.amazon.awssdk.services.lambda.model.PackageType
1617
import software.aws.toolkits.core.lambda.LambdaArchitecture
@@ -89,7 +90,7 @@ class SamInitSelectionPanel(
8990
panel {
9091
wizardFragments.values.forEach {
9192
row {
92-
it(grow)
93+
cell(it).align(AlignX.FILL)
9394
}
9495
}
9596
}

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SchemaSelectionPanel.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.intellij.openapi.roots.ModifiableRootModel
88
import com.intellij.openapi.ui.TextFieldWithBrowseButton
99
import com.intellij.openapi.ui.ValidationInfo
1010
import com.intellij.openapi.vfs.VfsUtil
11-
import com.intellij.ui.layout.panel
11+
import com.intellij.ui.dsl.builder.panel
1212
import software.amazon.awssdk.services.schemas.SchemasClient
1313
import software.aws.toolkits.core.lambda.LambdaRuntime
1414
import software.aws.toolkits.jetbrains.services.lambda.BuiltInRuntimeGroups
@@ -41,10 +41,10 @@ class SchemaSelectionPanel : WizardFragment {
4141
private val component by lazy {
4242
panel {
4343
row {
44-
awsConnectionSelector.selectorPanel()(grow)
44+
cell(awsConnectionSelector.selectorPanel())
4545
}
4646
row(message("sam.init.schema.label")) {
47-
schemaSelector.component(grow)
47+
cell(schemaSelector.component)
4848
}
4949
}
5050
}

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SdkSelectionPanel.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,13 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton
1313
import com.intellij.openapi.ui.ValidationInfo
1414
import com.intellij.ui.ErrorLabel
1515
import com.intellij.ui.components.panels.Wrapper
16-
import com.intellij.ui.layout.panel
16+
import com.intellij.ui.dsl.builder.AlignX
17+
import com.intellij.ui.dsl.builder.BottomGap
18+
import com.intellij.ui.dsl.builder.panel
1719
import com.intellij.util.ThrowableRunnable
1820
import software.aws.toolkits.core.lambda.LambdaRuntime
1921
import software.aws.toolkits.jetbrains.services.lambda.RuntimeGroup
22+
import software.aws.toolkits.resources.message
2023
import javax.swing.JComponent
2124
import javax.swing.JLabel
2225

@@ -67,7 +70,7 @@ class SdkSelectionPanel : WizardFragment {
6770

6871
override fun updateUi(projectLocation: TextFieldWithBrowseButton?, runtimeGroup: RuntimeGroup?, template: SamProjectTemplate?) {
6972
if (runtimeGroup == null) {
70-
component.setContent(ErrorLabel("No runtime selected"))
73+
component.setContent(ErrorLabel(message("sam.init.sdk.runtime.not.selected")))
7174
return
7275
}
7376

@@ -76,8 +79,8 @@ class SdkSelectionPanel : WizardFragment {
7679
panel {
7780
it?.let {
7881
row(it.sdkSelectionLabel()) {
79-
it.sdkSelectionPanel()(grow)
80-
}
82+
cell(it.sdkSelectionPanel()).align(AlignX.FILL)
83+
}.bottomGap(BottomGap.MEDIUM)
8184
}
8285
}
8386
)

resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,6 +1145,7 @@ sam.init.schema.pleaseSelect=Choose the EventBridge serverless event schema
11451145
sam.init.schema.registry.name=Registry: {0}
11461146
sam.init.sdk.error=Check SDK settings
11471147
sam.init.sdk.label=SDK:
1148+
sam.init.sdk.runtime.not.selected=No runtime selected
11481149
sam.init.select_sam_template=SAM Template:
11491150
sam.init.template.dynamodb_cookiecutter.description=Sample SAM Template to interact with DynamoDB Events
11501151
sam.init.template.dynamodb_cookiecutter.name=AWS SAM DynamoDB Event Example

0 commit comments

Comments
 (0)