Skip to content

Commit ed317dc

Browse files
kmcfaulkmcfaul
authored
update v6 alphas (#54)
* update v6 alphas * update node version in gh workflows
1 parent 994c416 commit ed317dc

File tree

21 files changed

+719
-566
lines changed

21 files changed

+719
-566
lines changed

‎.github/workflows/build-lint-test.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ jobs:
1616
fi
1717
- uses: actions/setup-node@v1
1818
with:
19-
node-version: '14'
19+
node-version: '18'
2020
- uses: actions/cache@v2
2121
id: yarn-cache
2222
name: Cache npm deps
2323
with:
2424
path: |
25-
node_modules
26-
**/node_modules
25+
node_modules
26+
**/node_modules
2727
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
2828
- run: yarn install --frozen-lockfile
2929
if: steps.yarn-cache.outputs.cache-hit != 'true'
@@ -52,14 +52,14 @@ jobs:
5252
fi
5353
- uses: actions/setup-node@v1
5454
with:
55-
node-version: '14'
55+
node-version: '18'
5656
- uses: actions/cache@v2
5757
id: yarn-cache
5858
name: Cache npm deps
5959
with:
6060
path: |
61-
node_modules
62-
**/node_modules
61+
node_modules
62+
**/node_modules
6363
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
6464
- run: yarn install --frozen-lockfile
6565
if: steps.yarn-cache.outputs.cache-hit != 'true'
@@ -89,15 +89,15 @@ jobs:
8989
fi
9090
- uses: actions/setup-node@v1
9191
with:
92-
node-version: '14'
92+
node-version: '18'
9393
- uses: actions/cache@v2
9494
id: yarn-cache
9595
name: Cache npm deps
9696
with:
9797
path: |
98-
node_modules
99-
**/node_modules
100-
~/.cache/Cypress
98+
node_modules
99+
**/node_modules
100+
~/.cache/Cypress
101101
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
102102
- run: yarn install --frozen-lockfile
103103
if: steps.yarn-cache.outputs.cache-hit != 'true'
@@ -130,15 +130,15 @@ jobs:
130130
fi
131131
- uses: actions/setup-node@v1
132132
with:
133-
node-version: '14'
133+
node-version: '18'
134134
- uses: actions/cache@v2
135135
id: yarn-cache
136136
name: Cache npm deps
137137
with:
138138
path: |
139-
node_modules
140-
**/node_modules
141-
~/.cache/Cypress
139+
node_modules
140+
**/node_modules
141+
~/.cache/Cypress
142142
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
143143
- run: yarn install --frozen-lockfile
144144
if: steps.yarn-cache.outputs.cache-hit != 'true'

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ jobs:
3232
if: steps.setup-cache.outputs.cache-hit != 'true'
3333
- uses: actions/setup-node@v1
3434
with:
35-
node-version: '14'
35+
node-version: '18'
3636
- uses: actions/cache@v2
3737
id: yarn-cache
3838
name: Cache npm deps
3939
with:
4040
path: |
41-
node_modules
42-
**/node_modules
41+
node_modules
42+
**/node_modules
4343
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
4444
- run: yarn install --frozen-lockfile
4545
if: steps.yarn-cache.outputs.cache-hit != 'true'
@@ -52,4 +52,4 @@ jobs:
5252
key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
5353
- name: Build dist
5454
run: yarn build
55-
if: steps.dist.outputs.cache-hit != 'true'
55+
if: steps.dist.outputs.cache-hit != 'true'

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
- uses: actions/checkout@v2
1818
- uses: actions/setup-node@v1
1919
with:
20-
node-version: '14'
20+
node-version: '18'
2121
- uses: actions/cache@v2
2222
id: yarn-cache
2323
name: Cache npm deps
2424
with:
2525
path: |
26-
node_modules
27-
**/node_modules
28-
~/.cache/Cypress
26+
node_modules
27+
**/node_modules
28+
~/.cache/Cypress
2929
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
3030
- run: yarn install --frozen-lockfile
3131
if: steps.yarn-cache.outputs.cache-hit != 'true'

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
],
1010
"scripts": {
1111
"build": "yarn workspace @patternfly/react-console build",
12+
"build:watch": "npm run build:watch -w @patternfly/react-console",
1213
"build:docs": "yarn workspace @patternfly/react-console docs:build",
13-
"start": "yarn build && concurrently --kill-others \"yarn workspace @patternfly/react-console docs:develop\"",
14+
"start": "concurrently --kill-others \"npm run build:watch\" \"npm run docs:develop -w @patternfly/react-console\"",
1415
"serve:docs": "yarn workspace @patternfly/react-console docs:serve",
1516
"clean": "yarn workspace @patternfly/react-console clean",
1617
"lint:js": "node --max-old-space-size=4096 node_modules/.bin/eslint packages --ext js,jsx,ts,tsx --cache",

‎packages/module/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"module": "dist/esm/index.js",
77
"scripts": {
88
"build": "yarn build:esm && yarn build:cjs",
9+
"build:watch": "npm run build:esm -- --watch",
910
"build:esm": "tsc --build --verbose ./tsconfig.json",
1011
"build:cjs": "tsc --build --verbose ./tsconfig.cjs.json",
1112
"clean": "rimraf dist",
@@ -34,8 +35,8 @@
3435
},
3536
"dependencies": {
3637
"@novnc/novnc": "^1.3.0",
37-
"@patternfly/react-core": "^6.0.0-alpha.1",
38-
"@patternfly/react-styles": "^6.0.0-alpha.1",
38+
"@patternfly/react-core": "6.0.0-alpha.50",
39+
"@patternfly/react-styles": "6.0.0-alpha.19",
3940
"@spice-project/spice-html5": "^0.2.1",
4041
"file-saver": "^1.3.8",
4142
"xterm": "^4.8.1",
@@ -46,14 +47,13 @@
4647
"react-dom": "^17 || ^18"
4748
},
4849
"devDependencies": {
49-
"@patternfly/documentation-framework": "^5.0.15",
50-
"@patternfly/patternfly": "^6.0.0-alpha.9",
50+
"@patternfly/documentation-framework": "6.0.0-alpha.20",
51+
"@patternfly/patternfly": "6.0.0-alpha.117",
5152
"@patternfly/patternfly-a11y": "^4.3.1",
52-
"@patternfly/react-code-editor": "^6.0.0-alpha.1",
53-
"@patternfly/react-table": "^6.0.0-alpha.1",
53+
"@patternfly/react-code-editor": "6.0.0-alpha.50",
54+
"@patternfly/react-table": "6.0.0-alpha.50",
5455
"rimraf": "^2.6.2",
5556
"serve": "^14.1.2",
56-
"react-monaco-editor": "^0.51.0",
5757
"monaco-editor": "^0.34.1"
5858
}
5959
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const pageData = {
1414
"section": "extensions",
1515
"subsection": "",
1616
"deprecated": false,
17+
"template": false,
1718
"beta": true,
1819
"demo": false,
1920
"newImplementationLink": false,
@@ -362,9 +363,7 @@ pageData.liveContext = {
362363
SerialConsoleCustom,
363364
debounce
364365
};
365-
pageData.relativeImports = {
366-
367-
};
366+
pageData.relativeImports = "import { SerialConsoleCustom } from 'content/extensions/react-console/examples/./SerialConsoleCustom.jsx';"
368367
pageData.examples = {
369368
'Basic Usage': props =>
370369
<Example {...pageData} {...props} thumbnail={srcImportbasicusage} {...{"code":"import React from 'react';\nimport { AccessConsoles, SerialConsole, VncConsole, DesktopViewer } from '@patternfly/react-console';\nimport { SerialConsoleCustom } from './SerialConsoleCustom.jsx';\nimport { debounce } from '@patternfly/react-core';\n\nAccessConsolesVariants = () => {\n const [status, setStatus] = React.useState('disconnected');\n const setConnected = React.useRef(debounce(() => setStatus('connected'), 3000)).current;\n const onConnect = React.useCallback(() => {\n setStatus('loading');\n setConnected();\n }, [setConnected])\n const onDisconnect = React.useCallback(() => setStatus('disconnected'), [])\n const ref = React.createRef();\n\n return (\n <AccessConsoles preselectedType=\"SerialConsole\">\n <VncConsole host=\"localhost\" port=\"9090\" encrypt shared />\n <SerialConsole\n onConnect={onConnect}\n status={status}\n onDisconnect={onDisconnect}\n onData={data => {\n ref.current.onDataReceived(data);\n }}\n ref={ref}\n />\n <SerialConsoleCustom type='Serial Console pty2' />\n <DesktopViewer spice={{ address: '127.0.0.1', port: '5900' }} vnc={{ address: '127.0.0.1', port: '5901' }} />\n </AccessConsoles>\n );\n};","title":"Basic Usage","lang":"js","isFullscreen":true}}>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export const AccessConsoles: React.FunctionComponent<AccessConsolesProps> = ({
7070
const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
7171
<MenuToggle
7272
ref={toggleRef}
73-
id="pf-v5-c-console__type-selector"
73+
id="pf-v6-c-console__type-selector"
7474
onClick={onToggleClick}
7575
aria-label="Console type toggle"
7676
isExpanded={isOpen}

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

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,44 @@
33
exports[`AccessConsoles Empty 1`] = `
44
<DocumentFragment>
55
<div
6-
class="pf-v5-c-console"
6+
class="pf-v6-c-console"
77
/>
88
</DocumentFragment>
99
`;
1010

1111
exports[`AccessConsoles with DesktopViewer 1`] = `
1212
<DocumentFragment>
1313
<div
14-
class="pf-v5-c-console"
14+
class="pf-v6-c-console"
1515
/>
1616
</DocumentFragment>
1717
`;
1818

1919
exports[`AccessConsoles with SerialConsole and VncConsole as children 1`] = `
2020
<DocumentFragment>
2121
<div
22-
class="pf-v5-c-console"
22+
class="pf-v6-c-console"
2323
>
2424
<div
25-
class="pf-v5-c-console__actions"
25+
class="pf-v6-c-console__actions"
2626
>
2727
<button
2828
aria-expanded="false"
2929
aria-label="Console type toggle"
30-
class="pf-v5-c-menu-toggle"
31-
id="pf-v5-c-console__type-selector"
30+
class="pf-v6-c-menu-toggle"
31+
id="pf-v6-c-console__type-selector"
3232
style="width: 100%;"
3333
type="button"
3434
>
3535
<span
36-
class="pf-v5-c-menu-toggle__text"
37-
/>
38-
<span
39-
class="pf-v5-c-menu-toggle__controls"
36+
class="pf-v6-c-menu-toggle__controls"
4037
>
4138
<span
42-
class="pf-v5-c-menu-toggle__toggle-icon"
39+
class="pf-v6-c-menu-toggle__toggle-icon"
4340
>
4441
<svg
4542
aria-hidden="true"
46-
class="pf-v5-svg"
43+
class="pf-v6-svg"
4744
fill="currentColor"
4845
height="1em"
4946
role="img"
@@ -65,30 +62,30 @@ exports[`AccessConsoles with SerialConsole and VncConsole as children 1`] = `
6562
exports[`AccessConsoles with SerialConsole as a single child 1`] = `
6663
<DocumentFragment>
6764
<div
68-
class="pf-v5-c-console"
65+
class="pf-v6-c-console"
6966
/>
7067
</DocumentFragment>
7168
`;
7269

7370
exports[`AccessConsoles with VncConsole as a single child 1`] = `
7471
<DocumentFragment>
7572
<div
76-
class="pf-v5-c-console"
73+
class="pf-v6-c-console"
7774
/>
7875
</DocumentFragment>
7976
`;
8077

8178
exports[`AccessConsoles with preselected SerialConsole 1`] = `
8279
<DocumentFragment>
8380
<div
84-
class="pf-v5-c-console"
81+
class="pf-v6-c-console"
8582
>
8683
<div
87-
class="pf-v5-c-console__actions-serial"
84+
class="pf-v6-c-console__actions-serial"
8885
>
8986
<button
9087
aria-disabled="false"
91-
class="pf-v5-c-button pf-m-secondary"
88+
class="pf-v6-c-button pf-m-secondary"
9289
data-ouia-component-id="OUIA-Generated-Button-secondary-1"
9390
data-ouia-component-type="PF5/Button"
9491
data-ouia-safe="true"
@@ -98,7 +95,7 @@ exports[`AccessConsoles with preselected SerialConsole 1`] = `
9895
</button>
9996
<button
10097
aria-disabled="false"
101-
class="pf-v5-c-button pf-m-secondary"
98+
class="pf-v6-c-button pf-m-secondary"
10299
data-ouia-component-id="OUIA-Generated-Button-secondary-2"
103100
data-ouia-component-type="PF5/Button"
104101
data-ouia-safe="true"
@@ -108,42 +105,46 @@ exports[`AccessConsoles with preselected SerialConsole 1`] = `
108105
</button>
109106
</div>
110107
<div
111-
class="pf-v5-c-console__serial"
108+
class="pf-v6-c-console__serial"
112109
>
113110
<div
114-
class="pf-v5-c-empty-state"
111+
class="pf-v6-c-empty-state"
115112
>
116113
<div
117-
class="pf-v5-c-empty-state__content"
114+
class="pf-v6-c-empty-state__content"
118115
>
119116
<div
120-
class="pf-v5-c-empty-state__header"
117+
class="pf-v6-c-empty-state__header"
121118
>
122119
<div
123-
class="pf-v5-c-empty-state__icon"
120+
class="pf-v6-c-empty-state__icon"
124121
>
125122
<svg
126123
aria-hidden="false"
127124
aria-label="Contents"
128125
aria-valuetext="Loading..."
129-
class="pf-v5-c-spinner pf-m-xl"
126+
class="pf-v6-c-spinner pf-m-xl"
130127
role="progressbar"
131128
viewBox="0 0 100 100"
132129
>
133130
<circle
134-
class="pf-v5-c-spinner__path"
131+
class="pf-v6-c-spinner__path"
135132
cx="50"
136133
cy="50"
137134
fill="none"
138135
r="45"
139136
/>
140137
</svg>
141138
</div>
142-
</div>
143-
<div
144-
class="pf-v5-c-empty-state__body"
145-
>
146-
Loading ...
139+
<div
140+
class="pf-v6-c-empty-state__title"
141+
>
142+
<h1
143+
class="pf-v6-c-empty-state__title-text"
144+
>
145+
Loading ...
146+
</h1>
147+
</div>
147148
</div>
148149
</div>
149150
</div>
@@ -155,7 +156,7 @@ exports[`AccessConsoles with preselected SerialConsole 1`] = `
155156
exports[`AccessConsoles with wrapped SerialConsole as a child 1`] = `
156157
<DocumentFragment>
157158
<div
158-
class="pf-v5-c-console"
159+
class="pf-v6-c-console"
159160
>
160161
<p>
161162
Serial console text

‎packages/module/src/components/DesktopViewer/ConnectWithRemoteViewer.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ export const ConnectWithRemoteViewer: React.FunctionComponent<ConnectWithRemoteV
9797
// RDP button is rendered only if the protocol is available
9898
// If none of Spice or VNC is available, the .vv button is disabled (but rendered)
9999
return (
100-
<div className="pf-v5-c-console__remote-viewer">
101-
<div className="pf-v5-c-console__remote-viewer-launch">
102-
<Button className="pf-v5-c-console__remote-viewer-launch-vv" onClick={onClickVV} isDisabled={!_console}>
100+
<div className="pf-v6-c-console__remote-viewer">
101+
<div className="pf-v6-c-console__remote-viewer-launch">
102+
<Button className="pf-v6-c-console__remote-viewer-launch-vv" onClick={onClickVV} isDisabled={!_console}>
103103
{textConnectWithRemoteViewer}
104104
</Button>
105105
{!!rdp && (
106-
<Button onClick={onClickRDP} className="pf-v5-c-console__remote-viewer-launch-rdp">
106+
<Button onClick={onClickRDP} className="pf-v6-c-console__remote-viewer-launch-rdp">
107107
{textConnectWithRDP}
108108
</Button>
109109
)}

‎packages/module/src/components/DesktopViewer/ManualConnection.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export const ManualConnection: React.FunctionComponent<ManualConnectionProps> =
6161
const rdpAddress = rdp && rdp.address !== address ? rdp.address : null;
6262

6363
return (
64-
<div className="pf-v5-c-console__manual-connection">
64+
<div className="pf-v6-c-console__manual-connection">
6565
<Title headingLevel="h2" size="3xl">
6666
{textManualConnection}
6767
</Title>

0 commit comments

Comments
 (0)