From 8e1b3338c6a8fc120cf3833161139a2ff02236c5 Mon Sep 17 00:00:00 2001
From: Sam Jewell <2903904+samjewell@users.noreply.github.com>
Date: Fri, 1 Aug 2025 08:55:57 +0100
Subject: [PATCH] TableNG: Improve AdHoc filter icons (#108968)

We removed the "Filter for/out value" tooltips when we reimplemented the Table panel. We don't want to reimplement these, so we're improving the icons instead, to look more like "Filter" and less like "Zoom in/out"
---
 packages/grafana-data/src/types/icon.ts                       | 2 ++
 .../src/components/Table/TableNG/Cells/TableCellActions.tsx   | 4 ++--
 public/app/core/icons/cached.json                             | 2 ++
 public/img/icons/unicons/filter-minus.svg                     | 1 +
 public/img/icons/unicons/filter-plus.svg                      | 1 +
 5 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 public/img/icons/unicons/filter-minus.svg
 create mode 100644 public/img/icons/unicons/filter-plus.svg

diff --git a/packages/grafana-data/src/types/icon.ts b/packages/grafana-data/src/types/icon.ts
index 0cb4a61a25b..34680fc07d1 100644
--- a/packages/grafana-data/src/types/icon.ts
+++ b/packages/grafana-data/src/types/icon.ts
@@ -120,6 +120,8 @@ export const availableIconsIndex = {
   'file-export': true,
   'file-landscape-alt': true,
   filter: true,
+  'filter-plus': true,
+  'filter-minus': true,
   flip: true,
   folder: true,
   font: true,
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/TableCellActions.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/TableCellActions.tsx
index c66ed4be81c..746ca7027d1 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/TableCellActions.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/TableCellActions.tsx
@@ -58,7 +58,7 @@ export function TableCellActions(props: TableCellActionsProps) {
       {showFilters && (
         <>
           <IconButton
-            name={'search-plus'}
+            name={'filter-plus'}
             aria-label={t('grafana-ui.table.cell-filter-on', 'Filter for value')}
             onClick={() => {
               onCellFilterAdded?.({
@@ -69,7 +69,7 @@ export function TableCellActions(props: TableCellActionsProps) {
             }}
           />
           <IconButton
-            name={'search-minus'}
+            name={'filter-minus'}
             aria-label={t('grafana-ui.table.cell-filter-out', 'Filter out value')}
             onClick={() => {
               onCellFilterAdded?.({
diff --git a/public/app/core/icons/cached.json b/public/app/core/icons/cached.json
index ce86bef4eae..810e2676755 100644
--- a/public/app/core/icons/cached.json
+++ b/public/app/core/icons/cached.json
@@ -74,6 +74,8 @@
   "unicons/file-alt",
   "unicons/file-blank",
   "unicons/filter",
+  "unicons/filter-plus",
+  "unicons/filter-minus",
   "unicons/folder",
   "unicons/folder-open",
   "unicons/folder-plus",
diff --git a/public/img/icons/unicons/filter-minus.svg b/public/img/icons/unicons/filter-minus.svg
new file mode 100644
index 00000000000..bf7dd01335b
--- /dev/null
+++ b/public/img/icons/unicons/filter-minus.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M19 2C19.7956 2 20.5585 2.3163 21.1211 2.87891C21.6837 3.44152 22 4.20435 22 5V6.16992C21.9876 6.5857 21.8888 6.99455 21.71 7.37012V7.42969C21.5687 7.75064 21.3687 8.04271 21.1201 8.29004L16.4102 13H14C13.8452 13 13.6921 13.0147 13.541 13.0381L18.5898 8H5.41016L10.71 13.29C10.8026 13.3835 10.876 13.4944 10.9258 13.6162C10.9755 13.738 11.0008 13.8684 11 14V19.3799L12.5322 18.6133C12.9769 18.8631 13.4809 19 14 19H15C14.9994 19.1846 14.9476 19.3654 14.8506 19.5225C14.7536 19.6795 14.615 19.8065 14.4502 19.8896L10.4502 21.8896C10.3109 21.961 10.1565 21.9991 10 22C9.81277 22.0006 9.62887 21.9482 9.46973 21.8496C9.32591 21.7596 9.20716 21.6348 9.125 21.4863C9.04276 21.3376 8.99966 21.1699 9 21V14.4102L2.83984 8.29004C2.59126 8.04271 2.39127 7.75063 2.25 7.42969V7.37012C2.08497 6.99159 1.99986 6.58286 2 6.16992V5C2 4.20435 2.3163 3.44152 2.87891 2.87891C3.44152 2.3163 4.20435 2 5 2H19ZM5 4C4.73478 4 4.48051 4.10543 4.29297 4.29297C4.10543 4.48051 4 4.73478 4 5V6H20V5C20 4.73478 19.8946 4.48051 19.707 4.29297C19.5195 4.10543 19.2652 4 19 4H5Z"/><path d="M22 15C22.2652 15 22.5195 15.1054 22.707 15.293C22.8946 15.4805 23 15.7348 23 16C23 16.2652 22.8946 16.5195 22.707 16.707C22.5195 16.8946 22.2652 17 22 17H14C13.7348 17 13.4805 16.8946 13.293 16.707C13.1054 16.5195 13 16.2652 13 16C13 15.7348 13.1054 15.4805 13.293 15.293C13.4805 15.1054 13.7348 15 14 15H22Z"/></svg>
diff --git a/public/img/icons/unicons/filter-plus.svg b/public/img/icons/unicons/filter-plus.svg
new file mode 100644
index 00000000000..f3180a757e0
--- /dev/null
+++ b/public/img/icons/unicons/filter-plus.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M19 2C19.7956 2 20.5585 2.3163 21.1211 2.87891C21.6837 3.44152 22 4.20435 22 5V6.16992C21.9876 6.5857 21.8888 6.99455 21.71 7.37012V7.42969C21.5687 7.75064 21.3687 8.04271 21.1201 8.29004L20.3154 9.09375C20.2543 9.01947 20.1897 8.94753 20.1211 8.87891C19.6871 8.4449 19.1335 8.15951 18.5381 8.05078L18.5898 8H5.41016L10.71 13.29C10.8026 13.3835 10.876 13.4944 10.9258 13.6162C10.9755 13.738 11.0008 13.8684 11 14V19.3799L13 18.3799V17.8242C13.3186 17.9371 13.6556 18 14 18H15V19C14.9994 19.1846 14.9476 19.3654 14.8506 19.5225C14.7536 19.6795 14.615 19.8065 14.4502 19.8896L10.4502 21.8896C10.3109 21.961 10.1565 21.9991 10 22C9.81277 22.0006 9.62887 21.9482 9.46973 21.8496C9.32591 21.7596 9.20716 21.6348 9.125 21.4863C9.04276 21.3376 8.99966 21.1699 9 21V14.4102L2.83984 8.29004C2.59126 8.04271 2.39127 7.75063 2.25 7.42969V7.37012C2.08497 6.99159 1.99986 6.58286 2 6.16992V5C2 4.20435 2.3163 3.44152 2.87891 2.87891C3.44152 2.3163 4.20435 2 5 2H19ZM5 4C4.73478 4 4.48051 4.10543 4.29297 4.29297C4.10543 4.48051 4 4.73478 4 5V6H20V5C20 4.73478 19.8946 4.48051 19.707 4.29297C19.5195 4.10543 19.2652 4 19 4H5Z"/><path d="M18 10C18.2652 10 18.5195 10.1054 18.707 10.293C18.8946 10.4805 19 10.7348 19 11V14H22C22.2652 14 22.5195 14.1054 22.707 14.293C22.8946 14.4805 23 14.7348 23 15C23 15.2652 22.8946 15.5195 22.707 15.707C22.5195 15.8946 22.2652 16 22 16H19V19C19 19.2652 18.8946 19.5195 18.707 19.707C18.5195 19.8946 18.2652 20 18 20C17.7348 20 17.4805 19.8946 17.293 19.707C17.1054 19.5195 17 19.2652 17 19V16H14C13.7348 16 13.4805 15.8946 13.293 15.707C13.1054 15.5195 13 15.2652 13 15C13 14.7348 13.1054 14.4805 13.293 14.293C13.4805 14.1054 13.7348 14 14 14H17V11C17 10.7348 17.1054 10.4805 17.293 10.293C17.4805 10.1054 17.7348 10 18 10Z"/></svg>