From 61340d957324ff45b45d9795847c561101369bd2 Mon Sep 17 00:00:00 2001
From: Ivan Shershnev <ivan.shershnev@jetbrains.com>
Date: Thu, 17 Jul 2025 15:24:02 +0200
Subject: [PATCH] [DBE] Improve Local Filter Icons in grid

GitOrigin-RevId: 5aaf22f070304d12c4a8f9fa68e87073644c74ea
---
 grid/core-impl/gen/icons/GridCoreImplIcons.java       |  1 +
 grid/core-impl/resources/icons/expui/clearOutputs.svg |  5 +++++
 .../resources/icons/expui/clearOutputs_dark.svg       |  5 +++++
 grid/impl/resources/intellij.grid.impl.xml            | 11 +++++++----
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 grid/core-impl/resources/icons/expui/clearOutputs.svg
 create mode 100644 grid/core-impl/resources/icons/expui/clearOutputs_dark.svg

diff --git a/grid/core-impl/gen/icons/GridCoreImplIcons.java b/grid/core-impl/gen/icons/GridCoreImplIcons.java
index 39364a7be47f..fab137206b84 100644
--- a/grid/core-impl/gen/icons/GridCoreImplIcons.java
+++ b/grid/core-impl/gen/icons/GridCoreImplIcons.java
@@ -18,6 +18,7 @@ public final class GridCoreImplIcons {
     return IconManager.getInstance().loadRasterizedIcon(path, expUIPath, GridCoreImplIcons.class.getClassLoader(), cacheKey, flags);
   }
   /** 16x16 */ public static final @NotNull Icon CellDownload = load("icons/cellDownload.svg", 18297100, 2);
+  /** 16x16 */ public static final @NotNull Icon ClearOutputs = load("icons/expui/clearOutputs.svg", -737519268, 2);
   /** 16x16 */ public static final @NotNull Icon ColumnFilter = load("icons/expui/columnFilter.svg", "icons/columnFilter.svg", -1426207601, 0);
   /** 16x16 */ public static final @NotNull Icon FilterHistory = load("icons/expui/filterHistory.svg", "icons/filterHistory.svg", 686246081, 0);
   /** 16x16 */ public static final @NotNull Icon SingleRecordView = load("icons/expui/singleRecordView.svg", "icons/singleRecordView.svg", 502511093, 2);
diff --git a/grid/core-impl/resources/icons/expui/clearOutputs.svg b/grid/core-impl/resources/icons/expui/clearOutputs.svg
new file mode 100644
index 000000000000..92d701fa3ce2
--- /dev/null
+++ b/grid/core-impl/resources/icons/expui/clearOutputs.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.85762 7.06473L8.93527 10.1424L7.63107 14.4897C4.33497 14.3053 1.69472 11.665 1.51029 8.36893L5.85762 7.06473Z" stroke="#6C707E"/>
+<path d="M14.5 1.5L10 6" stroke="#6C707E" stroke-linecap="round"/>
+<path d="M6.85742 6.35742L6.96289 6.25195C7.73307 5.48178 8.98178 5.48178 9.75195 6.25195V6.25195C10.5221 7.02213 10.5221 8.27084 9.75195 9.04102L9.64648 9.14648" stroke="#6C707E"/>
+</svg>
diff --git a/grid/core-impl/resources/icons/expui/clearOutputs_dark.svg b/grid/core-impl/resources/icons/expui/clearOutputs_dark.svg
new file mode 100644
index 000000000000..35ba565777d4
--- /dev/null
+++ b/grid/core-impl/resources/icons/expui/clearOutputs_dark.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.85762 7.06473L8.93527 10.1424L7.63107 14.4897C4.33497 14.3053 1.69472 11.665 1.51029 8.36893L5.85762 7.06473Z" stroke="#CED0D6"/>
+<path d="M14.5 1.5L10 6" stroke="#CED0D6" stroke-linecap="round"/>
+<path d="M6.85742 6.35742L6.96289 6.25195C7.73307 5.48178 8.98178 5.48178 9.75195 6.25195V6.25195C10.5221 7.02213 10.5221 8.27084 9.75195 9.04102L9.64648 9.14648" stroke="#CED0D6"/>
+</svg>
diff --git a/grid/impl/resources/intellij.grid.impl.xml b/grid/impl/resources/intellij.grid.impl.xml
index 0d85196e96c0..b2846511e181 100644
--- a/grid/impl/resources/intellij.grid.impl.xml
+++ b/grid/impl/resources/intellij.grid.impl.xml
@@ -327,8 +327,13 @@
       <reference ref="Console.TableResult.Group.Common"/>
       <action id="Console.TableResult.FindInGrid" class="com.intellij.database.run.actions.FindInGridAction"
               icon="AllIcons.Actions.Find"  use-shortcut-of="Find"/>
-      <action id="Console.TableResult.ColumnLocalFilterToggle" class="com.intellij.database.run.actions.ColumnLocalFilterToggleAction"
-              icon="com.intellij.grid.core.impl.icons.GridCoreImplIcons.ColumnFilter" />
+      <group id="Console.TableResult.ColumnLocalFilterGroup" icon="com.intellij.grid.core.impl.icons.GridCoreImplIcons.ColumnFilter" popup="true">
+        <action id="Console.TableResult.ColumnLocalFilterToggle" class="com.intellij.database.run.actions.ColumnLocalFilterToggleAction"/>
+        <separator/>
+        <action id="Console.TableResult.ColumnLocalFilterClearAll"
+                class="com.intellij.database.run.actions.ColumnLocalFilterClearAllAction"
+                icon="com.intellij.grid.core.impl.icons.GridCoreImplIcons.ClearOutputs"/>
+      </group>
       <action id="Console.TableResult.ToggleRecordView" class="com.intellij.database.actions.ToggleEditMaximizedViewAction"
               icon="com.intellij.grid.core.impl.icons.GridCoreImplIcons.SingleRecordView"/>
       <group id="TableViewColoringGroup" icon="com.intellij.grid.core.impl.icons.GridCoreImplIcons.TableHeatmap" popup="true">
@@ -421,7 +426,5 @@
     <action id="Console.TableResult.ColumnLocalFilterWithCell"
             class="com.intellij.database.run.actions.ColumnLocalFilterWithCellAction"/>
     <group id="Console.TableResult.AggregatorViewGroup"/>
-    <action id="Console.TableResult.ColumnLocalFilterClearAll"
-            class="com.intellij.database.run.actions.ColumnLocalFilterClearAllAction"/>
   </actions>
 </idea-plugin>