Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add default url #479

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add default url #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0112d1
add default url
yanir-codota Mar 6, 2023
c8a9ba2
DEV2-2244 add business division
yonip23 Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/main/java/com/tabnine/binary/BinaryRun.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@
import com.tabnine.binary.fetch.BinaryVersionFetcher;
import com.tabnine.config.Config;
import com.tabnine.general.StaticConfig;
import com.tabnine.userSettings.AppSettingsState;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

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

if (Config.IS_ON_PREM && StaticConfig.getTabnineEnterpriseHost().isPresent()) {
constantParameters.add(
"--cloud2_url=" + cmdSanitize(StaticConfig.getTabnineEnterpriseHost().get()));
if (Config.IS_ON_PREM) {
Optional<String> enterpriseHost = StaticConfig.getTabnineEnterpriseHost();
enterpriseHost.ifPresent(s -> constantParameters.add("--cloud2_url=" + cmdSanitize(s)));
String businessDivision = AppSettingsState.getInstance().getBusinessDivision();
if (!businessDivision.isEmpty()) {
metadata.add("businessDivision=" + businessDivision);
}
}

if (additionalMetadata != null) {
Expand Down
31 changes: 30 additions & 1 deletion src/main/java/com/tabnine/userSettings/AppSettingsComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.tabnine.userSettings

import com.intellij.openapi.ui.ComboBox
import com.intellij.ui.components.JBCheckBox
import com.intellij.ui.components.JBLabel
import com.intellij.ui.components.JBTextField
Expand Down Expand Up @@ -31,6 +32,18 @@ class AppSettingsComponent {
JBCheckBox("Enable auto-importing packages when selecting Tabnine suggestions", true)
private val binariesFolderOverrideComponent = JXTextField(StaticConfig.getDefaultBaseDirectory().toString())
private val cloud2UrlComponent = JBTextField()
private val businessDivisionComboBox = ComboBox(
arrayOf(
"",
"Mobile eXperience",
"Visual Display",
"Networks",
"Digital Appliances",
"Health & Medical Equipment",
"Samsung Research",
"Other"
)
)

val preferredFocusedComponent: JComponent
get() = colorChooser
Expand Down Expand Up @@ -76,6 +89,11 @@ class AppSettingsComponent {
set(value) {
cloud2UrlComponent.text = value
}
var businessDivision: String
get() = businessDivisionComboBox.selectedItem as String
set(value) {
businessDivisionComboBox.selectedItem = value
}

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

if (Config.IS_ON_PREM) {
panelBuilder.addLabeledComponent("Tabnine Enterprise URL (requires restart): ", cloud2UrlComponent, 1, false)
panelBuilder.addLabeledComponent(
"Tabnine Enterprise URL (requires restart): ",
cloud2UrlComponent,
1,
false
)
panelBuilder.addLabeledComponent(
"Business Division (requires restart): ",
businessDivisionComboBox,
1,
false
)
}
if (!isFixedDebounceConfigured()) {
panelBuilder
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/tabnine/userSettings/AppSettingsConfigurable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ class AppSettingsConfigurable : Configurable {
it.debounceTime != settings.debounceTime.toString() ||
it.autoImportEnabled != settings.autoImportEnabled ||
it.binariesFolderOverride != settings.binariesFolderOverride ||
it.cloud2Url != settings.cloud2Url
it.cloud2Url != settings.cloud2Url ||
it.businessDivision != settings.businessDivision
}
}
return false
Expand All @@ -54,6 +55,7 @@ class AppSettingsConfigurable : Configurable {
settings.autoImportEnabled = settingsComponent!!.autoImportEnabled
settings.binariesFolderOverride = settingsComponent!!.binariesFolderOverride
settings.cloud2Url = settingsComponent!!.cloud2Url
settings.businessDivision = settingsComponent!!.businessDivision
}
}

Expand All @@ -68,6 +70,7 @@ class AppSettingsConfigurable : Configurable {
it.autoImportEnabled = settings.autoImportEnabled
it.binariesFolderOverride = settings.binariesFolderOverride
it.cloud2Url = settings.cloud2Url
it.businessDivision = settings.businessDivision
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/tabnine/userSettings/AppSettingsState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ class AppSettingsState : PersistentStateComponent<AppSettingsState?> {
var debounceTime: Long = 0
var autoImportEnabled: Boolean = true
var binariesFolderOverride: String = ""
var cloud2Url: String = ""
var cloud2Url: String = "https://tabnine.sec.samsung.net"
yanir-codota marked this conversation as resolved.
Show resolved Hide resolved
var businessDivision: String = ""

private var colorState = settingsDefaultColor

Expand Down