From 99c7cd60e62f8d68842e89cdbace16642a33dc3c Mon Sep 17 00:00:00 2001
From: Matias Chomicki <matias.chomicki@grafana.com>
Date: Fri, 8 Aug 2025 10:45:05 +0200
Subject: [PATCH] LogLineMenu: improve options and dividers (#109191)

---
 .../logs/components/panel/LogLineMenu.tsx     | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/public/app/features/logs/components/panel/LogLineMenu.tsx b/public/app/features/logs/components/panel/LogLineMenu.tsx
index 49b55b368d1..e2ab764e3d9 100644
--- a/public/app/features/logs/components/panel/LogLineMenu.tsx
+++ b/public/app/features/logs/components/panel/LogLineMenu.tsx
@@ -83,6 +83,8 @@ export const LogLineMenu = ({ log, styles }: Props) => {
     }
   }, [log, onPinLine, onUnpinLine, pinned]);
 
+  const showFirstDivider = enableLogDetails || shouldlogSupportsContext || onPinLine || onUnpinLine;
+
   const menu = useCallback(
     () => (
       <Menu ref={menuRef}>
@@ -105,18 +107,11 @@ export const LogLineMenu = ({ log, styles }: Props) => {
         {pinned && onUnpinLine && (
           <Menu.Item onClick={togglePinning} label={t('logs.log-line-menu.unpin-from-outline', 'Unpin log')} />
         )}
-        <Menu.Divider />
+        {showFirstDivider && <Menu.Divider />}
         <Menu.Item onClick={copyLogLine} label={t('logs.log-line-menu.copy-log', 'Copy log line')} />
         {onPermalinkClick && log.rowId !== undefined && log.uid && (
           <Menu.Item onClick={copyLinkToLogLine} label={t('logs.log-line-menu.copy-link', 'Copy link to log line')} />
         )}
-        {isAssistantAvailable && (
-          <Menu.Item
-            onClick={() => openAssistantByLog?.(log)}
-            icon="ai-sparkle"
-            label={t('logs.log-line-menu.open-assistant', 'Explain this log line in Assistant')}
-          />
-        )}
         {logLineMenuCustomItems.map((item, i) => {
           if (isDivider(item)) {
             return <Menu.Divider key={i} />;
@@ -126,23 +121,34 @@ export const LogLineMenu = ({ log, styles }: Props) => {
           }
           return null;
         })}
+        {isAssistantAvailable && (
+          <>
+            <Menu.Divider />
+            <Menu.Item
+              onClick={() => openAssistantByLog?.(log)}
+              icon="ai-sparkle"
+              label={t('logs.log-line-menu.open-assistant', 'Explain this log line in Assistant')}
+            />
+          </>
+        )}
       </Menu>
     ),
     [
-      copyLinkToLogLine,
-      copyLogLine,
-      detailsDisplayed,
       enableLogDetails,
+      toggleLogDetails,
+      detailsDisplayed,
       log,
-      logLineMenuCustomItems,
-      onPermalinkClick,
-      onPinLine,
-      onUnpinLine,
-      pinned,
       shouldlogSupportsContext,
       showContext,
-      toggleLogDetails,
+      pinned,
+      onPinLine,
       togglePinning,
+      onUnpinLine,
+      showFirstDivider,
+      copyLogLine,
+      onPermalinkClick,
+      copyLinkToLogLine,
+      logLineMenuCustomItems,
       isAssistantAvailable,
       openAssistantByLog,
     ]