fix: keep auto-org enabled [IDE-1703] (#436)

fix: keep auto-org enabled

Also update the HTML button styles.

Author: rrama

CHANGELOG.md

@@ -4,6 +4,7 @@
 ### Changed
 - Added support for improved Settings UI for simpler configuration of Snyk settings (experimental).
 - Automatic organization configuration is now enabled by default.
+- Added support for risk score filtering (closed beta).
 - Bump LS protocol version to 22.
 
 ## [2.6.0]

Snyk.VisualStudio.Extension.2022/Settings/SnykGeneralOptionsDialogPage.cs

@@ -118,10 +118,13 @@ private async Task HandleSolutionOptionsConfigurationAsync()
             // Implement logic for organization
             // Use UI state instead of reading from database to get current user intent
             var isAutoMode = control.IsAutoOrganizationChecked;
-            var preferredOrganizationText = control.Organization;
+            var organizationText = control.Organization;
 
             await this.serviceProvider.SnykOptionsManager.SaveOrgSetByUserAsync(!isAutoMode);
-            await this.serviceProvider.SnykOptionsManager.SavePreferredOrgAsync(preferredOrganizationText);
+            if (!isAutoMode)
+                await this.serviceProvider.SnykOptionsManager.SavePreferredOrgAsync(organizationText);
+            else
+                await this.serviceProvider.SnykOptionsManager.SaveAutoDeterminedOrgAsync(organizationText);
             await this.UpdateFolderConfigForCurrentSolutionAsync();
         }
 

Snyk.VisualStudio.Extension.2022/UI/Html/BaseHtmlProvider.cs

@@ -62,7 +62,17 @@ public virtual string ReplaceCssVariables(string html)
             var editorBackground = backgroundColor;
             var editorForeground = textColor;
 
-            // Buttons - use command bar colors which are designed for interactive elements
+            // Primary buttons - use hyperlink color for a prominent blue appearance
+            var primaryButtonBackground = linkColor;
+            var primaryButtonForeground = "#FFFFFF";
+            var primaryButtonHoverBackground = AdjustBrightness(primaryButtonBackground, 1.15f);
+
+            // Secondary buttons - use input background for visible contrast with main background
+            var secondaryButtonBackground = inputBackground;
+            var secondaryButtonForeground = textColor;
+            var secondaryButtonHoverBackground = AdjustBrightness(secondaryButtonBackground, 1.15f);
+
+            // Legacy vscode- prefixed button variables (kept for compatibility)
             var buttonBackground = VSColorTheme.GetThemedColor(EnvironmentColors.CommandBarMenuBackgroundGradientBeginColorKey).ToHex();
             var buttonText = textColor;
             var buttonHoverBackground = VSColorTheme.GetThemedColor(EnvironmentColors.CommandBarMouseOverBackgroundBeginColorKey).ToHex();
@@ -97,19 +107,27 @@ public virtual string ReplaceCssVariables(string html)
                 { "vscode-errorForeground", errorForeground },
                 { "vscode-input-background", inputBackground },
                 { "vscode-editor-inactiveSelectionBackground", inactiveSelectionBackground },
-                { "vscode-button-background", buttonBackground },
-                { "vscode-button-foreground", buttonText },
-                { "vscode-button-hoverBackground", buttonHoverBackground },
-                { "vscode-button-secondaryBackground", ColorToRgba(buttonBackground, 0.6) },
-                { "vscode-button-secondaryForeground", buttonText },
-                { "vscode-button-secondaryHoverBackground", ColorToRgba(buttonHoverBackground, 0.7) },
                 { "vscode-list-hoverBackground", listHoverBackground },
                 { "vscode-input-border", inputBorder },
                 { "vscode-panel-border", borderColor },
                 { "vscode-focusBorder", linkColor },
                 { "vscode-scrollbarSlider-background", scrollbarThumb },
                 { "vscode-scrollbarSlider-hoverBackground", scrollbarThumbHover },
                 { "vscode-scrollbarSlider-activeBackground", scrollbarThumbHover },
+                // Button variables (vscode- prefix for legacy compatibility)
+                { "vscode-button-background", buttonBackground },
+                { "vscode-button-foreground", buttonText },
+                { "vscode-button-hoverBackground", buttonHoverBackground },
+                { "vscode-button-secondaryBackground", ColorToRgba(buttonBackground, 0.6) },
+                { "vscode-button-secondaryForeground", buttonText },
+                { "vscode-button-secondaryHoverBackground", ColorToRgba(buttonHoverBackground, 0.7) },
+                // Button variables (LS HTML uses these without vscode- prefix)
+                { "button-background-color", primaryButtonBackground },
+                { "button-foreground", primaryButtonForeground },
+                { "button-hover-background", primaryButtonHoverBackground },
+                { "button-secondary-background", secondaryButtonBackground },
+                { "button-secondary-foreground", secondaryButtonForeground },
+                { "button-secondary-hover-background", secondaryButtonHoverBackground },
                 // Legacy variables (for fallback HTML)
                 { "default-font", "'Segoe UI', Tahoma, Geneva, Verdana, sans-serif" },
                 { "text-color", textColor },
@@ -165,5 +183,37 @@ private string ColorToRgba(string hexColor, double alpha)
             int b = Convert.ToInt32(hexColor.Substring(4, 2), 16);
             return $"rgba({r}, {g}, {b}, {alpha:F2})";
         }
+
+        /// <summary>
+        /// Adjusts the brightness of a hex color by a given factor.
+        /// </summary>
+        /// <param name="hexColor">The hex color string (e.g., "#0e639c")</param>
+        /// <param name="factor">Brightness multiplier (> 1.0 for lighter, < 1.0 for darker)</param>
+        /// <returns>Adjusted hex color string</returns>
+        private string AdjustBrightness(string hexColor, float factor)
+        {
+            if (string.IsNullOrEmpty(hexColor) || !hexColor.StartsWith("#"))
+            {
+                return hexColor;
+            }
+
+            try
+            {
+                var hex = hexColor.Substring(1);
+                int r = Convert.ToInt32(hex.Substring(0, 2), 16);
+                int g = Convert.ToInt32(hex.Substring(2, 2), 16);
+                int b = Convert.ToInt32(hex.Substring(4, 2), 16);
+
+                r = Math.Min(255, Math.Max(0, (int)(r * factor)));
+                g = Math.Min(255, Math.Max(0, (int)(g * factor)));
+                b = Math.Min(255, Math.Max(0, (int)(b * factor)));
+
+                return $"#{r:X2}{g:X2}{b:X2}";
+            }
+            catch
+            {
+                return hexColor;
+            }
+        }
     }
 }