Merge pull request #2484 from devtron-labs/fix/theming-v3

feat: theming v3

Author: eshankvaish

.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

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

@@ -31,7 +31,6 @@
 | 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.7",
+        "@devtron-labs/devtron-fe-common-lib": "1.7.8",
         "@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/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;