Merge branch 'develop' of github.com:devtron-labs/dashboard into feat/use-rjsf-chart-store

Author: Elessar1802

.eslintignore

@@ -5,7 +5,7 @@
 .eslintrc.js
 vite.config.mts
 
-# The following files have eslint errors/warningssrc/App.tsx
+# The following files have eslint errors/warnings
 src/App.tsx
 src/Pages/GlobalConfigurations/Authorization/APITokens/__tests__/ApiTokens.test.tsx
 src/components/AppSelector/AppSelector.tsx
@@ -82,9 +82,7 @@ src/components/ClusterNodes/constants.ts
 src/components/Hotjar/Hotjar.tsx
 src/components/Jobs/ExpandedRow/ExpandedRow.tsx
 src/components/Jobs/JobDetails/JobDetails.tsx
-src/components/Jobs/JobList/JobListContainer.tsx
 src/components/Jobs/JobList/JobListView.tsx
-src/components/Jobs/JobList/JobsList.tsx
 src/components/Jobs/Jobs.tsx
 src/components/Jobs/JobsEmptyState.tsx
 src/components/Jobs/Service.ts
@@ -94,7 +92,6 @@ src/components/ResourceBrowser/ResourceList/ResourceList.component.tsx
 src/components/ResourceBrowser/ResourceList/__tests__/Sidebar.test.tsx
 src/components/__mocks__/monaco-editor.js
 src/components/__mocks__/xterm-webfont.js
-src/components/app/EventsLogs.tsx
 src/components/app/LogFilter.test.ts
 src/components/app/LogFilter.ts
 src/components/app/Overview/EnvironmentList.tsx
@@ -104,7 +101,6 @@ src/components/app/Overview/utils.tsx
 src/components/app/ResourceTreeNodes.tsx
 src/components/app/ResponsiveDrawer.tsx
 src/components/app/WebWorker.ts
-src/components/app/__tests__/EventsLogs.test.tsx
 src/components/app/appLabelCommon.tsx
 src/components/app/create/CreateApp.tsx
 src/components/app/create/validationRules.ts
@@ -159,16 +155,12 @@ src/components/app/details/triggerView/workflow/nodes/triggerCINode.tsx
 src/components/app/details/triggerView/workflow/nodes/triggerPrePostCDNode.tsx
 src/components/app/details/triggerView/workflow/nodes/workflow.utils.tsx
 src/components/app/grepSSEworker.ts
-src/components/app/list-new/AppList.tsx
 src/components/app/list-new/AppListService.ts
 src/components/app/list-new/GenericAppList.tsx
 src/components/app/list-new/HelmAppList.tsx
-src/components/app/list/AppListView.tsx
-src/components/app/list/DevtronAppListContainer.tsx
 src/components/app/list/TriggerUrl.tsx
 src/components/app/list/__tests__/AppListView.test.tsx
 src/components/app/list/appList.modal.ts
-src/components/app/list/appStatus/AppStatus.tsx
 src/components/app/list/emptyView/Empty.tsx
 src/components/app/list/expandedRow/ExpandedRow.tsx
 src/components/app/service.ts
@@ -286,7 +278,6 @@ src/components/common/eaEmptyState/EAEmptyState.tsx
 src/components/common/edge/rectangularEdge.tsx
 src/components/common/edge/straightEdge.tsx
 src/components/common/errorBoundary.tsx
-src/components/common/filter/filters.tsx
 src/components/common/formFields/CopyButton.tsx
 src/components/common/formFields/CustomPassword.tsx
 src/components/common/formFields/DevtronSwitch.tsx
@@ -416,7 +407,6 @@ src/components/v2/appDetails/appDetails.store.ts
 src/components/v2/appDetails/appDetails.type.ts
 src/components/v2/appDetails/ea/EAAppDetail.component.tsx
 src/components/v2/appDetails/k8Resource/FilterResource.tsx
-src/components/v2/appDetails/k8Resource/K8Resource.component.tsx
 src/components/v2/appDetails/k8Resource/NodeTreeTabList.tsx
 src/components/v2/appDetails/k8Resource/nodeDetail/EphemeralContainerDrawer.tsx
 src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetail.component.tsx
