chore: prepare for CCI ui FeatureFlag to always be true (#678)

Author: nick-y-snyk

package.json

@@ -169,6 +169,29 @@
             "description": "Severity issues to display.",
             "scope": "window"
           },
+          "snyk.issueViewOptions": {
+            "order": 6,
+            "type": "object",
+            "default": {
+              "openIssues": true,
+              "ignoredIssues": false
+            },
+            "properties": {
+              "openIssues": {
+                "type": "boolean",
+                "description": "Open Issues",
+                "default": true
+              },
+              "ignoredIssues": {
+                "type": "boolean",
+                "description": "Ignored Issues",
+                "default": false
+              }
+            },
+            "additionalProperties": false,
+            "markdownDescription": "[Code Consistent Ignores](https://docs.snyk.io/manage-risk/prioritize-issues-for-fixing/ignore-issues/consistent-ignores-for-snyk-code) is a feature which provides consistent handling of \"ignore\" rules for code security findings across all surfaces - such as the CLI, IDE, and Snyk UI\n\nShow the following issues:",
+            "scope": "window"
+          },
           "snyk.allIssuesVsNetNewIssues": {
             "type": "string",
             "default": "All issues",
@@ -181,13 +204,13 @@
               "Shows all issues that have been identified, including both new and existing issues.",
               "Shows only new issues filtering out previously known issues in a base branch"
             ],
-            "order": 6
+            "order": 7
           },
           "snyk.advanced.additionalParameters": {
             "type": "string",
             "description": "Parameters to pass to Snyk CLI for Open Source security tests.",
             "scope": "window",
-            "order": 7
+            "order": 8
           }
         }
       },
@@ -233,45 +256,22 @@
         "title": "Experimental",
         "order": 4,
         "properties": {
-          "snyk.issueViewOptions": {
-            "order": 1,
-            "type": "object",
-            "default": {
-              "openIssues": true,
-              "ignoredIssues": false
-            },
-            "properties": {
-              "openIssues": {
-                "type": "boolean",
-                "description": "Open Issues",
-                "default": true
-              },
-              "ignoredIssues": {
-                "type": "boolean",
-                "description": "Ignored Issues",
-                "default": false
-              }
-            },
-            "additionalProperties": false,
-            "markdownDescription": "Ignored issues are currently an experimental feature. Please reach out to [support.snyk.io](https://support.snyk.io) for more details.\n\nShow the following issues:",
-            "scope": "window"
-          },
           "snyk.folderConfigs": {
-            "order": 2,
+            "order": 1,
             "type": "array",
             "default": [],
             "description": "Folder configuration for Snyk scans."
           },
           "snyk.securityAtInception.autoConfigureSnykMcpServer": {
-            "order": 3,
+            "order": 2,
             "type": "boolean",
             "description": "Configure Snyk MCP server",
             "default": false,
             "markdownDescription": "Configure Snyk MCP server",
             "scope": "window"
           },
           "snyk.securityAtInception.executionFrequency": {
-            "order": 4,
+            "order": 3,
             "type": "string",
             "description": "Choose when Snyk should scan and initiate fixes for your AI-generated code",
             "default": "Manual",
@@ -289,7 +289,7 @@
             "scope": "window"
           },
           "snyk.features.preview": {
-            "order": 5,
+            "order": 4,
             "type": "object",
             "default": {},
             "title": "Preview feature toggles",

src/snyk/snykCode/views/issueTreeProvider.ts

@@ -160,6 +160,9 @@ export class IssueTreeProvider extends ProductIssueTreeProvider<CodeIssueData> {
       if (totalIssueCount === 0) {
         return analysisMessages.congratsNoIssuesFound;
       } else {
+        if (ignoredIssueCount === 0) {
+          return `✋ ${openIssuesText}`;
+        }
         return `✋ ${openIssuesText} & ${ignoredIssuesText}`;
       }
     }

src/test/integration/securityIssueTreeProvider.test.ts

@@ -136,8 +136,8 @@ suite('Code Security Issue Tree Provider', () => {
       name: 'getRootChildren returns correctly when viewing open & ignored and have two open issues one fixable with CCI enabled',
       consistentIgnores: true,
       issueViewOptions: { openIssues: true, ignoredIssues: true },
-      issues: [makeMockCodeIssue(), makeMockCodeIssue({ additionalData: { hasAIFix: true } })],
-      expectedNodeLabels: ['✋ 2 open issues & 0 ignored issues', '⚡️ 1 open issue is fixable by Snyk Agent Fix.'],
+      issues: [makeMockCodeIssue({ isIgnored: true }), makeMockCodeIssue({ additionalData: { hasAIFix: true } })],
+      expectedNodeLabels: ['✋ 1 open issue & 1 ignored issue', '⚡️ 1 open issue is fixable by Snyk Agent Fix.'],
     },
     {
       name: 'getRootChildren returns correctly when viewing only open and have none with CCI enabled',