Skip to content

Commit

Permalink
fix: unify loading components
Browse files Browse the repository at this point in the history
  • Loading branch information
mmuzikar authored and tadayosi committed Mar 15, 2024
1 parent a84101d commit 95c2d5b
Show file tree
Hide file tree
Showing 4 changed files with 124 additions and 18 deletions.
2 changes: 1 addition & 1 deletion packages/online-shell/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@hawtio/online-kubernetes-api": "workspace:*",
"@hawtio/online-management-api": "workspace:*",
"@hawtio/online-oauth": "workspace:*",
"@hawtio/react": "^1.1.1",
"@hawtio/react": "^1.1.2",
"@patternfly/react-core": "^4.278.1",
"@patternfly/react-styles": "^4.92.6",
"@patternfly/react-table": "^4.113.7",
Expand Down
17 changes: 14 additions & 3 deletions packages/online-shell/src/bootstrap.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,27 @@
import { isMgmtApiRegistered } from '@hawtio/online-management-api'
import { onlineOAuth } from '@hawtio/online-oauth'
import { camel, configManager, hawtio, Hawtio, jmx, logs, quartz, rbac, runtime, springboot } from '@hawtio/react'
import {
camel,
configManager,
hawtio,
Hawtio,
HawtioLoadingPage,
jmx,
logs,
quartz,
rbac,
runtime,
springboot,
} from '@hawtio/react'
import React from 'react'
import ReactDOM from 'react-dom/client'
import { InitLoading } from './console/InitLoading'
import { discover } from './discover'
import { reportWebVitals } from './reportWebVitals'

configManager.addProductInfo('Hawtio Online', '__PACKAGE_VERSION_PLACEHOLDER__')

const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement)
root.render(<InitLoading />)
root.render(<HawtioLoadingPage />)

// Load OpenShift OAuth plugin first
onlineOAuth()
Expand Down
13 changes: 0 additions & 13 deletions packages/online-shell/src/console/InitLoading.tsx

This file was deleted.

110 changes: 109 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2183,7 +2183,7 @@ __metadata:
"@hawtio/online-kubernetes-api": "workspace:*"
"@hawtio/online-management-api": "workspace:*"
"@hawtio/online-oauth": "workspace:*"
"@hawtio/react": "npm:^1.1.1"
"@hawtio/react": "npm:^1.1.2"
"@patternfly/react-core": "npm:^4.278.1"
"@patternfly/react-styles": "npm:^4.92.6"
"@patternfly/react-table": "npm:^4.113.7"
Expand Down Expand Up @@ -2281,6 +2281,60 @@ __metadata:
languageName: node
linkType: hard

"@hawtio/react@npm:^1.1.2":
version: 1.1.2
resolution: "@hawtio/react@npm:1.1.2"
dependencies:
"@hawtio/camel-model-v4_0": "npm:@hawtio/camel-model@~4.0.4"
"@hawtio/camel-model-v4_4": "npm:@hawtio/camel-model@~4.4.0"
"@module-federation/utilities": "npm:^3.0.5"
"@patternfly/react-charts": "npm:~6.94.21"
"@patternfly/react-code-editor": "npm:~4.82.122"
"@patternfly/react-core": "npm:~4.278.1"
"@patternfly/react-table": "npm:~4.113.7"
"@testing-library/jest-dom": "npm:^6.4.2"
"@testing-library/react": "npm:^14.2.1"
"@testing-library/user-event": "npm:^14.5.2"
"@thumbmarkjs/thumbmarkjs": "npm:^0.14.4"
"@types/dagre": "npm:^0.7.52"
"@types/dagre-layout": "npm:^0.8.5"
"@types/jest": "npm:^29.5.12"
"@types/jquery": "npm:^3.5.29"
"@types/node": "npm:^18.19.23"
"@types/react": "npm:^18.2.23"
"@types/react-dom": "npm:^18.2.21"
"@types/react-router-dom": "npm:^5.3.3"
dagre: "npm:^0.8.5"
eventemitter3: "npm:^5.0.1"
jolokia.js: "npm:^2.0.0"
jquery: "npm:^3.7.1"
js-logger: "npm:^1.6.1"
jwt-decode: "npm:^4.0.0"
keycloak-js: "npm:^23.0.7"
monaco-editor: "npm:^0.47.0"
oauth4webapi: "npm:^2.10.3"
react: "npm:^18.2.0"
react-dom: "npm:^18.2.0"
react-markdown: "npm:^8.0.7"
react-monaco-editor: "npm:^0.55.0"
react-router-dom: "npm:^6.22.3"
react-split: "npm:^2.0.14"
reactflow: "npm:^11.10.4"
superstruct: "npm:^1.0.4"
typescript: "npm:^5.3.3"
xml-formatter: "npm:^3.6.2"
peerDependencies:
"@patternfly/react-core": ^4.278.1
keycloak-js: ^21
react: ^16.8 || ^17 || ^18
react-dom: ^16.8 || ^17 || ^18
peerDependenciesMeta:
keycloak-js:
optional: true
checksum: 10/b5eac62ef86edfa16c20c38fe6cbe42da340a44252ccaadcf21ee9907dac1445f433f056cb5305645566bc71323651c7b2ad8701e49b7b0d74ce1d94b4923f4a
languageName: node
linkType: hard