@@ -439,7 +429,6 @@ src/components/v2/appDetails/k8Resource/nodeDetail/nodeDetail.util.ts
 src/components/v2/appDetails/k8Resource/nodeType/Node.component.tsx
 src/components/v2/appDetails/k8Resource/nodeType/NodeDelete.component.tsx
 src/components/v2/appDetails/k8Resource/nodeType/NodeTree.component.tsx
-src/components/v2/appDetails/k8Resource/nodeType/PodHeader.component.tsx
 src/components/v2/appDetails/k8Resource/nodeType/PodTabSection.tsx
 src/components/v2/appDetails/k8Resource/nodeType/__tests__/NodeTree.component.test.ts
 src/components/v2/appDetails/k8Resource/nodeType/nodeType.util.ts

.storybook/preview.tsx

@@ -12,6 +12,19 @@ const preview: Preview = {
                 date: /Date$/i,
             },
         },
+        backgrounds: {
+            values: [
+                {
+                    name: 'Light',
+                    value: 'var(--N0)',
+                },
+                {
+                    name: 'Dark',
+                    value: 'var(--N700)',
+                },
+            ],
+            default: 'Light',
+        },
     },
     tags: ['autodocs'],
     decorators: (Story) => (

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "0.3.6-beta-2",
+        "@devtron-labs/devtron-fe-common-lib": "0.3.10",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
@@ -46,7 +46,7 @@
         "rxjs": "^7.5.4",
         "sockjs-client": "1.6.1",
         "tippy.js": "^6.3.7",
-        "vite": "5.4.2",
+        "vite": "5.4.6",
         "vite-plugin-require-transform": "1.0.21",
         "vite-plugin-svgr": "^2.4.0",
         "xterm": "^4.19.0",

src/App.tsx

@@ -16,7 +16,7 @@
 
 import { lazy, Suspense, useRef, useState, useEffect } from 'react'
 import { Route, Switch, Redirect, useHistory, useLocation } from 'react-router-dom'
-import './css/application.scss';
+import './css/application.scss'
 import {
     showError,
     BreadcrumbStore,
@@ -26,9 +26,10 @@ import {
     useUserEmail,
     URLS as CommonURLS,
     ToastManager,
-    ToastVariantType
+    ToastVariantType,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { ReactComponent as ICSparkles } from '@Icons/ic-sparkles.svg'
+import { ReactComponent as ICArrowClockwise } from '@Icons/ic-arrow-clockwise.svg'
 import { useRegisterSW } from 'virtual:pwa-register/react'
 import {
     useOnline,
@@ -78,22 +79,27 @@ export default function App() {
     useEffect(() => {
         if (didMountRef.current) {
             if (!isOnline) {
+                onlineToast(
+                    {
+                        variant: ToastVariantType.error,
+                        title: 'You are offline!',
+                        description: 'You are not seeing real-time data and any changes you make will not be saved.',
+                    },
+                    {
+                        autoClose: false,
+                    },
+                )
+            } else {
                 onlineToast({
-                    variant: ToastVariantType.error,
-                    title: 'You are offline!',
-                    description: 'You are not seeing real-time data and any changes you make will not be saved.',
-                }, {
-                    autoClose: false
+                    variant: ToastVariantType.success,
+                    title: 'Connected!',
+                    description: "You're back online.",
                 })
-            } else {
-                 onlineToast({
-                     variant: ToastVariantType.success,
-                     title: 'Connected!',
-                     description: "You're back online.",
-                 })
             }
         } else {
             didMountRef.current = true
+            // Removing any toast explicitly due to race condition of offline toast for some users
+            ToastManager.dismissToast(onlineToastRef.current)
         }
     }, [isOnline])
 
@@ -245,6 +251,7 @@ export default function App() {
                     text: 'Reload',
                     dataTestId: 'reload-btn',
                     onClick: update,
+                    startIcon: <ICArrowClockwise />,
                 },
                 icon: <ICSparkles />,
                 progressBarBg: UPDATE_AVAILABLE_TOAST_PROGRESS_BG,
@@ -281,6 +288,7 @@ export default function App() {
                     text: 'Reload',
                     dataTestId: 'reload-btn',
                     onClick: reloadLocation,
+                    startIcon: <ICArrowClockwise />,
                 },
                 icon: <ICSparkles />,
                 progressBarBg: UPDATE_AVAILABLE_TOAST_PROGRESS_BG,