Skip to content

Commit 1cf077d

Browse files
authored
Merge branch 'develop' into feat/api-token-removed
2 parents 0b0f139 + 0665233 commit 1cf077d

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

package.json

Lines changed: 1 addition & 1 deletion
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": "1.17.0-pre-6",
7+
"@devtron-labs/devtron-fe-common-lib": "1.17.0-pre-7",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",

src/components/common/SidePanel/SidePanelHeaderActions.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
1-
import { PropsWithChildren } from 'react'
1+
import { PropsWithChildren, useEffect, useState } from 'react'
22
import { createPortal } from 'react-dom'
33

44
import { logExceptionToSentry } from '@devtron-labs/devtron-fe-common-lib'
55

66
export const SidePanelHeaderActions = ({ children }: PropsWithChildren<{}>) => {
7+
const [hasComponentRenderedOnce, setHasComponentRenderedOnce] = useState(false)
8+
9+
useEffect(() => {
10+
setHasComponentRenderedOnce(true)
11+
}, [])
12+
13+
if (!hasComponentRenderedOnce) {
14+
return null
15+
}
16+
717
const targetElement = document.getElementById('devtron-side-panel-actions')
818

919
if (!targetElement) {

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1722,9 +1722,9 @@ __metadata:
17221722
languageName: node
17231723
linkType: hard
17241724

1725-
"@devtron-labs/devtron-fe-common-lib@npm:1.17.0-pre-6":
1726-
version: 1.17.0-pre-6
1727-
resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.17.0-pre-6"
1725+
"@devtron-labs/devtron-fe-common-lib@npm:1.17.0-pre-7":
1726+
version: 1.17.0-pre-7
1727+
resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.17.0-pre-7"
17281728
dependencies:
17291729
"@codemirror/autocomplete": "npm:6.18.6"
17301730
"@codemirror/lang-json": "npm:6.0.1"
@@ -1773,7 +1773,7 @@ __metadata:
17731773
react-select: 5.8.0
17741774
rxjs: ^7.8.1
17751775
yaml: ^2.4.1
1776-
checksum: 10c0/d5f1a6536e6d6b8fbfd18d85a80c76c8effdbc9a6b17b20dfe783a0c8a6f831618aae6826d717098736b8205826372753cdb762fe374a9e6c1b8bfdfd9c3c004
1776+
checksum: 10c0/aba53011d74931fdcc88239bcd648bfb0b12034637f910a9242c28db5e7267347c2f8f94e7d4f36766de1f0a61be4188a301148c59c37694623a7e8c7db2519b
17771777
languageName: node
17781778
linkType: hard
17791779

@@ -5685,7 +5685,7 @@ __metadata:
56855685
version: 0.0.0-use.local
56865686
resolution: "dashboard@workspace:."
56875687
dependencies:
5688-
"@devtron-labs/devtron-fe-common-lib": "npm:1.17.0-pre-6"
5688+
"@devtron-labs/devtron-fe-common-lib": "npm:1.17.0-pre-7"
56895689
"@esbuild-plugins/node-globals-polyfill": "npm:0.2.3"
56905690
"@playwright/test": "npm:^1.32.1"
56915691
"@rjsf/core": "npm:^5.13.3"

0 commit comments

Comments
 (0)