Skip to content

Commit c8a9ba2

Browse files
yonip23amirbilu
authored andcommitted
DEV2-2244 add business division
1 parent c0112d1 commit c8a9ba2

File tree

4 files changed

+44
-5
lines changed

4 files changed

+44
-5
lines changed

src/main/java/com/tabnine/binary/BinaryRun.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616
import com.tabnine.binary.fetch.BinaryVersionFetcher;
1717
import com.tabnine.config.Config;
1818
import com.tabnine.general.StaticConfig;
19+
import com.tabnine.userSettings.AppSettingsState;
1920
import java.io.IOException;
2021
import java.util.ArrayList;
2122
import java.util.List;
2223
import java.util.Map;
24+
import java.util.Optional;
2325
import org.jetbrains.annotations.NotNull;
2426
import org.jetbrains.annotations.Nullable;
2527

@@ -80,9 +82,13 @@ private ArrayList<String> getBinaryConstantParameters(
8082
metadata.add("clientApiVersion=" + cmdSanitize(applicationInfo.getApiVersion()));
8183
}
8284

83-
if (Config.IS_ON_PREM && StaticConfig.getTabnineEnterpriseHost().isPresent()) {
84-
constantParameters.add(
85-
"--cloud2_url=" + cmdSanitize(StaticConfig.getTabnineEnterpriseHost().get()));
85+
if (Config.IS_ON_PREM) {
86+
Optional<String> enterpriseHost = StaticConfig.getTabnineEnterpriseHost();
87+
enterpriseHost.ifPresent(s -> constantParameters.add("--cloud2_url=" + cmdSanitize(s)));
88+
String businessDivision = AppSettingsState.getInstance().getBusinessDivision();
89+
if (!businessDivision.isEmpty()) {
90+
metadata.add("businessDivision=" + businessDivision);
91+
}
8692
}
8793

8894
if (additionalMetadata != null) {

src/main/java/com/tabnine/userSettings/AppSettingsComponent.kt

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.tabnine.userSettings
22

3+
import com.intellij.openapi.ui.ComboBox
34
import com.intellij.ui.components.JBCheckBox
45
import com.intellij.ui.components.JBLabel
56
import com.intellij.ui.components.JBTextField
@@ -31,6 +32,18 @@ class AppSettingsComponent {
3132
JBCheckBox("Enable auto-importing packages when selecting Tabnine suggestions", true)
3233
private val binariesFolderOverrideComponent = JXTextField(StaticConfig.getDefaultBaseDirectory().toString())
3334
private val cloud2UrlComponent = JBTextField()
35+
private val businessDivisionComboBox = ComboBox(
36+
arrayOf(
37+
"",
38+
"Mobile eXperience",
39+
"Visual Display",
40+
"Networks",
41+
"Digital Appliances",
42+
"Health & Medical Equipment",
43+
"Samsung Research",
44+
"Other"
45+
)
46+
)
3447

3548
val preferredFocusedComponent: JComponent
3649
get() = colorChooser
@@ -76,6 +89,11 @@ class AppSettingsComponent {
7689
set(value) {
7790
cloud2UrlComponent.text = value
7891
}
92+
var businessDivision: String
93+
get() = businessDivisionComboBox.selectedItem as String
94+
set(value) {
95+
businessDivisionComboBox.selectedItem = value
96+
}
7997

8098
init {
8199
if (!suggestionsModeService.getSuggestionMode().isInlineEnabled) {
@@ -90,7 +108,18 @@ class AppSettingsComponent {
90108
.addLabeledComponent("Log level (requires restart): ", logLevelComponent, 1, false)
91109

92110
if (Config.IS_ON_PREM) {
93-
panelBuilder.addLabeledComponent("Tabnine Enterprise URL (requires restart): ", cloud2UrlComponent, 1, false)
111+
panelBuilder.addLabeledComponent(
112+
"Tabnine Enterprise URL (requires restart): ",
113+
cloud2UrlComponent,
114+
1,
115+
false
116+
)
117+
panelBuilder.addLabeledComponent(
118+
"Business Division (requires restart): ",
119+
businessDivisionComboBox,
120+
1,
121+
false
122+
)
94123
}
95124
if (!isFixedDebounceConfigured()) {
96125
panelBuilder

src/main/java/com/tabnine/userSettings/AppSettingsConfigurable.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ class AppSettingsConfigurable : Configurable {
3737
it.debounceTime != settings.debounceTime.toString() ||
3838
it.autoImportEnabled != settings.autoImportEnabled ||
3939
it.binariesFolderOverride != settings.binariesFolderOverride ||
40-
it.cloud2Url != settings.cloud2Url
40+
it.cloud2Url != settings.cloud2Url ||
41+
it.businessDivision != settings.businessDivision
4142
}
4243
}
4344
return false
@@ -54,6 +55,7 @@ class AppSettingsConfigurable : Configurable {
5455
settings.autoImportEnabled = settingsComponent!!.autoImportEnabled
5556
settings.binariesFolderOverride = settingsComponent!!.binariesFolderOverride
5657
settings.cloud2Url = settingsComponent!!.cloud2Url
58+
settings.businessDivision = settingsComponent!!.businessDivision
5759
}
5860
}
5961

@@ -68,6 +70,7 @@ class AppSettingsConfigurable : Configurable {
6870
it.autoImportEnabled = settings.autoImportEnabled
6971
it.binariesFolderOverride = settings.binariesFolderOverride
7072
it.cloud2Url = settings.cloud2Url
73+
it.businessDivision = settings.businessDivision
7174
}
7275
}
7376

src/main/java/com/tabnine/userSettings/AppSettingsState.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class AppSettingsState : PersistentStateComponent<AppSettingsState?> {
2727
var autoImportEnabled: Boolean = true
2828
var binariesFolderOverride: String = ""
2929
var cloud2Url: String = "https://tabnine.sec.samsung.net"
30+
var businessDivision: String = ""
3031

3132
private var colorState = settingsDefaultColor
3233

0 commit comments

Comments
 (0)