Skip to content

Commit aef5e4b

Browse files
dlabajpierrecorsininicolethoenjelly
authored
Upgraded to latest react core for v6 beta. (#63)
* chore(pf-issues): Updated code to push issues to PatternFly Issues. (#52) * Fix link to virt-manager.org/download (#51) * chore: Create dependabot.yml * chore(deps): update novnc to 1.5.0 (#57) * fix(build): Update README.md to restart build that didn't deploy. * fix(beta): Upgraded to beta release candidate and mereged main fixes. fix(beta): * fix(doc-framework): Upgraded to the latest document framework. --------- Co-authored-by: Pierre CORSINI <[email protected]> Co-authored-by: Nicole Thoen <[email protected]> Co-authored-by: Jelle van der Waa <[email protected]>
1 parent 993717c commit aef5e4b

File tree

17 files changed

+405
-475
lines changed

17 files changed

+405
-475
lines changed

.github/workflows/dependabot.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: npm
4+
directory: "/"
5+
schedule:
6+
interval: weekly
7+
day: tuesday
8+
time: "12:00"
9+
timezone: EST
10+
allow:
11+
- dependency-type: "all"
12+
ignore:
13+
- dependency-name: "*"
14+
update-types:
15+
- version-update:semver-major
16+
open-pull-requests-limit: 10
17+
reviewers:
18+
- nicolethoen
19+
- dlabaj
20+
21+
- package-ecosystem: npm
22+
directory: "/packages/module"
23+
schedule:
24+
interval: weekly
25+
day: tuesday
26+
time: "12:00"
27+
timezone: EST
28+
allow:
29+
- dependency-type: "all"
30+
ignore:
31+
- dependency-name: "*"
32+
update-types:
33+
- version-update:semver-major
34+
open-pull-requests-limit: 10
35+
reviewers:
36+
- nicolethoen
37+
- dlabaj

.github/workflows/extensions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ jobs:
1313
steps:
1414
- uses: actions/[email protected]
1515
with:
16-
project-url: https://github.com/orgs/patternfly/projects/12
16+
project-url: https://github.com/orgs/patternfly/projects/7
1717
github-token: ${{ secrets.GH_PROJECTS }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ or
1414
```
1515
npm install @patternfly/react-console --save
1616
```
17-
17+
1818
### Usage
1919

2020
It's strongly advised to use the PatternFly Base CSS in your whole project, or some components may diverge in appearance:

packages/module/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
"tag": "alpha"
3636
},
3737
"dependencies": {
38-
"@novnc/novnc": "^1.3.0",
39-
"@patternfly/react-core": "6.0.0-alpha.61",
40-
"@patternfly/react-styles": "6.0.0-alpha.23",
38+
"@novnc/novnc": "^1.5.0",
39+
"@patternfly/react-core": "^6.0.0-alpha.94",
40+
"@patternfly/react-styles": "^6.0.0-alpha.33",
4141
"@spice-project/spice-html5": "^0.2.1",
4242
"file-saver": "^1.3.8",
4343
"react-jss": "^10.10.0",
@@ -49,11 +49,11 @@
4949
"react-dom": "^17 || ^18"
5050
},
5151
"devDependencies": {
52-
"@patternfly/documentation-framework": "6.0.0-alpha.41",
53-
"@patternfly/patternfly": "6.0.0-alpha.139",
52+
"@patternfly/documentation-framework": "6.0.0-alpha.69",
53+
"@patternfly/patternfly": "6.0.0-alpha.205",
5454
"@patternfly/patternfly-a11y": "^4.3.1",
55-
"@patternfly/react-code-editor": "6.0.0-alpha.61",
56-
"@patternfly/react-table": "6.0.0-alpha.61",
55+
"@patternfly/react-code-editor": "6.0.0-alpha.94",
56+
"@patternfly/react-table": "6.0.0-alpha.95",
5757
"monaco-editor": "^0.34.1",
5858
"rimraf": "^2.6.2",
5959
"serve": "^14.2.3"

packages/module/patternfly-docs/generated/extensions/react-console/react.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ pageData.examples = {
369369

370370
const Component = () => (
371371
<React.Fragment>
372-
<AutoLinkHeader {...{"id":"note","size":"h3","className":"ws-title ws-h3"}}>
372+
<AutoLinkHeader {...{"id":"note","headingLevel":"h3","className":"ws-title ws-h3"}}>
373373
{`Note`}
374374
</AutoLinkHeader>
375375
<p {...{"className":"pf-v6-c-content--p ws-p "}}>
@@ -380,7 +380,7 @@ const Component = () => (
380380
</code>
381381
</PatternflyThemeLink>
382382
</p>
383-
<AutoLinkHeader {...{"id":"examples","size":"h2","className":"ws-title ws-h2"}}>
383+
<AutoLinkHeader {...{"id":"examples","headingLevel":"h2","className":"ws-title ws-h2"}}>
384384
{`Examples`}
385385
</AutoLinkHeader>
386386
{React.createElement(pageData.examples["Basic Usage"])}

packages/module/src/components/AccessConsoles/AccessConsoles.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
import React from 'react';
2-
import { Select, SelectOption, MenuToggle, MenuToggleElement, SelectList } from '@patternfly/react-core';
2+
import {
3+
MenuToggle,
4+
MenuToggleElement,
5+
Select,
6+
SelectOption,
7+
SelectList
8+
} from '@patternfly/react-core';
39

410
import { constants } from '../common/constants';
511
import { createUseStyles } from 'react-jss';

packages/module/src/components/AccessConsoles/__snapshots__/AccessConsoles.test.tsx.snap

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ exports[`AccessConsoles with SerialConsole and VncConsole as children 1`] = `
2828
aria-expanded="false"
2929
aria-label="Console type toggle"
3030
class="pf-v6-c-menu-toggle"
31+
data-ouia-component-id="OUIA-Generated-MenuToggle-1"
32+
data-ouia-component-type="PF6/MenuToggle"
33+
data-ouia-safe="true"
3134
id="pf-v6-c-console__type-selector"
3235
style="width: 100%;"
3336
type="button"
@@ -91,7 +94,11 @@ exports[`AccessConsoles with preselected SerialConsole 1`] = `
9194
data-ouia-safe="true"
9295
type="button"
9396
>
94-
Disconnect
97+
<span
98+
class="pf-v6-c-button__text"
99+
>
100+
Disconnect
101+
</span>
95102
</button>
96103
<button
97104
aria-disabled="false"
@@ -101,7 +108,11 @@ exports[`AccessConsoles with preselected SerialConsole 1`] = `
101108
data-ouia-safe="true"
102109
type="button"
103110
>
104-
Reset
111+
<span
112+
class="pf-v6-c-button__text"
113+
>
114+
Reset
115+
</span>
105116
</button>
106117
</div>
107118
<div

packages/module/src/components/DesktopViewer/MoreInformationDefaultContent.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const MoreInformationDefaultContent: React.FunctionComponent<MoreInformat
2929
<MoreInformationInstallVariant os="Windows">
3030
<div>
3131
Download the MSI from{' '}
32-
<a href="https://virt-manager.org/download/" target="_blank" rel="noopener noreferrer">
32+
<a href="https://virt-manager.org/download" target="_blank" rel="noopener noreferrer">
3333
virt-manager.org
3434
</a>
3535
</div>

packages/module/src/components/DesktopViewer/__snapshots__/DesktopViewer.test.tsx.snap

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ exports[`DesktopViewer default MoreInformationContent 1`] = `
126126
<div>
127127
Download the MSI from
128128
<a
129-
href="https://virt-manager.org/download/"
129+
href="https://virt-manager.org/download"
130130
rel="noopener noreferrer"
131131
target="_blank"
132132
>
@@ -160,7 +160,11 @@ exports[`DesktopViewer empty 1`] = `
160160
disabled=""
161161
type="button"
162162
>
163-
Launch Remote Viewer
163+
<span
164+
class="pf-v6-c-button__text"
165+
>
166+
Launch Remote Viewer
167+
</span>
164168
</button>
165169
</div>
166170
</div>
@@ -205,7 +209,11 @@ exports[`DesktopViewer with Spice and VNC 1`] = `
205209
data-ouia-safe="true"
206210
type="button"
207211
>
208-
Launch Remote Viewer
212+
<span
213+
class="pf-v6-c-button__text"
214+
>
215+
Launch Remote Viewer
216+
</span>
209217
</button>
210218
</div>
211219
<div
@@ -360,7 +368,7 @@ exports[`DesktopViewer with Spice and VNC 1`] = `
360368
<div>
361369
Download the MSI from
362370
<a
363-
href="https://virt-manager.org/download/"
371+
href="https://virt-manager.org/download"
364372
rel="noopener noreferrer"
365373
target="_blank"
366374
>
@@ -526,7 +534,11 @@ exports[`DesktopViewer with Spice, VNC and RDP (different hostname) 1`] = `
526534
data-ouia-safe="true"
527535
type="button"
528536
>
529-
Launch Remote Viewer
537+
<span
538+
class="pf-v6-c-button__text"
539+
>
540+
Launch Remote Viewer
541+
</span>
530542
</button>
531543
<button
532544
aria-disabled="false"
@@ -536,7 +548,11 @@ exports[`DesktopViewer with Spice, VNC and RDP (different hostname) 1`] = `
536548
data-ouia-safe="true"
537549
type="button"
538550
>
539-
Launch Remote Desktop
551+
<span
552+
class="pf-v6-c-button__text"
553+
>
554+
Launch Remote Desktop
555+
</span>
540556
</button>
541557
</div>
542558
<div
@@ -691,7 +707,7 @@ exports[`DesktopViewer with Spice, VNC and RDP (different hostname) 1`] = `
691707
<div>
692708
Download the MSI from
693709
<a
694-
href="https://virt-manager.org/download/"
710+
href="https://virt-manager.org/download"
695711
rel="noopener noreferrer"
696712
target="_blank"
697713
>
@@ -942,7 +958,11 @@ exports[`DesktopViewer with Spice, VNC and RDP 1`] = `
942958
data-ouia-safe="true"
943959
type="button"
944960
>
945-
Launch Remote Viewer
961+
<span
962+
class="pf-v6-c-button__text"
963+
>
964+
Launch Remote Viewer
965+
</span>
946966
</button>
947967
<button
948968
aria-disabled="false"
@@ -952,7 +972,11 @@ exports[`DesktopViewer with Spice, VNC and RDP 1`] = `
952972
data-ouia-safe="true"
953973
type="button"
954974
>
955-
Launch Remote Desktop
975+
<span
976+
class="pf-v6-c-button__text"
977+
>
978+
Launch Remote Desktop
979+
</span>
956980
</button>
957981
</div>
958982
<div
@@ -1107,7 +1131,7 @@ exports[`DesktopViewer with Spice, VNC and RDP 1`] = `
11071131
<div>
11081132
Download the MSI from
11091133
<a
1110-
href="https://virt-manager.org/download/"
1134+
href="https://virt-manager.org/download"
11111135
rel="noopener noreferrer"
11121136
target="_blank"
11131137
>

packages/module/src/components/SerialConsole/__snapshots__/SerialConsole.test.tsx.snap

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ exports[`SerialConsole in the DISCONNECTED state 1`] = `
3535
data-ouia-safe="true"
3636
type="button"
3737
>
38-
My text for Connect
38+
<span
39+
class="pf-v6-c-button__text"
40+
>
41+
My text for Connect
42+
</span>
3943
</button>
4044
</div>
4145
</div>
@@ -57,7 +61,11 @@ exports[`SerialConsole in the LOADING state 1`] = `
5761
data-ouia-safe="true"
5862
type="button"
5963
>
60-
Disconnect
64+
<span
65+
class="pf-v6-c-button__text"
66+
>
67+
Disconnect
68+
</span>
6169
</button>
6270
<button
6371
aria-disabled="false"
@@ -67,7 +75,11 @@ exports[`SerialConsole in the LOADING state 1`] = `
6775
data-ouia-safe="true"
6876
type="button"
6977
>
70-
Reset
78+
<span
79+
class="pf-v6-c-button__text"
80+
>
81+
Reset
82+
</span>
7183
</button>
7284
</div>
7385
<div
@@ -131,7 +143,11 @@ exports[`SerialConsole with CONNECTED state renders 1`] = `
131143
data-ouia-safe="true"
132144
type="button"
133145
>
134-
My text for Disconnect
146+
<span
147+
class="pf-v6-c-button__text"
148+
>
149+
My text for Disconnect
150+
</span>
135151
</button>
136152
<button
137153
aria-disabled="false"
@@ -141,7 +157,11 @@ exports[`SerialConsole with CONNECTED state renders 1`] = `
141157
data-ouia-safe="true"
142158
type="button"
143159
>
144-
Reset
160+
<span
161+
class="pf-v6-c-button__text"
162+
>
163+
Reset
164+
</span>
145165
</button>
146166
</div>
147167
<div

0 commit comments

Comments
 (0)