add disabled env mode

ssharaev · ssharaev · commit 7669e9b4586a · 2025-01-15T09:13:00.000+04:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Kubernetes Run Configuration Env
 
-![Build](https://github.com/ssharaev/intelij-k8s-env-plugin/workflows/Build/badge.svg)
+![Build](https://github.com/ssharaev/intellij-k8s-env-plugin/workflows/Build/badge.svg)
 [![Version](https://img.shields.io/jetbrains/plugin/v/26165.svg)](https://plugins.jetbrains.com/plugin/26165)
 [![Downloads](https://img.shields.io/jetbrains/plugin/d/26165.svg)](https://plugins.jetbrains.com/plugin/26165)
 
@@ -31,7 +31,7 @@ Also, you can replace your variable values using regexp.
 
 - Manually:
 
-  Download the [latest release](https://github.com/ssharaev/intelij-k8s-env-plugin/releases/latest) and install it manually using
+  Download the [latest release](https://github.com/ssharaev/intellij-k8s-env-plugin/releases/latest) and install it manually using
   <kbd>Settings/Preferences</kbd> > <kbd>Plugins</kbd> > <kbd>⚙️</kbd> > <kbd>Install plugin from disk...</kbd>
 
 # License
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "com.ssharaev"
-version = providers.gradleProperty("pluginVersion")
+version = "0.1.0"
 
 repositories {
   mavenCentral()
@@ -47,8 +47,8 @@ tasks {
   }
 
   patchPluginXml {
-    sinceBuild.set(providers.gradleProperty("pluginSinceBuild").get())
-    untilBuild.set(providers.gradleProperty("pluginUntilBuild").get())
+    sinceBuild.set("233")
+    untilBuild.set(provider { null })
     changeNotes = provider {
       changelog.renderItem(changelog.getLatest()
               .withHeader(false)
diff --git a/gradle.properties b/gradle.properties
@@ -1,11 +1,6 @@
 # IntelliJ Platform Artifacts Repositories -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
-
 pluginName = Kubernetes Run Configuration Env
 pluginRepositoryUrl = https://github.com/ssharaev/intellij-k8s-env-plugin
-pluginVersion = 0.1.0
-
-pluginSinceBuild = 233
-pluginUntilBuild = 245.*
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
 gradleVersion = 8.10.2
diff --git a/settings.gradle b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = "intellij-k8s-env-plugin"
diff --git a/src/main/java/com/ssharaev/k8s/env/plugin/model/EnvMode.java b/src/main/java/com/ssharaev/k8s/env/plugin/model/EnvMode.java
@@ -10,7 +10,8 @@
 public enum EnvMode {
     CONFIGMAP_AND_SECRET("Configmaps and secrets"),
     POD_ENV("Pod environment"),
-    POD_VAULT("Pod vault environment");
+    POD_VAULT("Pod vault environment"),
+    DISABLED("Disabled");
 
     private final String beautyName;
 
diff --git a/src/main/java/com/ssharaev/k8s/env/plugin/model/PluginSettings.java b/src/main/java/com/ssharaev/k8s/env/plugin/model/PluginSettings.java
@@ -21,15 +21,18 @@ public class PluginSettings {
     @NotNull
     @Builder.Default
     private EnvMode envMode = EnvMode.CONFIGMAP_AND_SECRET;
-    @Builder.Default
-    private String namespace = "default";
+    @Nullable
+    private String namespace;
+    @NotNull
     @Builder.Default
     private List<String> configmapNames = List.of();
+    @NotNull
     @Builder.Default
     private List<String> secretNames = List.of();
     @Nullable
     private String podName;
 
+    @NotNull
     @Builder.Default
     private List<ReplacementEntity> replacementEntities = List.of();
 
diff --git a/src/main/java/com/ssharaev/k8s/env/plugin/services/RunConfigurationEditorService.java b/src/main/java/com/ssharaev/k8s/env/plugin/services/RunConfigurationEditorService.java
@@ -84,8 +84,11 @@ public void validateConfiguration(@NotNull RunConfigurationBase<?> configuration
             return;
         }
         try {
-            validatePluginSettings(PluginSettingsProvider.getPluginSetting(configuration));
-            enableK8sEnvProvider(configuration);
+            PluginSettings pluginSetting = PluginSettingsProvider.getPluginSetting(configuration);
+            validatePluginSettings(pluginSetting);
+            if (pluginSetting.getEnvMode() != EnvMode.DISABLED) {
+                enableK8sEnvProvider(configuration);
+            }
         } catch (Exception e) {
             NotificationService.notifyWarn(NOTIFICATION_TITLE, e.getMessage());
             disableK8sEnvProvider(configuration);
diff --git a/src/main/java/com/ssharaev/k8s/env/plugin/ui/HideableElement.java b/src/main/java/com/ssharaev/k8s/env/plugin/ui/HideableElement.java
@@ -0,0 +1,58 @@
+package com.ssharaev.k8s.env.plugin.ui;
+
+import com.intellij.ui.components.JBLabel;
+import com.intellij.util.ui.FormBuilder;
+import com.intellij.util.ui.JBUI;
+import com.intellij.util.ui.UIUtil;
+
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+
+public class HideableElement<T extends JComponent> {
+    private final T component;
+    private final JBLabel label;
+    private final JBLabel tooltip;
+
+    public HideableElement(String labelText, String tooltipText, T component) {
+        this.component = component;
+        this.label = new JBLabel(labelText);
+        if (tooltipText != null) {
+            this.tooltip = new JBLabel(tooltipText, UIUtil.ComponentStyle.SMALL, UIUtil.FontColor.BRIGHTER);
+            this.tooltip.setBorder(JBUI.Borders.emptyLeft(10));
+        } else {
+            this.tooltip = null;
+        }
+    }
+
+    public HideableElement(String labelText, T component) {
+        this(labelText, null, component);
+    }
+
+    public void addToBuilder(FormBuilder builder) {
+        builder.addLabeledComponent(label, component, 1, false)
+                .addComponentFillVertically(new JPanel(), 0);
+        if (tooltip != null) {
+            builder.addComponentToRightColumn(tooltip, 1);
+        }
+    }
+
+    public void hide() {
+        this.component.setVisible(false);
+        this.label.setVisible(false);
+        if (tooltip != null) {
+            this.tooltip.setVisible(false);
+        }
+    }
+
+    public void show() {
+        this.component.setVisible(true);
+        this.label.setVisible(true);
+        if (tooltip != null) {
+            this.tooltip.setVisible(true);
+        }
+    }
+
+    protected T getComponent() {
+        return component;
+    }
+}
diff --git a/src/main/java/com/ssharaev/k8s/env/plugin/ui/InputTextElement.java b/src/main/java/com/ssharaev/k8s/env/plugin/ui/InputTextElement.java
@@ -0,0 +1,18 @@
+package com.ssharaev.k8s.env.plugin.ui;
+
+import com.intellij.ui.components.JBTextField;
+
+public class InputTextElement extends HideableElement<JBTextField> {
+
+    public InputTextElement(String labelText, String tooltipText, JBTextField component) {
+        super(labelText, tooltipText, component);
+    }
+
+    public String getText() {
+        return getComponent().getText();
+    }
+
+    public void setText(String text) {
+        getComponent().setText(text);
+    }
+}
diff --git a/src/main/java/com/ssharaev/k8s/env/plugin/ui/InputTextPanel.java b/src/main/java/com/ssharaev/k8s/env/plugin/ui/InputTextPanel.java
diff --git a/src/main/java/com/ssharaev/k8s/env/plugin/ui/RunConfigurationPanelProvider.java b/src/main/java/com/ssharaev/k8s/env/plugin/ui/RunConfigurationPanelProvider.java
@@ -5,6 +5,7 @@
 import com.intellij.ui.PopupMenuListenerAdapter;
 import com.intellij.ui.ToolbarDecorator;
 import com.intellij.ui.components.JBLabel;
+import com.intellij.ui.components.JBTextField;
 import com.intellij.ui.table.JBTable;
 import com.intellij.util.ui.FormBuilder;
 import com.intellij.util.ui.JBFont;
@@ -31,19 +32,21 @@ public class RunConfigurationPanelProvider {
 
     private final ComboBox<String> envModeComboBox;
 
-    private final InputTextPanel configmapsPanel;
-    private final InputTextPanel secretsPanel;
-    private final InputTextPanel podsPanel;
+    private final InputTextElement configmapsElement;
+    private final InputTextElement secretsElement;
+    private final InputTextElement podsElement;
+    private final HideableElement<ComboBox<String>> namespacesElement;
+    private final HideableElement<JPanel> replaceTableElement;
     private final ListTableModel<ReplacementEntity> replacementModel;
     private final MutableCollectionComboBoxModel<String> namespaceComboBoxModel;
 
     @Getter
     private final JPanel panel;
 
     public RunConfigurationPanelProvider() {
-        this.configmapsPanel = new InputTextPanel("Configmaps names:", "Separate names with semicolon: configmap1;configmap2");
-        this.secretsPanel = new InputTextPanel("Secrets names:", "Separate names with semicolon: secret1;secret2");
-        this.podsPanel = new InputTextPanel("Pod name prefix:", "E.g. you can use \"nginx\" instead of \"nginx-554b9c67f9-c5cv4\"");
+        this.configmapsElement = new InputTextElement("Configmaps names:", "Separate names with semicolon: configmap1;configmap2", new JBTextField());
+        this.secretsElement = new InputTextElement("Secrets names:", "Separate names with semicolon: secret1;secret2", new JBTextField());
+        this.podsElement = new InputTextElement("Pod name prefix:", "E.g. you can use \"nginx\" instead of \"nginx-554b9c67f9-c5cv4\"", new JBTextField());
         this.envModeComboBox = new ComboBox<>(EnvMode.beautyNames());
         this.envModeComboBox.addItemListener(e -> updatePanel());
         this.replacementModel = new ListTableModel<>(
@@ -57,6 +60,7 @@ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
                 updateNamespaceComboBoxModel();
             }
         });
+        this.namespacesElement = new HideableElement<>("Namespace:", namespaceComboBox);
         JBTable replacementEntityTable = new JBTable(replacementModel);
 
         ToolbarDecorator decorator = ToolbarDecorator
@@ -68,33 +72,36 @@ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
         JBLabel panelLabel = new JBLabel("Environment from Kubernetes");
         panelLabel.setFont(JBFont.regular().asBold());
 
+        this.replaceTableElement = new HideableElement<>("Replace:",
+                "You can use capture groups. E.g. (\\w*)(-dev) and $1-local replace \"env-dev\" to \"env-local\"",
+                decorator.createPanel());
+
         FormBuilder builder = FormBuilder.createFormBuilder()
                 .addSeparator()
                 .addComponent(panelLabel)
-                .addLabeledComponent(new JBLabel("Environment mode:"), envModeComboBox, 1, false)
-                .addLabeledComponent(new JBLabel("Namespace:"), namespaceComboBox, 1, false);
-        configmapsPanel.addToBuilder(builder);
-        secretsPanel.addToBuilder(builder);
-        podsPanel.addToBuilder(builder);
-        this.panel = builder
-                .addLabeledComponent("Replace:", decorator.createPanel(), 1, false)
-                .addTooltip("You can use capture groups. E.g. (\\w*)(-dev) and $1-local replace \"env-dev\" to \"env-local\"")
-                .addComponentFillVertically(new JPanel(), 0)
-                .getPanel();
+                .addLabeledComponent(new JBLabel("Environment mode:"), envModeComboBox, 1, false);
+        namespacesElement.addToBuilder(builder);
+        configmapsElement.addToBuilder(builder);
+        secretsElement.addToBuilder(builder);
+        podsElement.addToBuilder(builder);
+        replaceTableElement.addToBuilder(builder);
+
+        this.panel = builder.getPanel();
         updatePanel();
     }
 
     public PluginSettings getState() {
         EnvMode mode = EnvMode.values()[envModeComboBox.getSelectedIndex()];
         String namespace = trimToNull(namespaceComboBoxModel.getSelected());
-        List<String> configmapNames = splitIfNotEmpty(configmapsPanel.getText());
-        List<String> secretNames = splitIfNotEmpty(secretsPanel.getText());
-        String podName = trimToNull(podsPanel.getText());
+        List<String> configmapNames = splitIfNotEmpty(configmapsElement.getText());
+        List<String> secretNames = splitIfNotEmpty(secretsElement.getText());
+        String podName = trimToNull(podsElement.getText());
         List<ReplacementEntity> replacementEntities = emptyIfNull(replacementModel.getItems()).stream()
                 .filter(e -> e.getReplacement() != null && !e.getReplacement().isBlank())
                 .toList();
         return PluginSettings.builder()
                 .envMode(mode)
+                .enabled(mode != EnvMode.DISABLED)
                 .namespace(namespace)
                 .configmapNames(configmapNames)
                 .secretNames(secretNames)
@@ -104,13 +111,17 @@ public PluginSettings getState() {
     }
 
     public void setState(PluginSettings pluginSettings) {
-        String envModeName = pluginSettings.getEnvMode().getBeautyName();
+        EnvMode envMode = pluginSettings.getEnvMode();
+        String envModeName = envMode.getBeautyName();
+        envModeComboBox.setItem(envModeName);
+        if (envMode == EnvMode.DISABLED) {
+            return;
+        }
         updateNamespaceComboBoxModel();
         namespaceComboBoxModel.setSelectedItem(pluginSettings.getNamespace());
-        envModeComboBox.setItem(envModeName);
-        configmapsPanel.setText(joinIfNotNull(pluginSettings.getConfigmapNames()));
-        secretsPanel.setText(joinIfNotNull(pluginSettings.getSecretNames()));
-        podsPanel.setText(pluginSettings.getPodName());
+        configmapsElement.setText(joinIfNotNull(pluginSettings.getConfigmapNames()));
+        secretsElement.setText(joinIfNotNull(pluginSettings.getSecretNames()));
+        podsElement.setText(pluginSettings.getPodName());
         emptyIfNull(pluginSettings.getReplacementEntities()).forEach(replacementModel::addRow);
     }
 
@@ -122,17 +133,28 @@ private void updateNamespaceComboBoxModel() {
 
     private void updatePanel() {
         EnvMode mode = EnvMode.values()[envModeComboBox.getSelectedIndex()];
-        if (mode == EnvMode.CONFIGMAP_AND_SECRET) {
-            this.podsPanel.hide();
-            this.secretsPanel.show();
-            this.configmapsPanel.show();
+        if (mode == EnvMode.DISABLED) {
+            this.podsElement.hide();
+            this.secretsElement.hide();
+            this.configmapsElement.hide();
+            this.namespacesElement.hide();
+            this.replaceTableElement.hide();
             panel.repaint();
+            return;
         }
-        if (mode != EnvMode.CONFIGMAP_AND_SECRET) {
-            this.podsPanel.show();
-            this.secretsPanel.hide();
-            this.configmapsPanel.hide();
+        updateNamespaceComboBoxModel();
+        this.namespacesElement.show();
+        this.replaceTableElement.show();
+        if (mode == EnvMode.CONFIGMAP_AND_SECRET) {
+            this.podsElement.hide();
+            this.secretsElement.show();
+            this.configmapsElement.show();
             panel.repaint();
+            return;
         }
+        this.podsElement.show();
+        this.secretsElement.hide();
+        this.configmapsElement.hide();
+        panel.repaint();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+rootProject.name = "intellij-k8s-env-plugin"`