Merge branch 'main' of https://github.com/devtron-labs/dashboard into chore/sync-stack-manager-version

Author: arunjaindev

src/components/v2/devtronStackManager/AboutDevtronView.tsx

@@ -118,9 +118,9 @@ const AboutDevtronView = ({
                 <div className="about-devtron__details">
                     <h2 className="about-devtron__view-heading cn-9 fs-20 fw-6">
                         Devtron
-                        {serverInfo?.currentVersion && serverInfo.installationType === InstallationType.OSS_HELM
-                            ? ` (${serverInfo.currentVersion.toLowerCase()})`
-                            : ''}
+                        {serverInfo?.currentVersion && serverInfo.installationType !== InstallationType.OSS_KUBECTL && (
+                            <span>&nbsp;({serverInfo.currentVersion.toLowerCase()})</span>
+                        )}
                     </h2>
                     <div className="about-devtron__view-tabs w-100">
                         {renderTabs()}

src/components/v2/devtronStackManager/DevtronStackManager.tsx

@@ -107,7 +107,7 @@ export default function DevtronStackManager({
             _getDetailsForAllModules(stackDetails.discoverModulesList, stackDetails)
             _getLogPodName()
         },
-        serverInfo?.installationType === InstallationType.OSS_HELM ? 30000 : null,
+        serverInfo?.installationType === InstallationType.OSS_KUBECTL ? null : 30000,
     )
 
     /**
@@ -562,8 +562,8 @@ export default function DevtronStackManager({
                                 handleTabChange={handleTabChange}
                                 showInitializing={!logPodName && serverMode === SERVER_MODE.FULL}
                                 showVersionInfo={
-                                    serverInfo?.currentVersion &&
-                                    serverInfo.installationType === InstallationType.OSS_HELM
+                                    !!serverInfo?.currentVersion &&
+                                    serverInfo.installationType !== InstallationType.OSS_KUBECTL
                                 }
                             />
                         </section>