Merge pull request #1469 from devtron-labs/fix/log-analyser-default-opt

fix: change default opt

Author: ritvikmahajan17

src/components/ResourceBrowser/ResourceList/ResourceList.tsx

@@ -551,7 +551,7 @@ export default function ResourceList() {
                         replace({
                             pathname: `${URLS.RESOURCE_BROWSER}/${_clusterId}/${
                                 namespace || ALL_NAMESPACE_OPTION.value
-                            }/${SIDEBAR_KEYS.overviewGVK.Kind.toLowerCase()}/${K8S_EMPTY_GROUP}${searchParam}`,
+                            }/${SIDEBAR_KEYS.nodeGVK.Kind.toLowerCase()}/${K8S_EMPTY_GROUP}${searchParam}`,
                         })
                     }
                     setSelectedResource({

src/components/v2/appDetails/k8Resource/NodeTreeTabList.tsx

@@ -9,6 +9,7 @@ import { ReactComponent as Cross } from '../../../../assets/icons/ic-close.svg'
 import Tippy from '@tippyjs/react'
 import { ConditionalWrap } from '../../../common'
 import './NodeTreeTabList.scss'
+import ReactGA from 'react-ga4'
 
 export default function NodeTreeTabList({ logSearchTerms, setLogSearchTerms, tabRef }: NodeTreeTabListProps) {
     const { nodeType } = useParams<{ nodeType: string }>()
@@ -45,6 +46,16 @@ export default function NodeTreeTabList({ logSearchTerms, setLogSearchTerms, tab
         }, 1)
     }
 
+    const sendLogAnalyserEvent = (tab: ApplicationObject) => {
+        if (tab.name === AppDetailsTabs.log_analyzer) {
+            ReactGA.event({
+                category: 'log analyser',
+                action: 'log-analyser-clicked',
+                label: '',
+            })
+        }
+    }
+
     const getTabNavLink = (tab: ApplicationObject) => {
         return (
             <NavLink
@@ -53,6 +64,7 @@ export default function NodeTreeTabList({ logSearchTerms, setLogSearchTerms, tab
                 className="resource-tree__tab-hover tab-list__tab resource-tab__node cursor cn-9 fw-6 dc__no-decor m-0-imp"
             >
                 <div
+                    onClick={() => sendLogAnalyserEvent(tab)}
                     className={`flex left ${tab.isSelected ? 'cn-9' : ''} ${
                         tab.isDeleted ? 'tab-list__deleted cr-5' : ''
                     }`}
@@ -104,7 +116,12 @@ export default function NodeTreeTabList({ logSearchTerms, setLogSearchTerms, tab
                                 }
                                 wrap={(children) => {
                                     return (
-                                        <Tippy className="default-tt dc_max-width__max-content" arrow={false} placement="top" content={tab.title}>
+                                        <Tippy
+                                            className="default-tt dc_max-width__max-content"
+                                            arrow={false}
+                                            placement="top"
+                                            content={tab.title}
+                                        >
                                             {children}
                                         </Tippy>
                                     )

src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Logs.component.tsx

@@ -10,7 +10,7 @@ import { getLogsURL } from '../nodeDetail.api'
 import IndexStore from '../../../index.store'
 import WebWorker from '../../../../../app/WebWorker'
 import sseWorker from '../../../../../app/grepSSEworker'
-import { Checkbox, CHECKBOX_VALUE, Host} from '@devtron-labs/devtron-fe-common-lib';
+import { Checkbox, CHECKBOX_VALUE, Host } from '@devtron-labs/devtron-fe-common-lib'
 import { Subject } from '../../../../../../util/Subject'
 import LogViewerComponent from './LogViewer.component'
 import { useKeyDown } from '../../../../../common'
@@ -33,6 +33,7 @@ import {
     getSelectedPodList,
 } from '../nodeDetail.util'
 import './nodeDetailTab.scss'
+import ReactGA from 'react-ga4'
 
 const subject: Subject<string> = new Subject()
 const commandLineParser = require('command-line-parser')
@@ -77,6 +78,14 @@ function LogsComponent({
     }
 
     const handlePodSelection = (selectedOption: string) => {
+        if (selectedOption.startsWith('All ')) {
+            ReactGA.event({
+                category: 'log analyser',
+                action: 'all-pods-selected',
+                label: '',
+            })
+        }
+
         const pods = getSelectedPodList(selectedOption)
         const containers = new Set(pods[0].containers ?? [])
         const selectedContainer = containers.has(logState.selectedContainerOption)
@@ -146,7 +155,11 @@ function LogsComponent({
             subject.publish(log)
             if (prevContainer) {
                 for (const _co of podContainerOptions.containerOptions) {
-                    if ( _co.selected && log.toString() === `previous terminated container "${_co.name}" in pod "${podContainerOptions.podOptions[0].name}" not found`) {
+                    if (
+                        _co.selected &&
+                        log.toString() ===
+                            `previous terminated container "${_co.name}" in pod "${podContainerOptions.podOptions[0].name}" not found`
+                    ) {
                         setNoPrevContainer(log.toString())
                     }
                 }
@@ -410,10 +423,11 @@ function LogsComponent({
                                             <Select
                                                 placeholder="Select Pod"
                                                 options={getPodGroups()}
-                                                defaultValue={getFirstOrNull(
-                                                    podContainerOptions.podOptions
-                                                        .filter((_pod) => _pod.selected)
-                                                        .map((_pod) => ({ label: _pod.name, value: _pod.name })),
+                                                defaultValue={getFirstOrNull<{ label: string; value: string }>(
+                                                    podContainerOptions.podOptions.map((_pod) => ({
+                                                        label: _pod.name,
+                                                        value: _pod.name,
+                                                    })),
                                                 )}
                                                 onChange={(selected) => handlePodSelection(selected.value)}
                                                 styles={{

src/components/v2/appDetails/k8Resource/nodeDetail/nodeDetail.util.ts

@@ -221,11 +221,16 @@ export function getInitialPodContainerSelection(
     }
 }
 
-export function getFirstOrNull<T>(arr: T[]): T | null {
-    if (arr.length > 0) {
-        return arr[0]
+export function getFirstOrNull<T extends {label:string}>(arr: T[]): T | null {
+
+    if(arr.length === 0){
+        return null
     }
-    return null
+    // remove all pods in 'ALL PODS FOR' category, to get only 'INDIVIDUAL PODS' list
+    const indvPodsList: T[] = arr.filter((_pod) => !_pod.label.startsWith('All '))
+
+    // select first pod from the 'INDIVIDUAL PODS' list
+    return indvPodsList.length > 0 ? indvPodsList[0] : null
 }
 
 export const getContainerSelectStyles = () => {