Skip to content

Commit 6b64038

Browse files
Merge branch 'main' into feat/cm-based-default-cluster-show
2 parents 08ca84f + bd24067 commit 6b64038

File tree

145 files changed

+4709
-2153
lines changed

Some content is hidden

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

145 files changed

+4709
-2153
lines changed

package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "0.0.41",
7+
"@devtron-labs/devtron-fe-common-lib": "0.0.45",
8+
"@rjsf/core": "^5.13.3",
9+
"@rjsf/utils": "^5.13.3",
10+
"@rjsf/validator-ajv8": "^5.13.3",
811
"@sentry/browser": "^7.3.1",
912
"@sentry/integrations": "^7.3.1",
1013
"@sentry/tracing": "^7.3.1",
@@ -48,7 +51,8 @@
4851
"xterm-addon-search": "^0.9.0",
4952
"xterm-webfont": "^2.0.0",
5053
"yaml": "^1.7.2",
51-
"yamljs": "^0.3.0"
54+
"yamljs": "^0.3.0",
55+
"tippy.js": "^6.3.7"
5256
},
5357
"scripts": {
5458
"lint": "eslint src/**/*.tsx",

src/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
ToastBody3 as UpdateToast,
1919
ErrorBoundary,
2020
} from './components/common'
21-
import { showError, Progressing, BreadcrumbStore, Reload } from '@devtron-labs/devtron-fe-common-lib'
21+
import { showError, BreadcrumbStore, Reload, DevtronProgressing } from '@devtron-labs/devtron-fe-common-lib'
2222
import * as serviceWorker from './serviceWorker'
2323
import Hotjar from './components/Hotjar/Hotjar'
2424
import { validateToken } from './services/service'
@@ -207,7 +207,7 @@ export default function App() {
207207
<Suspense fallback={null}>
208208
{validating ? (
209209
<div className="full-height-width">
210-
<Progressing pageLoader />
210+
<DevtronProgressing parentClasses="h-100 flex bcn-0" classes="icon-dim-80"/>
211211
</div>
212212
) : (
213213
<>
Lines changed: 5 additions & 0 deletions
Loading

src/assets/icons/ic-input.svg

Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 7 additions & 0 deletions
Loading

src/assets/icons/ic-secure.svg

Lines changed: 17 additions & 0 deletions
Loading

src/assets/icons/ic-source-build.svg

Lines changed: 6 additions & 0 deletions
Loading

src/assets/icons/ic-source-job.svg

Lines changed: 10 additions & 0 deletions
Loading
Lines changed: 8 additions & 0 deletions
Loading
Lines changed: 6 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)