Skip to content

Commit 3c2cad3

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #16281 from logonoff/OCPBUGS-83418-term-4.21
[release-4.21] OCPBUGS-83418: Fix resource log dropdown TypeError
2 parents 1538675 + 9e1262d commit 3c2cad3

3 files changed

Lines changed: 32 additions & 30 deletions

File tree

‎frontend/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,16 @@
136136
"@patternfly/quickstarts": "^6.4.0",
137137
"@patternfly/react-catalog-view-extension": "^6.1.0",
138138
"@patternfly/react-charts": "^8.2.2",
139-
"@patternfly/react-code-editor": "^6.2.2",
139+
"@patternfly/react-code-editor": "~6.2.3",
140140
"@patternfly/react-component-groups": "6.2.0-prerelease.10",
141141
"@patternfly/react-console": "^6.0.0",
142-
"@patternfly/react-core": "^6.2.2",
142+
"@patternfly/react-core": "~6.2.3",
143143
"@patternfly/react-data-view": "^6.2.0",
144144
"@patternfly/react-icons": "^6.2.2",
145145
"@patternfly/react-log-viewer": "6.3.0-prerelease.2",
146146
"@patternfly/react-styles": "^6.2.2",
147-
"@patternfly/react-table": "^6.2.2",
148-
"@patternfly/react-templates": "^6.2.2",
147+
"@patternfly/react-table": "~6.2.3",
148+
"@patternfly/react-templates": "~6.2.3",
149149
"@patternfly/react-tokens": "^6.2.2",
150150
"@patternfly/react-topology": "^6.2.0",
151151
"@patternfly/react-user-feedback": "^6.1.0",

