From 34ab61d1dfe5f25bf182ece951bf78287d353550 Mon Sep 17 00:00:00 2001
From: Miranda Fluharty <mfluharty@gitlab.com>
Date: Tue, 21 Oct 2025 13:07:25 -0600
Subject: [PATCH 1/2] Add security attribute filters to search

Add security_attribute_inventory_filters feature flag
Query for categories and attributes in search bar
Map categories to tokens with attributes as options
Add a header token to show if any category matches
Push tokens into array if the feature flag is enabled
---
 ...nventory_dashboard_filtered_search_bar.vue | 49 ++++++++++++++++++-
 .../groups/security/inventory_controller.rb   |  1 +
 .../security_attribute_inventory_filters.yml  | 10 ++++
 3 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 ee/config/feature_flags/wip/security_attribute_inventory_filters.yml

diff --git a/ee/app/assets/javascripts/security_inventory/components/inventory_dashboard_filtered_search_bar.vue b/ee/app/assets/javascripts/security_inventory/components/inventory_dashboard_filtered_search_bar.vue
index 5cc72d9d46aba8..cc0abef3ef2f4f 100644
--- a/ee/app/assets/javascripts/security_inventory/components/inventory_dashboard_filtered_search_bar.vue
+++ b/ee/app/assets/javascripts/security_inventory/components/inventory_dashboard_filtered_search_bar.vue
@@ -1,9 +1,15 @@
 <script>
+import { s__ } from '~/locale';
 import FilteredSearch from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';
-import { FILTERED_SEARCH_TERM } from '~/vue_shared/components/filtered_search_bar/constants';
+import {
+  FILTERED_SEARCH_TERM,
+  OPERATORS_IS,
+} from '~/vue_shared/components/filtered_search_bar/constants';
 import { queryToObject } from '~/lib/utils/url_utility';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { CRITICAL, HIGH, MEDIUM, LOW, INFO, UNKNOWN } from 'ee/vulnerabilities/constants';
+import BaseToken from '~/vue_shared/components/filtered_search_bar/tokens/base_token.vue';
+import getSecurityCategoriesAndAttributes from 'ee/security_configuration/graphql/group_security_categories_and_attributes.query.graphql';
 import {
   DEPENDENCY_SCANNING_KEY,
   SAST_KEY,
@@ -40,12 +46,51 @@ export default {
     return {
       initialSortBy: 'updated_at_desc',
       filterParams: {},
+      group: { securityCategories: [] },
     };
   },
+  apollo: {
+    group: {
+      query: getSecurityCategoriesAndAttributes,
+      variables() {
+        return {
+          fullPath: this.namespace,
+        };
+      },
+    },
+  },
   computed: {
+    mappedAttributeTokens() {
+      return (
+        this.group?.securityCategories?.map((category) => ({
+          type: category.name,
+          title: category.name,
+          token: BaseToken,
+          unique: true,
+          operators: OPERATORS_IS,
+          options: category.securityAttributes.map((attribute) => ({
+            title: attribute.name,
+            value: attribute.id,
+          })),
+        })) || []
+      );
+    },
+    groupHeaderToken() {
+      return {
+        type: 'gl-filtered-search-suggestion-group-attributes',
+        title: s__('SecurityAttributes|Security attributes'),
+        match: ({ query, defaultMatcher }) =>
+          this.mappedAttributeTokens.some((token) => defaultMatcher(token.title, query)),
+      };
+    },
     searchTokens() {
+      const tokens = [];
       if (this.glFeatures.securityInventoryFiltering) {
-        return [...vulnerabilityCountTokens, ...toolCoverageTokens];
+        if (this.glFeatures.securityAttributeInventoryFilters) {
+          tokens.push(this.groupHeaderToken, ...this.mappedAttributeTokens);
+        }
+        tokens.push(...vulnerabilityCountTokens, ...toolCoverageTokens);
+        return tokens;
       }
       return [];
     },
diff --git a/ee/app/controllers/groups/security/inventory_controller.rb b/ee/app/controllers/groups/security/inventory_controller.rb
index ea49c38a7ba971..a791baef808c8b 100644
--- a/ee/app/controllers/groups/security/inventory_controller.rb
+++ b/ee/app/controllers/groups/security/inventory_controller.rb
@@ -10,6 +10,7 @@ class InventoryController < Groups::ApplicationController
       before_action do
         push_frontend_feature_flag(:security_context_labels, @group.root_ancestor)
         push_frontend_feature_flag(:security_inventory_filtering, @group.root_ancestor)
+        push_frontend_feature_flag(:security_attribute_inventory_filters, @group.root_ancestor)
       end
 
       feature_category :security_asset_inventories
diff --git a/ee/config/feature_flags/wip/security_attribute_inventory_filters.yml b/ee/config/feature_flags/wip/security_attribute_inventory_filters.yml
new file mode 100644
index 00000000000000..7ea712eeff663f
--- /dev/null
+++ b/ee/config/feature_flags/wip/security_attribute_inventory_filters.yml
@@ -0,0 +1,10 @@
+---
+name: security_attribute_inventory_filters
+description:
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/550497
+introduced_by_url:
+rollout_issue_url:
+milestone: '18.6'
+group: group::security platform management
+type: wip
+default_enabled: false
-- 
GitLab


From e2aa99b6fdd89b6db62e883560feaeaeea3a721d Mon Sep 17 00:00:00 2001
From: Miranda Fluharty <mfluharty@gitlab.com>
Date: Tue, 21 Oct 2025 20:55:13 +0100
Subject: [PATCH 2/2] Apply 1 suggestion(s) to 1 file(s)

Co-authored-by: DANGER_GITLAB_API_TOKEN <project_278964_bot_d10f7ffdb05c889168416678645d29bb@noreply.gitlab.com>
---
 .../feature_flags/wip/security_attribute_inventory_filters.yml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ee/config/feature_flags/wip/security_attribute_inventory_filters.yml b/ee/config/feature_flags/wip/security_attribute_inventory_filters.yml
index 7ea712eeff663f..483285948ff27c 100644
--- a/ee/config/feature_flags/wip/security_attribute_inventory_filters.yml
+++ b/ee/config/feature_flags/wip/security_attribute_inventory_filters.yml
@@ -2,7 +2,7 @@
 name: security_attribute_inventory_filters
 description:
 feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/550497
-introduced_by_url:
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/209690
 rollout_issue_url:
 milestone: '18.6'
 group: group::security platform management
-- 
GitLab