Merge branch 'develop' of github.com:devtron-labs/dashboard into feat/app-details-chat

Author: Elessar1802

.env

@@ -72,3 +72,4 @@ LOGIN_PAGE_IMAGE=
 FEATURE_ASK_DEVTRON_EXPERT=false
 FEATURE_MANAGE_TRAFFIC_ENABLE=false
 FEATURE_REDFISH_NODE_ENABLE=false
+FEATURE_INFRA_PROVISION_INFO_BLOCK_HIDE=false

.eslintignore

@@ -88,7 +88,6 @@ src/components/app/details/appDetails/utils.tsx
 src/components/app/details/cIDetails/CIDetails.tsx
 src/components/app/details/cIDetails/cIDetails.util.tsx
 src/components/app/details/cdDetails/CDDetails.tsx
-src/components/app/details/cdDetails/service.ts
 src/components/app/details/cicdHistory/History.components.tsx
 src/components/app/details/main.tsx
 src/components/app/details/metrics/BenchmarkModal.tsx

package.json

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

src/Pages/GlobalConfigurations/ClustersAndEnvironments/CreateCluster/CreateCluster.component.tsx

@@ -28,8 +28,9 @@ const CreateClusterForm = importComponentFromFELibrary(
     'CreateClusterForm',
     () => (
         <EnterpriseTrialDialog
-            featureTitle="EKS Cluster"
-            featureDescription="With Devtron, you can effortlessly create an Amazon EKS cluster."
+            featureTitle="Create Kubernetes Cluster"
+            featureDescription="Use Devtron to easily create Kubernetes clusters on popular cloud providers. Simplify cluster
+                provisioning and management with a guided, user-friendly interface."
         />
     ),
     'function',
@@ -74,7 +75,7 @@ const CreateCluster = ({ handleReloadClusterList, handleRedirectOnModalClose }:
                         FooterComponent={FooterComponent}
                     />
                 )
-            case CreateClusterTypeEnum.CREATE_EKS_CLUSTER:
+            case CreateClusterTypeEnum.CREATE_CLUSTER:
                 return (
                     <CreateClusterForm
                         apiCallInProgress={apiCallInProgress}

src/Pages/GlobalConfigurations/ClustersAndEnvironments/CreateCluster/constants.tsx

@@ -12,18 +12,15 @@ export const SIDEBAR_CONFIG: SidebarConfigType = {
             </p>
         ),
     },
-    [CreateClusterTypeEnum.CREATE_EKS_CLUSTER]: {
-        title: 'Create EKS Cluster',
-        iconName: 'ic-cluster',
-        dataTestId: 'create-eks-cluster-tab',
+    [CreateClusterTypeEnum.CREATE_CLUSTER]: {
+        title: 'Create Kubernetes Cluster',
+        iconName: 'ic-new',
+        dataTestId: 'create-cluster-tab',
         body: (
-            <>
-                <p className="m-0">With Devtron, you can effortlessly create an Amazon EKS cluster.</p>
-                <p className="m-0">
-                    Amazon Elastic Kubernetes Service (Amazon EKS) is a fully managed Kubernetes service that enables
-                    you to run Kubernetes seamlessly in both AWS Cloud and on-premises data centers.
-                </p>
-            </>
+            <p className="m-0">
+                Use Devtron to easily create Kubernetes clusters on popular cloud providers. Simplify cluster
+                provisioning and management with a guided, user-friendly interface.
+            </p>
         ),
         isEnterprise: true,
     },

src/Pages/GlobalConfigurations/ClustersAndEnvironments/CreateCluster/types.ts

@@ -2,7 +2,7 @@ import { IconName } from '@devtron-labs/devtron-fe-common-lib'
 
 export enum CreateClusterTypeEnum {
     CONNECT_CLUSTER = 'connect-cluster',
-    CREATE_EKS_CLUSTER = 'create-eks-cluster',
+    CREATE_CLUSTER = 'create-cluster',
     ADD_ISOLATED_CLUSTER = 'add-isolated-cluster',
 }
 

src/assets/icons/ic-world.svg

@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-import { ResponseType } from '@devtron-labs/devtron-fe-common-lib'
-
-import { ModuleConfigResponse } from '../../../../app/details/appDetails/appDetails.type'
+import { ModuleConfigResponse, ResponseType } from '@devtron-labs/devtron-fe-common-lib'
 
 export async function mockCDList(): Promise<ResponseType> {
     const response = {

src/components/ApplicationGroup/Details/EnvCDDetails/__mock__/EnvCDDetails.mock.ts

@@ -49,6 +49,7 @@ import {
     FloatingVariablesSuggestions,
     TriggerType,
     DeleteCINodeButton,
+    handleAnalyticsEvent,
 } from '@devtron-labs/devtron-fe-common-lib'
 import Tippy from '@tippyjs/react'
 import {
@@ -541,6 +542,11 @@ export default function CIPipeline({
         handleClose()
     }
 
+    const handleAdvancedOptions = () => {
+        setIsAdvanced(true)
+        handleAnalyticsEvent({category: 'CI Pipeline', action: 'DA_BUILD_ADVANCED'})
+    }
+
     const renderSecondaryButton = () => {
         if (ciPipelineId) {
             const canDeletePipeline = connectCDPipelines === 0 && ciPipeline.linkedCount === 0
@@ -582,9 +588,7 @@ export default function CIPipeline({
                     type="button"
                     data-testid="create-build-pipeline-advanced-options-button"
                     className="cta cta--workflow cancel mr-16 flex"
-                    onClick={() => {
-                        setIsAdvanced(true)
-                    }}
+                    onClick={handleAdvancedOptions}
                 >
                     Advanced options
                     {mandatoryPluginData && (!mandatoryPluginData.isValidPre || !mandatoryPluginData.isValidPost) && (

src/components/CIPipelineN/CIPipeline.tsx

@@ -23,6 +23,7 @@ import {
     ComponentSizeType,
     get,
     getIsRequestAborted,
+    handleAnalyticsEvent,
     NodeTaintType,
     noop,
     OptionType,
@@ -642,7 +643,13 @@ const ClusterTerminal = ({
     }
 
     const toggleScreenView = (): void => {
-        setFullScreen(!isFullScreen)
+        if (!isFullScreen) {
+            handleAnalyticsEvent({
+                category: 'Cluster Terminal',
+                action: 'RB_TERMINAL_FULLSCREEN',
+            })
+        }
+        setFullScreen((prev) => !prev)
     }
 
     const selectEventsTab = (): void => {