‎frontend/public/components/utils/resource-log.tsx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,8 @@ const LogControls: React.FCC<LogControlsProps> = ({
234234
const [isLogTypeOpen, setIsLogTypeOpen] = useState(false);
235235
const [isOptionsOpen, setIsOptionsOpen] = useState(false);
236236

237+
const toolbarId = `resource-log-toolbar-${resource?.metadata?.name || 'unknown'}`;
238+
237239
const logTypes: Array<LogType> = [
238240
{ type: LOG_TYPE_CURRENT, text: t('Current log') },
239241
{ type: LOG_TYPE_PREVIOUS, text: t('Previous log') },
@@ -290,7 +292,7 @@ const LogControls: React.FCC<LogControlsProps> = ({
290292
onOpenChange={(isOpen) => setIsLogTypeOpen(isOpen)}
291293
isOpen={isLogTypeOpen}
292294
popperProps={{
293-
appendTo: 'inline', // needed for fullscreen
295+
appendTo: isFullscreen ? () => document.getElementById(toolbarId) : undefined,
294296
}}
295297
>
296298
<SelectList>
@@ -374,7 +376,7 @@ const LogControls: React.FCC<LogControlsProps> = ({
374376
onOpenChange={setIsOptionsOpen}
375377
isOpen={isOptionsOpen}
376378
popperProps={{
377-
appendTo: 'inline', // needed for fullscreen
379+
appendTo: isFullscreen ? () => document.getElementById(toolbarId) : undefined,
378380
}}
379381
>
380382
<SelectList>
@@ -430,7 +432,7 @@ const LogControls: React.FCC<LogControlsProps> = ({
430432
));
431433

432434
return (
433-
<Toolbar data-test="resource-log-toolbar">
435+
<Toolbar data-test="resource-log-toolbar" id={toolbarId}>
434436
<ToolbarContent>
435437
<ToolbarGroup className="pf-v6-u-display-flex pf-v6-u-flex-direction-column pf-v6-u-flex-direction-row-on-md pf-v6-u-w-100">
436438
<ToolbarGroup align={{ default: 'alignStart' }}>

‎frontend/yarn.lock‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2911,20 +2911,20 @@ __metadata:
29112911
languageName: node
29122912
linkType: hard
29132913

2914-
"@patternfly/react-code-editor@npm:^6.2.2":
2915-
version: 6.2.2
2916-
resolution: "@patternfly/react-code-editor@npm:6.2.2"
2914+
"@patternfly/react-code-editor@npm:~6.2.3":
2915+
version: 6.2.3
2916+
resolution: "@patternfly/react-code-editor@npm:6.2.3"
29172917
dependencies:
29182918
"@monaco-editor/react": "npm:^4.6.0"
2919-
"@patternfly/react-core": "npm:^6.2.2"
2919+
"@patternfly/react-core": "npm:^6.2.3"
29202920
"@patternfly/react-icons": "npm:^6.2.2"
29212921
"@patternfly/react-styles": "npm:^6.2.2"
29222922
react-dropzone: "npm:14.3.5"
29232923
tslib: "npm:^2.8.1"
29242924
peerDependencies:
29252925
react: ^17 || ^18
29262926
react-dom: ^17 || ^18
2927-
checksum: 10c0/c808ba250c8f78295ffdf5babbd33d04a2141e53c97cd472cde70ca66d05c02b433a9412dec2f55d586185748b8cb023af0223d727e7dea695d86ef05fd479b4
2927+
checksum: 10c0/f7aff3b386f35558d40fe04d025545962980ed7fc485a289af9cecb3bc978aedfe6622a52f4df00a89e6602995d0574b2a22be35028f2ff9f8b18c430cc87558
29282928
languageName: node
29292929
linkType: hard
29302930

@@ -2963,9 +2963,9 @@ __metadata:
29632963
languageName: node
29642964
linkType: hard
29652965

2966-
"@patternfly/react-core@npm:^6.0.0, @patternfly/react-core@npm:^6.0.0-prerelease.21, @patternfly/react-core@npm:^6.1.0, @patternfly/react-core@npm:^6.2.2":
2967-
version: 6.2.2
2968-
resolution: "@patternfly/react-core@npm:6.2.2"
2966+
"@patternfly/react-core@npm:^6.0.0, @patternfly/react-core@npm:^6.0.0-prerelease.21, @patternfly/react-core@npm:^6.1.0, @patternfly/react-core@npm:^6.2.3, @patternfly/react-core@npm:~6.2.3":
2967+
version: 6.2.3
2968+
resolution: "@patternfly/react-core@npm:6.2.3"
29692969
dependencies:
29702970
"@patternfly/react-icons": "npm:^6.2.2"
29712971
"@patternfly/react-styles": "npm:^6.2.2"
@@ -2976,7 +2976,7 @@ __metadata:
29762976
peerDependencies:
29772977
react: ^17 || ^18
29782978
react-dom: ^17 || ^18
2979-
checksum: 10c0/a75facefb5111cbb90b00f9a616b04e88740a46a113455eefc0722b5a05851f32453f7fd29b281584dfc8536da0972f1fad890ee23075adcbd8c84e8aca90eb9
2979+
checksum: 10c0/57b5ba11daea17c6e10ebd4fe8f460275f99bbb2af81dc4da143b3f01c35c4d4959a56329a76a2eff25bab6499e30c0a688475bd13a7c18b8478ecfa3790bf21
29802980
languageName: node
29812981
linkType: hard
29822982

@@ -3029,11 +3029,11 @@ __metadata:
30293029
languageName: node
30303030
linkType: hard
30313031

3032-
"@patternfly/react-table@npm:^6.0.0, @patternfly/react-table@npm:^6.2.2":
3033-
version: 6.2.2
3034-
resolution: "@patternfly/react-table@npm:6.2.2"
3032+
"@patternfly/react-table@npm:^6.0.0, @patternfly/react-table@npm:~6.2.3":
3033+
version: 6.2.3
3034+
resolution: "@patternfly/react-table@npm:6.2.3"
30353035
dependencies:
3036-
"@patternfly/react-core": "npm:^6.2.2"
3036+
"@patternfly/react-core": "npm:^6.2.3"
30373037
"@patternfly/react-icons": "npm:^6.2.2"
30383038
"@patternfly/react-styles": "npm:^6.2.2"
30393039
"@patternfly/react-tokens": "npm:^6.2.2"
@@ -3042,23 +3042,23 @@ __metadata:
30423042
peerDependencies:
30433043
react: ^17 || ^18
30443044
react-dom: ^17 || ^18
3045-
checksum: 10c0/6159880410a17c6a16c2497e741657ee68eea1ab68d4cacb442761edfe17b0c44da3f9064e744ce940cca5194070446251d27ce45b7be760e4d2253d0eef83ff
3045+
checksum: 10c0/c8a447f04e61129a9007ad263ad1fdeb4ad65751b220741e3dd6bc891f0cc4a66acee0096705cbd07f6de13201fce7cf5f6cf25e181dcee4fa57eaa8c7fb0faf
30463046
languageName: node
30473047
linkType: hard
30483048

3049-
"@patternfly/react-templates@npm:^6.2.2":
3050-
version: 6.2.2
3051-
resolution: "@patternfly/react-templates@npm:6.2.2"
3049+
"@patternfly/react-templates@npm:~6.2.3":
3050+
version: 6.2.3
3051+
resolution: "@patternfly/react-templates@npm:6.2.3"
30523052
dependencies:
3053-
"@patternfly/react-core": "npm:^6.2.2"
3053+
"@patternfly/react-core": "npm:^6.2.3"
30543054
"@patternfly/react-icons": "npm:^6.2.2"
30553055
"@patternfly/react-styles": "npm:^6.2.2"
30563056
"@patternfly/react-tokens": "npm:^6.2.2"
30573057
tslib: "npm:^2.8.1"
30583058
peerDependencies:
30593059
react: ^17 || ^18
30603060
react-dom: ^17 || ^18
3061-
checksum: 10c0/9e8e192b102307501d03d7e0156892e11c776cfafbcc1c5eff26b99454191c4e2add50d3e57d879fa4d9a635a4fb83c240039969dd1309d349f28d4d805aee1e
3061+
checksum: 10c0/0f082f35fbc195c5c6230198f477a5afb5a7e9f7a3db63ae3f76469d77c88c95e64c5c0715de94b8331cd403daa807749226d1ba4b63cfd452c6bed9c6a93d08
30623062
languageName: node
30633063
linkType: hard
30643064

@@ -18084,16 +18084,16 @@ __metadata:
1808418084
"@patternfly/quickstarts": "npm:^6.4.0"
1808518085
"@patternfly/react-catalog-view-extension": "npm:^6.1.0"
1808618086
"@patternfly/react-charts": "npm:^8.2.2"
18087-
"@patternfly/react-code-editor": "npm:^6.2.2"
18087+
"@patternfly/react-code-editor": "npm:~6.2.3"
1808818088
"@patternfly/react-component-groups": "npm:6.2.0-prerelease.10"
1808918089
"@patternfly/react-console": "npm:^6.0.0"
18090-
"@patternfly/react-core": "npm:^6.2.2"
18090+
"@patternfly/react-core": "npm:~6.2.3"
1809118091
"@patternfly/react-data-view": "npm:^6.2.0"
1809218092
"@patternfly/react-icons": "npm:^6.2.2"
1809318093
"@patternfly/react-log-viewer": "npm:6.3.0-prerelease.2"
1809418094
"@patternfly/react-styles": "npm:^6.2.2"
18095-
"@patternfly/react-table": "npm:^6.2.2"
18096-
"@patternfly/react-templates": "npm:^6.2.2"
18095+
"@patternfly/react-table": "npm:~6.2.3"
18096+
"@patternfly/react-templates": "npm:~6.2.3"
1809718097
"@patternfly/react-tokens": "npm:^6.2.2"
1809818098
"@patternfly/react-topology": "npm:^6.2.0"
1809918099
"@patternfly/react-user-feedback": "npm:^6.1.0"

0 commit comments

Comments
 (0)