Merge branch 'develop' of https://github.com/devtron-labs/dashboard i…

…nto feat/hibernation-patch

.env

@@ -4,7 +4,6 @@ SENTRY_PERFORMANCE_ENABLED=false
 SENTRY_DSN=
 SENTRY_RELEASE_VERSION=
 SENTRY_TRACES_SAMPLE_RATE=0.2
-HOTJAR_ENABLED=false
 GA_ENABLED=false
 GA_TRACKING_ID=
 GTM_ENABLED=false
@@ -22,7 +21,6 @@ EA_APP_DETAILS_POLLING_INTERVAL=30000
 CENTRAL_API_ENDPOINT=https://api.devtron.ai
 HIDE_GITOPS_OR_HELM_OPTION=true
 CONFIGURABLE_TIMEOUT=
-HIDE_APPLICATION_GROUPS=true
 K8S_CLIENT=false
 CLUSTER_TERMINAL_CONNECTION_POLLING_INTERVAL=7000
 CLUSTER_TERMINAL_CONNECTION_RETRY_COUNT=7
@@ -67,3 +65,4 @@ FEATURE_CLUSTER_MAP_ENABLE=true
 FEATURE_DEFAULT_LANDING_RB_ENABLE=false
 FEATURE_ACTION_AUDIOS_ENABLE=true
 FEATURE_EXPERIMENTAL_THEMING_ENABLE=false
+FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false

Dockerfile

@@ -16,7 +16,7 @@ COPY . .
 
 RUN echo `git rev-parse --short=9 HEAD` > health.html
 
-RUN echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short HEAD)" >> .env
+RUN echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short HEAD)\n" >> .env
 
 RUN yarn build
 

config.md

@@ -26,12 +26,10 @@
 | GTM_ENABLED                                  | "true"     | Enable GTM for tag manager                                                                                       |
 | GTM_ID                                       | ""         | Enable GTM_ID for tag manager args                                                                               |
 | HELM_APP_DETAILS_POLLING_INTERVAL            | 3000       | API polling interval for helm app details                                                                        |
-| HIDE_APPLICATION_GROUPS                      | "false"    | Hide application group from Devtron UI                                                                           |
 | HIDE_DISCORD                                 | "true"     | Hide Discord button from UI                                                                                      |
 | HIDE_DEFAULT_CLUSTER                         | "true"     | Hide default cluster                                                                                             |
 | HIDE_EXCLUDE_INCLUDE_GIT_COMMITS             | "true"     | Hide exclude include git commits                                                                                 |
 | HIDE_GITOPS_OR_HELM_OPTION                   | "false"    | Enable GitOps and Helm option                                                                                    |
-| HOTJAR_ENABLED                               | "false"    | Hotjar integration status                                                                                        |
 | LOGIN_DT_LOGO                                | ""         | Devtron logo for login page                                                                                      |
 | LOGIN_PAGE_IMAGE                             | ""         | Login page image url                                                                                             |
 | LOGIN_PAGE_IMAGE_BG                          | ""         | Login page image background color code                                                                           |

package.json

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

src/App.tsx

@@ -41,7 +41,6 @@ import {
     reloadLocation,
 } from './components/common'
 import { UPDATE_AVAILABLE_TOAST_PROGRESS_BG, URLS } from './config'
-import Hotjar from './components/Hotjar/Hotjar'
 import { validateToken } from './services/service'
 
 const NavigationRoutes = lazy(() => import('./components/common/navigation/NavigationRoutes'))
@@ -351,9 +350,6 @@ export default function App() {
                                     <div id="visible-modal" />
                                     <div id="visible-modal-2" />
                                     <div id="animated-dialog-backdrop" />
-                                    {import.meta.env.VITE_NODE_ENV === 'production' &&
-                                        window._env_ &&
-                                        window._env_.HOTJAR_ENABLED && <Hotjar />}
                                 </BreadcrumbStore>
                             </ErrorBoundary>
                         )}

src/Pages/Applications/DevtronApps/Details/AppConfigurations/Navigation/EnvConfigurationsNav.tsx

@@ -23,7 +23,6 @@ import {
     BASE_CONFIGURATION_ENV_ID,
     Button,
     ButtonComponentType,
-    ButtonStyleType,
     ButtonVariantType,
     CollapsibleList,
     CollapsibleListConfig,
@@ -45,10 +44,10 @@ import { URLS } from '@Config/routes'
 import { ResourceConfigState } from '@Pages/Applications/DevtronApps/service.types'
 
 import { DEPLOYMENT_CONFIGURATION_RESOURCE_TYPE_ROUTE } from '@Config/constants'
+import ReactGA from 'react-ga4'
 import { BASE_CONFIGURATIONS } from '../AppConfig.constants'
 import { EnvConfigRouteParams, EnvConfigurationsNavProps, EnvConfigObjectKey, EnvConfigType } from '../AppConfig.types'
 import { getEnvConfiguration, getNavigationPath } from './Navigation.helper'
-
 // LOADING SHIMMER
 const ShimmerText = ({ width }: { width: string }) => (
     <div className={`p-8 h-32 w-${width}`}>
@@ -415,6 +414,13 @@ export const EnvConfigurationsNav = ({
         </div>
     )
 
+    const onClickCompareWith = () => {
+        ReactGA.event({
+            category: 'DEVTRON_APP_COMPARE_WITH',
+            action: 'DEVTRON_APP_COMPARE_WITH',
+        })
+    }
+
     const renderCompareWithBtn = () => {
         const { name: compareTo } = resourceData
 
@@ -438,11 +444,11 @@ export const EnvConfigurationsNav = ({
                     component={ButtonComponentType.link}
                     variant={ButtonVariantType.secondary}
                     size={ComponentSizeType.medium}
-                    style={ButtonStyleType.neutral}
                     startIcon={<ICArrowsLeftRight />}
                     disabled={!isResourceTypeValid}
                     linkProps={{ to: compareWithHref }}
                     text="Compare with..."
+                    onClick={onClickCompareWith}
                 />
             </div>
         )

src/Pages/Shared/ConfigMapSecret/helpers.tsx

@@ -16,10 +16,9 @@
 
 import { Link } from 'react-router-dom'
 
-import { CMSecretExternalType, InfoColourBar, CMSecretComponentType } from '@devtron-labs/devtron-fe-common-lib'
+import { CMSecretExternalType, InfoColourBar, CMSecretComponentType, Icon } from '@devtron-labs/devtron-fe-common-lib'
 
 import { ReactComponent as InfoIcon } from '@Icons/info-filled.svg'
-import { ReactComponent as InfoIconN7 } from '@Icons/info-filled-n7.svg'
 import { URLS } from '@Config/routes'
 import { DOCUMENTATION } from '@Config/constants'
 
@@ -92,7 +91,7 @@ export const renderChartVersionBelow3090NotSupportedText = () => (
 
 export const renderYamlInfoText = () => (
     <p className="m-0 py-6 px-10 flex left dc__gap-6 fs-12 lh-20 cn-8 bg__secondary dc__border-top-n1 dc__bottom-radius-4">
-        <InfoIconN7 className="icon-dim-16 dc__no-shrink" />
+        <Icon name="ic-info-filled" color={null} size={16} />
         <span>
             GUI Recommended for multi-line data. Boolean and numeric values must be wrapped in double quotes Eg.
             &quot;true&quot;, &quot;123&quot;