"@humanwhocodes/config-array@npm:^0.11.14":
version: 0.11.14
resolution: "@humanwhocodes/config-array@npm:0.11.14"
Expand Down Expand Up @@ -2937,6 +2991,13 @@ __metadata:
languageName: node
linkType: hard

"@remix-run/router@npm:1.15.3":
version: 1.15.3
resolution: "@remix-run/router@npm:1.15.3"
checksum: 10/43d402b4ad3dff6dee5c1bc0822aeeb4d885d11c74c45fca7f2f4d7e57853fddbbb813c372919bb3fcc63f95fbcffdd1d4ac1c406857ea07b9d09a09d0562c8e
languageName: node
linkType: hard

"@rollup/rollup-android-arm-eabi@npm:4.6.0":
version: 4.6.0
resolution: "@rollup/rollup-android-arm-eabi@npm:4.6.0"
Expand Down Expand Up @@ -3854,6 +3915,15 @@ __metadata:
languageName: node
linkType: hard

"@types/node@npm:^18.19.23":
version: 18.19.24
resolution: "@types/node@npm:18.19.24"
dependencies:
undici-types: "npm:~5.26.4"
checksum: 10/75aa69309d76c6be300d7264c462952ab0d37d69c289a0fd5d27ccf06273b3a9c745317c2004f757bdbcc8f48d693a625b5925c09cac77605979ecb825066627
languageName: node
linkType: hard

"@types/parse-json@npm:^4.0.0":
version: 4.0.1
resolution: "@types/parse-json@npm:4.0.1"
Expand Down Expand Up @@ -11270,6 +11340,13 @@ __metadata:
languageName: node
linkType: hard

"monaco-editor@npm:^0.47.0":
version: 0.47.0
resolution: "monaco-editor@npm:0.47.0"
checksum: 10/d4c21c9011dbe419f9474ccec525f29089f3d785314cf5643259d339e374d6bfde9db651cb084d4ea8942028f242cfe05d726c29a26894a827c368e9ec41e80e
languageName: node
linkType: hard

"mri@npm:^1.1.0":
version: 1.2.0
resolution: "mri@npm:1.2.0"
Expand Down Expand Up @@ -12438,6 +12515,19 @@ __metadata:
languageName: node
linkType: hard

"react-router-dom@npm:^6.22.3":
version: 6.22.3
resolution: "react-router-dom@npm:6.22.3"
dependencies:
"@remix-run/router": "npm:1.15.3"
react-router: "npm:6.22.3"
peerDependencies:
react: ">=16.8"
react-dom: ">=16.8"
checksum: 10/868a530c3167e1903f170818c0162760b8fbe9b10a7a7a79e5998990df341cd7127ba7819af4a9105af72c13453c7c4d76b2b07a70b56fff012fa0508b51940e
languageName: node
linkType: hard

"react-router@npm:6.22.2":
version: 6.22.2
resolution: "react-router@npm:6.22.2"
Expand All @@ -12449,6 +12539,17 @@ __metadata:
languageName: node
linkType: hard

"react-router@npm:6.22.3":
version: 6.22.3
resolution: "react-router@npm:6.22.3"
dependencies:
"@remix-run/router": "npm:1.15.3"
peerDependencies:
react: ">=16.8"
checksum: 10/df3948afd6500faf4b82a72375b9177536d878d54cad18e20a175efcbfdd0d94852aac59660d786946636ed325284d94a8f46652d898df304d6a29c9a3932afd
languageName: node
linkType: hard

"react-split@npm:^2.0.14":
version: 2.0.14
resolution: "react-split@npm:2.0.14"
Expand Down Expand Up @@ -13708,6 +13809,13 @@ __metadata:
languageName: node
linkType: hard

"superstruct@npm:^1.0.4":
version: 1.0.4
resolution: "superstruct@npm:1.0.4"
checksum: 10/9b3fd70a08c5ad3ea78b5c6b7ab90d31dde71af10448208d296c3d29ba2e55dfd817dfef75957163ee032163d04c4b2e0cb2fddff30313516aa60f748c1a48da
languageName: node
linkType: hard

"supports-color@npm:^5.3.0":
version: 5.5.0
resolution: "supports-color@npm:5.5.0"
Expand Down

0 comments on commit 95c2d5b

Please sign in to comment.