Skip to content

Commit b44dab6

Browse files
committed
Adjust function deployment UI according to UX comments
1 parent cf33895 commit b44dab6

File tree

2 files changed

+11
-23
lines changed

2 files changed

+11
-23
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/deploy/ui/FunctionDeploymentPanel.form

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<grid id="27dc6" binding="pnlRoot" layout-manager="GridLayoutManager" row-count="4" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
44
<margin top="0" left="0" bottom="0" right="0"/>
55
<constraints>
6-
<xy x="20" y="20" width="604" height="220"/>
6+
<xy x="20" y="20" width="604" height="133"/>
77
</constraints>
88
<properties/>
99
<border type="none"/>
@@ -53,18 +53,6 @@
5353
<text value="Module: "/>
5454
</properties>
5555
</component>
56-
<component id="56e9e" class="javax.swing.JLabel" binding="lblDeploymentSlot">
57-
<constraints>
58-
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
59-
<minimum-size width="-1" height="24"/>
60-
<preferred-size width="-1" height="24"/>
61-
<maximum-size width="-1" height="24"/>
62-
</grid>
63-
</constraints>
64-
<properties>
65-
<text value="Deployment Slot:"/>
66-
</properties>
67-
</component>
6856
<component id="760ca" class="com.microsoft.azure.toolkit.intellij.legacy.function.FunctionAppComboBox" binding="functionAppComboBox" custom-create="true">
6957
<constraints>
7058
<grid row="1" column="1" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
@@ -73,29 +61,29 @@
7361
</component>
7462
<component id="35551" class="com.microsoft.azure.toolkit.intellij.legacy.function.runner.deploy.ui.components.DeploymentSlotComboBox" binding="cbDeploymentSlot" custom-create="true">
7563
<constraints>
76-
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
64+
<grid row="2" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
7765
</constraints>
7866
<properties>
7967
<visible value="true"/>
8068
</properties>
8169
</component>
70+
<component id="2bbdf" class="javax.swing.JComboBox" binding="cbFunctionModule">
71+
<constraints>
72+
<grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
73+
</constraints>
74+
<properties/>
75+
</component>
8276
<component id="60952" class="javax.swing.JCheckBox" binding="chkSlot">
8377
<constraints>
84-
<grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
78+
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
8579
</constraints>
8680
<properties>
8781
<contentAreaFilled value="true"/>
8882
<hideActionText value="false"/>
8983
<horizontalTextPosition value="4"/>
90-
<text value="Deploy To Slot"/>
84+
<text value="Deploy to Slot:"/>
9185
</properties>
9286
</component>
93-
<component id="2bbdf" class="javax.swing.JComboBox" binding="cbFunctionModule">
94-
<constraints>
95-
<grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
96-
</constraints>
97-
<properties/>
98-
</component>
9987
</children>
10088
</grid>
10189
</form>

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/deploy/ui/FunctionDeploymentPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public class FunctionDeploymentPanel extends AzureSettingPanel<FunctionDeployCon
6565
private JLabel lblAppSettings;
6666
private JCheckBox chkSlot;
6767
private DeploymentSlotComboBox cbDeploymentSlot;
68-
private JLabel lblDeploymentSlot;
6968
private FunctionAppSettingsTable appSettingsTable;
7069
private String appSettingsKey;
7170
private String appSettingsResourceId;
@@ -91,6 +90,7 @@ public void customize(JList list, Module module, int i, boolean b, boolean b1) {
9190
lblModule.setLabelFor(cbFunctionModule);
9291
lblFunction.setLabelFor(functionAppComboBox);
9392
lblAppSettings.setLabelFor(appSettingsTable);
93+
final JLabel lblDeploymentSlot = new JLabel("Deployment Slot:");
9494
lblDeploymentSlot.setLabelFor(cbDeploymentSlot);
9595
fillModules();
9696
}

0 commit comments

Comments
 (0)