Merge branch 'develop' of github.com:devtron-labs/dashboard into refactor/remove-monaco

Author: RohitRaj011

.env

@@ -61,5 +61,7 @@ FEATURE_CLUSTER_MAP_ENABLE=true
 FEATURE_DEFAULT_LANDING_RB_ENABLE=false
 FEATURE_ACTION_AUDIOS_ENABLE=true
 FEATURE_APPLICATION_TEMPLATES_ENABLE=true
+FEATURE_CODE_MIRROR_ENABLE=true
 FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false
 GATEKEEPER_URL=https://license.devtron.ai/dashboard
+FEATURE_AI_INTEGRATION_ENABLE=false

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.12.0-pre-4",
+        "@devtron-labs/devtron-fe-common-lib": "1.12.0-pre-5",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/Pages/App/CreateAppModal/UpdateTemplateConfig.tsx

@@ -109,7 +109,7 @@ const UpdateTemplateConfig = ({
     return (
         <>
             <div className="divider__secondary--horizontal" />
-            <div className="br-8 border__secondary bg__primary p-20 pb-0-imp flexbox-col dc__gap-16">
+            <div className="br-8 border__secondary bg__primary p-20 flexbox-col dc__gap-16">
                 <h4 className="fs-14 fw-6 lh-20 cn-9 m-0">Code Source</h4>
                 <MaterialList
                     isCreateAppView

src/Shared/index.tsx

@@ -0,0 +1 @@
+export * from './utils'

src/Shared/utils.tsx

@@ -0,0 +1,20 @@
+import { AppType } from '@devtron-labs/devtron-fe-common-lib'
+
+const getAppTypeCategory = (appType: AppType) => {
+    switch (appType) {
+        case AppType.DEVTRON_APP:
+            return 'DA'
+        case AppType.DEVTRON_HELM_CHART:
+        case AppType.EXTERNAL_HELM_CHART:
+            return 'HA'
+        case AppType.EXTERNAL_ARGO_APP:
+            return 'ACD'
+        case AppType.EXTERNAL_FLUX_APP:
+            return 'FCD'
+        default:
+            return 'DA'
+    }
+}
+
+export const getAIAnalyticsEvents = (context: string, appType?: AppType) =>
+    `AI_${appType ? `${getAppTypeCategory(appType)}_` : ''}${context}`

src/components/ApplicationGroup/AppGroupAppFilter.tsx

@@ -53,10 +53,10 @@ export default function AppGroupAppFilter() {
         setSelectedFilterTab(_filterTab)
     }
 
-    const handleFilterGAEvent = (isItemClick?: boolean) => {
+    const handleFilterGAEvent = (filterType?: string) => {
         ReactGA.event({
             category: 'Group filter',
-            action: `${filterParentType} filter ${isItemClick ? 'item' : ''} clicked`,
+            action: `${filterParentType === FilterParentType.app ? 'DA_ENV' : 'AG_APP'}_FILTER${filterType ? `_${filterType}` : ''}_CLICKED`,
         })
     }
 
@@ -118,7 +118,7 @@ export default function AppGroupAppFilter() {
                 })
             }
         }
-        handleFilterGAEvent(true)
+        handleFilterGAEvent(selectedFilterTab === AppFilterTabs.APP_FILTER ? 'ITEM' : 'SAVED_ITEM')
     }
 
     const getPlaceHolder = (): string => {

src/components/ApplicationGroup/AppGroupDetailsRoute.tsx

@@ -40,6 +40,7 @@ import {
     ToastVariantType,
     URLS as CommonURLS,
     DeleteConfirmationModal,
+    useMainContext,
 } from '@devtron-labs/devtron-fe-common-lib'
 import ReactGA from 'react-ga4'
 import { MultiValue } from 'react-select'
@@ -98,6 +99,7 @@ export function useAppGroupAppFilterContext() {
 
 export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType) {
     const { path } = useRouteMatch()
+    const { setIntelligenceConfig } = useMainContext()
     const { envId } = useParams<{ envId: string }>()
     const [envName, setEnvName] = useState<string>('')
     const [showEmpty, setShowEmpty] = useState<boolean>(false)
@@ -160,6 +162,7 @@ export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType
             setAppListOptions([])
             setAppGroupListData(null)
             setDescription('')
+            setIntelligenceConfig(null)
         }
     }, [envId])
 

src/components/ClusterNodes/ClusterEvents.tsx

@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
 import { showError } from '@devtron-labs/devtron-fe-common-lib'
 import { MESSAGING_UI } from '../../config'
 import { EventsTable } from '../v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/EventsTable'
 import { PodEventsType } from '../v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/node.type'
 import MessageUI from '../v2/common/message.ui'
 import { getClusterEvents } from './clusterNodes.service'
 import { ClusterEventsType } from './types'
+import { getAIAnalyticsEvents } from 'src/Shared'
 
-export default function ClusterEvents({ terminalAccessId, reconnectStart }: ClusterEventsType) {
+export default function ClusterEvents({ terminalAccessId, reconnectStart, clusterId }: ClusterEventsType) {
     const [events, setEvents] = useState([])
     const [errorValue, setErrorValue] = useState<PodEventsType>()
     const [loading, setLoading] = useState<boolean>(true)
@@ -75,6 +76,13 @@ export default function ClusterEvents({ terminalAccessId, reconnectStart }: Clus
     return isResourceMissing ? (
         <MessageUI msg={MESSAGING_UI.NO_EVENTS} size={24} />
     ) : (
-        <EventsTable loading={loading} eventsList={events} errorValue={errorValue} reconnect={reconnectStart} />
+        <EventsTable
+            loading={loading}
+            eventsList={events}
+            errorValue={errorValue}
+            reconnect={reconnectStart}
+            clusterId={clusterId}
+            aiWidgetAnalyticsEvent={getAIAnalyticsEvents('RB_EVENT')}
+        />
     )
 }

src/components/ClusterNodes/ClusterTerminal.tsx

@@ -704,7 +704,11 @@ const ClusterTerminal = ({
             </div>
             {selectedTabIndex === 1 && (
                 <div className="flex-grow-1 flexbox-col dc__overflow-auto">
-                    <ClusterEvents terminalAccessId={terminalAccessIdRef.current} reconnectStart={reconnectStart} />
+                    <ClusterEvents
+                        terminalAccessId={terminalAccessIdRef.current}
+                        reconnectStart={reconnectStart}
+                        clusterId={clusterId}
+                    />
                 </div>
             )}
             {selectedTabIndex === 2 && (

src/components/ClusterNodes/types.ts

@@ -216,7 +216,7 @@ export interface ClusterImageList {
     imageList: ImageList[]
 }
 
-export interface ClusterEventsType {
+export interface ClusterEventsType extends Pick<ClusterTerminalType, 'clusterId'> {
     terminalAccessId: number
     reconnectStart?: () => void
 }