Skip to content

Commit 0302a28

Browse files
committed
Merge branch 'develop' of github.com:devtron-labs/dashboard into feat/expand-all-logs
2 parents e09e9eb + cd40ff6 commit 0302a28

File tree

143 files changed

+4528
-7168
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+4528
-7168
lines changed

.eslintignore

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
.eslintrc.js
66
vite.config.mts
77

8-
# The following files have eslint errors/warningssrc/App.tsx
8+
# The following files have eslint errors/warnings
99
src/App.tsx
1010
src/Pages/GlobalConfigurations/Authorization/APITokens/__tests__/ApiTokens.test.tsx
1111
src/components/AppSelector/AppSelector.tsx
@@ -82,9 +82,7 @@ src/components/ClusterNodes/constants.ts
8282
src/components/Hotjar/Hotjar.tsx
8383
src/components/Jobs/ExpandedRow/ExpandedRow.tsx
8484
src/components/Jobs/JobDetails/JobDetails.tsx
85-
src/components/Jobs/JobList/JobListContainer.tsx
8685
src/components/Jobs/JobList/JobListView.tsx
87-
src/components/Jobs/JobList/JobsList.tsx
8886
src/components/Jobs/Jobs.tsx
8987
src/components/Jobs/JobsEmptyState.tsx
9088
src/components/Jobs/Service.ts
@@ -94,7 +92,6 @@ src/components/ResourceBrowser/ResourceList/ResourceList.component.tsx
9492
src/components/ResourceBrowser/ResourceList/__tests__/Sidebar.test.tsx
9593
src/components/__mocks__/monaco-editor.js
9694
src/components/__mocks__/xterm-webfont.js
97-
src/components/app/EventsLogs.tsx
9895
src/components/app/LogFilter.test.ts
9996
src/components/app/LogFilter.ts
10097
src/components/app/Overview/EnvironmentList.tsx
@@ -104,7 +101,6 @@ src/components/app/Overview/utils.tsx
104101
src/components/app/ResourceTreeNodes.tsx
105102
src/components/app/ResponsiveDrawer.tsx
106103
src/components/app/WebWorker.ts
107-
src/components/app/__tests__/EventsLogs.test.tsx
108104
src/components/app/appLabelCommon.tsx
109105
src/components/app/create/CreateApp.tsx
110106
src/components/app/create/validationRules.ts
@@ -159,16 +155,12 @@ src/components/app/details/triggerView/workflow/nodes/triggerCINode.tsx
159155
src/components/app/details/triggerView/workflow/nodes/triggerPrePostCDNode.tsx
160156
src/components/app/details/triggerView/workflow/nodes/workflow.utils.tsx
161157
src/components/app/grepSSEworker.ts
162-
src/components/app/list-new/AppList.tsx
163158
src/components/app/list-new/AppListService.ts
164159
src/components/app/list-new/GenericAppList.tsx
165160
src/components/app/list-new/HelmAppList.tsx
166-
src/components/app/list/AppListView.tsx
167-
src/components/app/list/DevtronAppListContainer.tsx
168161
src/components/app/list/TriggerUrl.tsx
169162
src/components/app/list/__tests__/AppListView.test.tsx
170163
src/components/app/list/appList.modal.ts
171-
src/components/app/list/appStatus/AppStatus.tsx
172164
src/components/app/list/emptyView/Empty.tsx
173165
src/components/app/list/expandedRow/ExpandedRow.tsx
174166
src/components/app/service.ts
@@ -250,7 +242,6 @@ src/components/cluster/ClusterComponentModal.tsx
250242
src/components/cluster/ClusterForm.tsx
251243
src/components/cluster/ClusterInfoStepsModal.tsx
252244
src/components/cluster/ClusterInstallStatus.tsx
253-
src/components/cluster/Environment.tsx
254245
src/components/cluster/UseNameListDropdown.tsx
255246
src/components/cluster/cluster.service.ts
256247
src/components/cluster/cluster.util.ts
@@ -286,12 +277,10 @@ src/components/common/eaEmptyState/EAEmptyState.tsx
286277
src/components/common/edge/rectangularEdge.tsx
287278
src/components/common/edge/straightEdge.tsx
288279
src/components/common/errorBoundary.tsx
289-
src/components/common/filter/filters.tsx
290280
src/components/common/formFields/CopyButton.tsx
291281
src/components/common/formFields/CustomPassword.tsx
292282
src/components/common/formFields/DevtronSwitch.tsx
293283
src/components/common/formFields/Typeahead.tsx
294-
src/components/common/formFields/Widgets/Widgets.tsx
295284
src/components/common/helpers/Helpers.tsx
296285
src/components/common/helpers/compareVersion.ts
297286
src/components/common/helpers/isSubset.ts
@@ -417,7 +406,6 @@ src/components/v2/appDetails/appDetails.store.ts
417406
src/components/v2/appDetails/appDetails.type.ts
418407
src/components/v2/appDetails/ea/EAAppDetail.component.tsx
419408
src/components/v2/appDetails/k8Resource/FilterResource.tsx
420-
src/components/v2/appDetails/k8Resource/K8Resource.component.tsx
421409
src/components/v2/appDetails/k8Resource/NodeTreeTabList.tsx
422410
src/components/v2/appDetails/k8Resource/nodeDetail/EphemeralContainerDrawer.tsx
423411
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetail.component.tsx
@@ -440,7 +428,6 @@ src/components/v2/appDetails/k8Resource/nodeDetail/nodeDetail.util.ts
440428
src/components/v2/appDetails/k8Resource/nodeType/Node.component.tsx
441429
src/components/v2/appDetails/k8Resource/nodeType/NodeDelete.component.tsx
442430
src/components/v2/appDetails/k8Resource/nodeType/NodeTree.component.tsx
443-
src/components/v2/appDetails/k8Resource/nodeType/PodHeader.component.tsx
444431
src/components/v2/appDetails/k8Resource/nodeType/PodTabSection.tsx
445432
src/components/v2/appDetails/k8Resource/nodeType/__tests__/NodeTree.component.test.ts
446433
src/components/v2/appDetails/k8Resource/nodeType/nodeType.util.ts
@@ -475,11 +462,9 @@ src/components/v2/utils/useSharedState.ts
475462
src/components/v2/values/ChartValues.component.tsx
476463
src/components/v2/values/chartValuesDiff/ChartRepoSelector.tsx
477464
src/components/v2/values/chartValuesDiff/ChartValuesEditor.tsx
478-
src/components/v2/values/chartValuesDiff/ChartValuesGUIView.tsx
479465
src/components/v2/values/chartValuesDiff/ChartValuesView.component.tsx
480466
src/components/v2/values/chartValuesDiff/ChartValuesView.reducer.ts
481467
src/components/v2/values/chartValuesDiff/ChartValuesView.tsx
482-
src/components/v2/values/chartValuesDiff/ChartValuesView.utils.ts
483468
src/components/v2/values/chartValuesDiff/ProjectUpdateModal.tsx
484469
src/components/v2/values/common/chartValues.api.ts
485470
src/components/workflowEditor/CDSuccessModal.tsx

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "0.3.6-beta-7",
7+
"@devtron-labs/devtron-fe-common-lib": "0.3.13",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",
@@ -46,7 +46,7 @@
4646
"rxjs": "^7.5.4",
4747
"sockjs-client": "1.6.1",
4848
"tippy.js": "^6.3.7",
49-
"vite": "5.4.2",
49+
"vite": "5.4.6",
5050
"vite-plugin-require-transform": "1.0.21",
5151
"vite-plugin-svgr": "^2.4.0",
5252
"xterm": "^4.19.0",

src/App.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ export default function App() {
9898
}
9999
} else {
100100
didMountRef.current = true
101+
// Removing any toast explicitly due to race condition of offline toast for some users
102+
ToastManager.dismissToast(onlineToastRef.current)
101103
}
102104
}, [isOnline])
103105

0 commit comments

Comments
 (0)