You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2023/08/11 15:52:40 UTC
[camel-karavan] branch main updated: Fix #851
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 203469d0 Fix #851
203469d0 is described below
commit 203469d09dced4f70f68869413352138ee3c129b
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Fri Aug 11 11:52:28 2023 -0400
Fix #851
---
.../camel/karavan/service/ProjectService.java | 2 +-
.../karavan-app/src/main/webui/package-lock.json | 570 ++++++++++-----------
.../karavan-app/src/main/webui/package.json | 14 +-
.../src/main/webui/src/api/ProjectModels.ts | 4 +-
.../webui/src/containers/ContainerTableRow.tsx | 2 +-
.../main/webui/src/containers/ContainersPage.tsx | 34 +-
.../src/main/webui/src/dashboard/DashboardPage.tsx | 38 +-
.../webui/src/designer/beans/BeanProperties.tsx | 37 +-
.../src/main/webui/src/designer/karavan.css | 273 +++++-----
.../webui/src/designer/rest/RestMethodSelector.tsx | 2 +-
.../main/webui/src/designer/route/DslElement.tsx | 8 +-
.../webui/src/designer/route/DslProperties.tsx | 4 +-
.../main/webui/src/designer/route/DslSelector.tsx | 10 +-
.../webui/src/designer/route/RouteDesigner.tsx | 2 +-
.../route/property/ComponentParameterField.tsx | 49 +-
.../designer/route/property/DataFormatField.tsx | 19 +-
.../designer/route/property/DslPropertyField.tsx | 112 ++--
.../designer/route/property/ExpressionField.tsx | 26 +-
.../route/property/InfrastructureSelector.tsx | 22 +-
.../route/property/KameletPropertyField.tsx | 10 +-
.../src/designer/route/property/ModalEditor.tsx | 6 +-
.../src/designer/templates/TemplatesDesigner.tsx | 7 +-
.../webui/src/designer/utils/KaravanComponents.tsx | 4 +-
.../karavan-app/src/main/webui/src/index.css | 87 ++--
.../webui/src/knowledgebase/KnowledgebasePage.tsx | 4 +-
.../knowledgebase/components/ComponentModal.tsx | 15 +-
.../main/webui/src/knowledgebase/eip/EipCard.tsx | 6 +-
.../main/webui/src/knowledgebase/eip/EipModal.tsx | 15 +-
.../src/knowledgebase/kamelets/KameletCard.tsx | 2 +-
.../src/knowledgebase/kamelets/KameletModal.tsx | 15 +-
.../src/main/webui/src/main/DataPoller.tsx | 20 +-
.../karavan-app/src/main/webui/src/main/Main.tsx | 4 +-
.../src/main/webui/src/main/MainLogin.tsx | 4 +-
.../src/main/webui/src/main/PageNavigation.tsx | 4 +-
.../src/main/webui/src/project/DevModeToolbar.tsx | 14 +-
.../src/main/webui/src/project/ProjectToolbar.tsx | 10 +-
.../webui/src/project/file/PropertiesTable.tsx | 16 +-
.../main/webui/src/project/file/PropertyField.tsx | 4 +-
.../webui/src/project/files/CreateFileModal.tsx | 6 +-
.../src/main/webui/src/project/files/FilesTab.tsx | 26 +-
.../main/webui/src/project/files/FilesToolbar.tsx | 10 +-
.../webui/src/project/files/UploadFileModal.tsx | 30 +-
.../main/webui/src/project/log/ProjectLogPanel.tsx | 4 +-
.../webui/src/project/pipeline/ProjectStatus.tsx | 10 +-
.../src/main/webui/src/project/trace/TraceTab.tsx | 26 +-
.../main/webui/src/projects/CreateProjectModal.tsx | 19 +-
.../src/main/webui/src/projects/ProjectsPage.tsx | 28 +-
.../main/webui/src/services/CreateServiceModal.tsx | 17 +-
.../src/main/webui/src/services/ServicesPage.tsx | 25 +-
.../main/webui/src/services/ServicesTableRow.tsx | 8 +-
50 files changed, 871 insertions(+), 813 deletions(-)
diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
index ca23c82a..8d042d71 100644
--- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
+++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
@@ -47,7 +47,7 @@ public class ProjectService implements HealthCheck{
private static final Logger LOGGER = Logger.getLogger(ProjectService.class.getName());
- @ConfigProperty(name = "karavan.git.pull.interval")
+ @ConfigProperty(name = "karavan.git-pull-interval")
String gitPullInterval;
@Inject
diff --git a/karavan-web/karavan-app/src/main/webui/package-lock.json b/karavan-web/karavan-app/src/main/webui/package-lock.json
index e3955924..422f0e5b 100644
--- a/karavan-web/karavan-app/src/main/webui/package-lock.json
+++ b/karavan-web/karavan-app/src/main/webui/package-lock.json
@@ -9,12 +9,12 @@
"version": "4.0.0-RC2",
"dependencies": {
"@microsoft/fetch-event-source": "^2.0.1",
- "@monaco-editor/react": "4.5.0",
- "@patternfly/patternfly": "4.224.2",
- "@patternfly/react-charts": "6.94.19",
- "@patternfly/react-core": "4.276.8",
- "@patternfly/react-log-viewer": "4.87.100",
- "@patternfly/react-table": "4.113.0",
+ "@monaco-editor/react": "4.5.1",
+ "@patternfly/patternfly": "^5.0.2",
+ "@patternfly/react-charts": "^7.0.0",
+ "@patternfly/react-core": "^5.0.0",
+ "@patternfly/react-log-viewer": "^5.0.0",
+ "@patternfly/react-table": "^5.0.0",
"@types/js-yaml": "4.0.5",
"@types/lodash.debounce": "^4.0.7",
"@types/node": "18.16.3",
@@ -41,9 +41,9 @@
"@typescript-eslint/eslint-plugin": "^5.51.0",
"@typescript-eslint/parser": "^5.51.0",
"eslint": "^8.33.0",
- "monaco-editor": "0.36.1",
+ "monaco-editor": "0.41.0",
"react-scripts": "^5.0.1",
- "typescript": "^5.1"
+ "typescript": "^4.9.5"
}
},
"../../../../../karavan-core": {
@@ -3230,9 +3230,9 @@
}
},
"node_modules/@monaco-editor/react": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.5.0.tgz",
- "integrity": "sha512-VJMkp5Fe1+w8pLEq8tZPHZKu8zDXQIA1FtiDTSNccg1D3wg1YIZaH2es2Qpvop1k62g3c/YySRb3bnGXu2XwYQ==",
+ "version": "4.5.1",
+ "resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.5.1.tgz",
+ "integrity": "sha512-NNDFdP+2HojtNhCkRfE6/D6ro6pBNihaOzMbGK84lNWzRu+CfBjwzGt4jmnqimLuqp5yE5viHS2vi+QOAnD5FQ==",
"dependencies": {
"@monaco-editor/loader": "^1.3.3"
},
@@ -3287,112 +3287,110 @@
}
},
"node_modules/@patternfly/patternfly": {
- "version": "4.224.2",
- "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.224.2.tgz",
- "integrity": "sha512-HGNV26uyHSIECuhjPg/WGn0mXbAotcs6ODfhAOkfYjIgGylddgiwElxUe1rpEHV5mQJJ2rMn4OdeJIIpzRX61g=="
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-5.0.2.tgz",
+ "integrity": "sha512-PB8+MLdYVgF1hIOxGmnVsZG+YHUX3RePe5W1oMS4gS00EmSgw1cobr1Qbpy/BqqS8/R9DRN4hZ2FKDT0d5tkFQ=="
},
"node_modules/@patternfly/react-charts": {
- "version": "6.94.19",
- "resolved": "https://registry.npmjs.org/@patternfly/react-charts/-/react-charts-6.94.19.tgz",
- "integrity": "sha512-+yYwXAy/GBH2bTHFzMpdVKc8LUJCCNEqqS7bqovNkNLd0m3FP3q9fKJ22QxNnP9NeFHK6UFa4KfouQAb2fInfQ==",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/@patternfly/react-charts/-/react-charts-7.0.0.tgz",
+ "integrity": "sha512-lRR5iXJeTWbEqMlIcqnVA9DHurn8MJNDnwtEDcrzCH5g28MCXGosQjhXqsnz3LVGtHcBsQcpxMIv8WO5rfJHOA==",
"dependencies": {
- "@patternfly/react-styles": "^4.92.6",
- "@patternfly/react-tokens": "^4.94.6",
+ "@patternfly/react-styles": "^5.0.0",
+ "@patternfly/react-tokens": "^5.0.0",
"hoist-non-react-statics": "^3.3.0",
"lodash": "^4.17.19",
- "tslib": "^2.0.0",
- "victory-area": "^36.6.7",
- "victory-axis": "^36.6.7",
- "victory-bar": "^36.6.7",
- "victory-chart": "^36.6.7",
- "victory-core": "^36.6.7",
- "victory-create-container": "^36.6.7",
- "victory-cursor-container": "^36.6.7",
- "victory-group": "^36.6.7",
- "victory-legend": "^36.6.7",
- "victory-line": "^36.6.7",
- "victory-pie": "^36.6.7",
- "victory-scatter": "^36.6.7",
- "victory-stack": "^36.6.7",
- "victory-tooltip": "^36.6.7",
- "victory-voronoi-container": "^36.6.7",
- "victory-zoom-container": "^36.6.7"
- },
- "peerDependencies": {
- "react": "^16.8 || ^17 || ^18",
- "react-dom": "^16.8 || ^17 || ^18"
+ "tslib": "^2.5.0",
+ "victory-area": "^36.6.11",
+ "victory-axis": "^36.6.11",
+ "victory-bar": "^36.6.11",
+ "victory-box-plot": "^36.6.11",
+ "victory-chart": "^36.6.11",
+ "victory-core": "^36.6.11",
+ "victory-create-container": "^36.6.11",
+ "victory-cursor-container": "^36.6.11",
+ "victory-group": "^36.6.11",
+ "victory-legend": "^36.6.11",
+ "victory-line": "^36.6.11",
+ "victory-pie": "^36.6.11",
+ "victory-scatter": "^36.6.11",
+ "victory-stack": "^36.6.11",
+ "victory-tooltip": "^36.6.11",
+ "victory-voronoi-container": "^36.6.11",
+ "victory-zoom-container": "^36.6.11"
+ },
+ "peerDependencies": {
+ "react": "^17 || ^18",
+ "react-dom": "^17 || ^18"
}
},
"node_modules/@patternfly/react-core": {
- "version": "4.276.8",
- "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.276.8.tgz",
- "integrity": "sha512-dn322rEzBeiVztZEuCZMUUittNb8l1hk30h9ZN31FLZLLVtXGlThFNV9ieqOJYA9zrYxYZrHMkTnOxSWVacMZg==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-5.0.0.tgz",
+ "integrity": "sha512-kewRVFhLw0Dvt8250pqrO47sVRx8E93sMGZbHQomJnZdachYeQ9STnQTP2gvOBq/GPnMei0LZLv0T99g8mPE4w==",
"dependencies": {
- "@patternfly/react-icons": "^4.93.6",
- "@patternfly/react-styles": "^4.92.6",
- "@patternfly/react-tokens": "^4.94.6",
- "focus-trap": "6.9.2",
- "react-dropzone": "9.0.0",
- "tippy.js": "5.1.2",
- "tslib": "^2.0.0"
+ "@patternfly/react-icons": "^5.0.0",
+ "@patternfly/react-styles": "^5.0.0",
+ "@patternfly/react-tokens": "^5.0.0",
+ "focus-trap": "7.4.3",
+ "react-dropzone": "^14.2.3",
+ "tslib": "^2.5.0"
},
"peerDependencies": {
- "react": "^16.8 || ^17 || ^18",
- "react-dom": "^16.8 || ^17 || ^18"
+ "react": "^17 || ^18",
+ "react-dom": "^17 || ^18"
}
},
"node_modules/@patternfly/react-icons": {
- "version": "4.93.6",
- "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.93.6.tgz",
- "integrity": "sha512-ZrXegc/81oiuTIeWvoHb3nG/eZODbB4rYmekBEsrbiysyO7m/sUFoi/RLvgFINrRoh6YCJqL5fj06Jg6d7jX1g==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-5.0.0.tgz",
+ "integrity": "sha512-GG5Y/UYl0h346MyDU9U650Csaq4Mxk8S6U8XC7ERk/xIrRr2RF67O2uY7zKBDMTNLYdBvPzgc2s3OMV1+d2/mg==",
"peerDependencies": {
- "react": "^16.8 || ^17 || ^18",
- "react-dom": "^16.8 || ^17 || ^18"
+ "react": "^17 || ^18",
+ "react-dom": "^17 || ^18"
}
},
"node_modules/@patternfly/react-log-viewer": {
- "version": "4.87.100",
- "resolved": "https://registry.npmjs.org/@patternfly/react-log-viewer/-/react-log-viewer-4.87.100.tgz",
- "integrity": "sha512-FG+oZDnymvtWNTSSNSQ573NCikpCKr1Iq0Fz5FOSeqW/rLxvuJPqBnlK+A4nUORvxvYc3DhBri2ycCaZMoZfPg==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/@patternfly/react-log-viewer/-/react-log-viewer-5.0.0.tgz",
+ "integrity": "sha512-N4E1HAfXVlPDsvCvXhh7ycO/pu8h7nGBjQgGV7mUWQb23Q8djuzPU3aK/QODVEP6ZCnlvq2AbaKUpaLiE5z4ww==",
"dependencies": {
- "@patternfly/react-core": "^4.273.1",
- "@patternfly/react-icons": "^4.93.4",
- "@patternfly/react-styles": "^4.92.4",
- "memoize-one": "^5.1.0",
- "resize-observer-polyfill": "^1.5.1",
- "tslib": "^2.0.0"
+ "@patternfly/react-core": "^5.0.0",
+ "@patternfly/react-icons": "^5.0.0",
+ "@patternfly/react-styles": "^5.0.0",
+ "memoize-one": "^5.1.0"
},
"peerDependencies": {
- "react": "^16.8 || ^17 || ^18",
- "react-dom": "^16.8 || ^17 || ^18"
+ "react": "^17 || ^18",
+ "react-dom": "^17 || ^18"
}
},
"node_modules/@patternfly/react-styles": {
- "version": "4.92.6",
- "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.92.6.tgz",
- "integrity": "sha512-b8uQdEReMyeoMzjpMri845QxqtupY/tIFFYfVeKoB2neno8gkcW1RvDdDe62LF88q45OktCwAe/8A99ker10Iw=="
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-5.0.0.tgz",
+ "integrity": "sha512-xbSCgjx+fPrXbIzUznwTFWtJEbzVS0Wn4zrejdKJYQTY+4YcuPlFkeq2tl3syzwGsaYMpHiFwQiTaKyTvlwtuw=="
},
"node_modules/@patternfly/react-table": {
- "version": "4.113.0",
- "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.113.0.tgz",
- "integrity": "sha512-qxa3NWCdYasqQQL1rqEd8DyNa8oWr6HNveNW5YJRakE7imWZhUPG2Nd6Op60+KYX8kbCSl7gwSmgAZAYMBMZkQ==",
- "dependencies": {
- "@patternfly/react-core": "^4.276.8",
- "@patternfly/react-icons": "^4.93.6",
- "@patternfly/react-styles": "^4.92.6",
- "@patternfly/react-tokens": "^4.94.6",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-5.0.0.tgz",
+ "integrity": "sha512-Q3MBo9+ZmBvLJzVHxmV9f/4qQAz5Si743zVLHRwjh+tjbn/DrcbxJdT8Uxa3NGKkpvszzgi/LPeXipJOHOELug==",
+ "dependencies": {
+ "@patternfly/react-core": "^5.0.0",
+ "@patternfly/react-icons": "^5.0.0",
+ "@patternfly/react-styles": "^5.0.0",
+ "@patternfly/react-tokens": "^5.0.0",
"lodash": "^4.17.19",
- "tslib": "^2.0.0"
+ "tslib": "^2.5.0"
},
"peerDependencies": {
- "react": "^16.8 || ^17 || ^18",
- "react-dom": "^16.8 || ^17 || ^18"
+ "react": "^17 || ^18",
+ "react-dom": "^17 || ^18"
}
},
"node_modules/@patternfly/react-tokens": {
- "version": "4.94.6",
- "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.94.6.tgz",
- "integrity": "sha512-tm7C6nat+uKMr1hrapis7hS3rN9cr41tpcCKhx6cod6FLU8KwF2Yt5KUxakhIOCEcE/M/EhXhAw/qejp8w0r7Q=="
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-5.0.0.tgz",
+ "integrity": "sha512-to2CXIZ6WTuzBcjLZ+nXi5LhnYkSIDu3RBMRZwrplmECOoUWv87CC+2T0EVxtASRtpQfikjD2PDKMsif5i0BxQ=="
},
"node_modules/@pmmmwh/react-refresh-webpack-plugin": {
"version": "0.5.10",
@@ -3916,9 +3914,9 @@
}
},
"node_modules/@types/d3-array": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.0.4.tgz",
- "integrity": "sha512-nwvEkG9vYOc0Ic7G7kwgviY4AQlTfYGIZ0fqB7CQHXGyYM6nO7kJh5EguSNA3jfh4rq7Sb7eMVq8isuvg2/miQ=="
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.0.5.tgz",
+ "integrity": "sha512-Qk7fpJ6qFp+26VeQ47WY0mkwXaiq8+76RJcncDEfMc2ocRzXLO67bLFRNI4OX1aGBoPzsM5Y2T+/m1pldOgD+A=="
},
"node_modules/@types/d3-color": {
"version": "3.1.0",
@@ -4323,9 +4321,9 @@
}
},
"node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
- "version": "7.5.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
- "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
@@ -4486,9 +4484,9 @@
}
},
"node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
- "version": "7.5.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
- "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
@@ -4545,9 +4543,9 @@
}
},
"node_modules/@typescript-eslint/utils/node_modules/semver": {
- "version": "7.5.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
- "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
@@ -5135,12 +5133,9 @@
}
},
"node_modules/attr-accept": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-1.1.3.tgz",
- "integrity": "sha512-iT40nudw8zmCweivz6j58g+RT33I4KbaIvRUhjNmDwO2WmsQUxFEZZYZ5w3vXe5x5MX9D7mfvA/XaLOZYFR9EQ==",
- "dependencies": {
- "core-js": "^2.5.0"
- },
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.2.tgz",
+ "integrity": "sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg==",
"engines": {
"node": ">=4"
}
@@ -6215,6 +6210,7 @@
"version": "3.30.1",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.30.1.tgz",
"integrity": "sha512-ZNS5nbiSwDTq4hFosEDqm65izl2CWmLz0hARJMyNQBgkUZMIF51cQiMvIQKA6hvuaeWxQDP3hEedM1JZIgTldQ==",
+ "dev": true,
"hasInstallScript": true,
"funding": {
"type": "opencollective",
@@ -6379,9 +6375,9 @@
}
},
"node_modules/css-loader/node_modules/semver": {
- "version": "7.5.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
- "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
@@ -6717,9 +6713,9 @@
"dev": true
},
"node_modules/d3-array": {
- "version": "3.2.3",
- "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.3.tgz",
- "integrity": "sha512-JRHwbQQ84XuAESWhvIPaUV4/1UYTBOLiOPGWqgFDHZS1D5QN9c57FbH3QpEnQMYiOXNzKUQyGTZf+EVO7RT5TQ==",
+ "version": "3.2.4",
+ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
+ "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
"dependencies": {
"internmap": "1 - 2"
},
@@ -8542,14 +8538,14 @@
"integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
},
"node_modules/file-selector": {
- "version": "0.1.19",
- "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.1.19.tgz",
- "integrity": "sha512-kCWw3+Aai8Uox+5tHCNgMFaUdgidxvMnLWO6fM5sZ0hA2wlHP5/DHGF0ECe84BiB95qdJbKNEJhWKVDvMN+JDQ==",
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.6.0.tgz",
+ "integrity": "sha512-QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw==",
"dependencies": {
- "tslib": "^2.0.1"
+ "tslib": "^2.4.0"
},
"engines": {
- "node": ">= 10"
+ "node": ">= 12"
}
},
"node_modules/filelist": {
@@ -8689,11 +8685,11 @@
"dev": true
},
"node_modules/focus-trap": {
- "version": "6.9.2",
- "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.9.2.tgz",
- "integrity": "sha512-gBEuXOPNOKPrLdZpMFUSTyIo1eT2NSZRrwZ9r/0Jqw5tmT3Yvxfmu8KBHw8xW2XQkw6E/JoG+OlEq7UDtSUNgw==",
+ "version": "7.4.3",
+ "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.4.3.tgz",
+ "integrity": "sha512-BgSSbK4GPnS2VbtZ50VtOv1Sti6DIkj3+LkVjiWMNjLeAp1SH1UlLx3ULu/DCu4vq5R4/uvTm+zrvsMsuYmGLg==",
"dependencies": {
- "tabbable": "^5.3.2"
+ "tabbable": "^6.1.2"
}
},
"node_modules/follow-redirects": {
@@ -8883,9 +8879,9 @@
}
},
"node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
- "version": "7.5.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
- "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
@@ -11811,9 +11807,9 @@
}
},
"node_modules/jest-snapshot/node_modules/semver": {
- "version": "7.5.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
- "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
@@ -13149,9 +13145,9 @@
}
},
"node_modules/monaco-editor": {
- "version": "0.36.1",
- "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.36.1.tgz",
- "integrity": "sha512-/CaclMHKQ3A6rnzBzOADfwdSJ25BFoFT0Emxsc4zYVyav5SkK9iA6lEtIeuN/oRYbwPgviJT+t3l+sjFa28jYg=="
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.41.0.tgz",
+ "integrity": "sha512-1o4olnZJsiLmv5pwLEAmzHTE/5geLKQ07BrGxlF4Ri/AXAc2yyDGZwHjiTqD8D/ROKUZmwMA28A+yEowLNOEcA=="
},
"node_modules/ms": {
"version": "2.1.2",
@@ -13878,16 +13874,6 @@
"node": ">=4"
}
},
- "node_modules/popper.js": {
- "version": "1.16.1",
- "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
- "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
- "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/popperjs"
- }
- },
"node_modules/postcss": {
"version": "8.4.23",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz",
@@ -14463,9 +14449,9 @@
}
},
"node_modules/postcss-loader/node_modules/semver": {
- "version": "7.5.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
- "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
@@ -15306,18 +15292,6 @@
"react-is": "^16.13.1"
}
},
- "node_modules/prop-types-extra": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.1.tgz",
- "integrity": "sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==",
- "dependencies": {
- "react-is": "^16.3.2",
- "warning": "^4.0.0"
- },
- "peerDependencies": {
- "react": ">=0.14.0"
- }
- },
"node_modules/proxy-addr": {
"version": "2.0.7",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -15631,20 +15605,19 @@
}
},
"node_modules/react-dropzone": {
- "version": "9.0.0",
- "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-9.0.0.tgz",
- "integrity": "sha512-wZ2o9B2qkdE3RumWhfyZT9swgJYJPeU5qHEcMU8weYpmLex1eeWX0CC32/Y0VutB+BBi2D+iePV/YZIiB4kZGw==",
+ "version": "14.2.3",
+ "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-14.2.3.tgz",
+ "integrity": "sha512-O3om8I+PkFKbxCukfIR3QAGftYXDZfOE2N1mr/7qebQJHs7U+/RSL/9xomJNpRg9kM5h9soQSdf0Gc7OHF5Fug==",
"dependencies": {
- "attr-accept": "^1.1.3",
- "file-selector": "^0.1.8",
- "prop-types": "^15.6.2",
- "prop-types-extra": "^1.1.0"
+ "attr-accept": "^2.2.2",
+ "file-selector": "^0.6.0",
+ "prop-types": "^15.8.1"
},
"engines": {
- "node": ">= 6"
+ "node": ">= 10.13"
},
"peerDependencies": {
- "react": ">=0.14.0"
+ "react": ">= 16.8 || 18.0.0"
}
},
"node_modules/react-error-overlay": {
@@ -15654,9 +15627,9 @@
"dev": true
},
"node_modules/react-fast-compare": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.1.tgz",
- "integrity": "sha512-xTYf9zFim2pEif/Fw16dBiXpe0hoy5PxcD8+OwBnTtNLfIm3g6WxhKNurY+6OmdH1u6Ta/W/Vl6vjbYP1MFnDg=="
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
+ "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
},
"node_modules/react-is": {
"version": "16.13.1",
@@ -15758,9 +15731,9 @@
}
},
"node_modules/react-scripts/node_modules/semver": {
- "version": "7.5.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
- "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
@@ -15965,11 +15938,6 @@
"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
"dev": true
},
- "node_modules/resize-observer-polyfill": {
- "version": "1.5.1",
- "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
- "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
- },
"node_modules/resolve": {
"version": "1.22.2",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
@@ -16367,9 +16335,9 @@
}
},
"node_modules/semver": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
- "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"dev": true,
"bin": {
"semver": "bin/semver.js"
@@ -17203,9 +17171,9 @@
"dev": true
},
"node_modules/tabbable": {
- "version": "5.3.3",
- "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-5.3.3.tgz",
- "integrity": "sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA=="
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz",
+ "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew=="
},
"node_modules/tailwindcss": {
"version": "3.3.2",
@@ -17420,14 +17388,6 @@
"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
"dev": true
},
- "node_modules/tippy.js": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-5.1.2.tgz",
- "integrity": "sha512-Qtrv2wqbRbaKMUb6bWWBQWPayvcDKNrGlvihxtsyowhT7RLGEh1STWuy6EMXC6QLkfKPB2MLnf8W2mzql9VDAw==",
- "dependencies": {
- "popper.js": "^1.16.0"
- }
- },
"node_modules/tmpl": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
@@ -17465,9 +17425,9 @@
}
},
"node_modules/tough-cookie": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
- "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+ "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
"dev": true,
"dependencies": {
"psl": "^1.1.33",
@@ -17641,16 +17601,16 @@
}
},
"node_modules/typescript": {
- "version": "5.1.6",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
- "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==",
+ "version": "4.9.5",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+ "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
"dev": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
},
"engines": {
- "node": ">=14.17"
+ "node": ">=4.2.0"
}
},
"node_modules/unbox-primitive": {
@@ -17858,263 +17818,277 @@
}
},
"node_modules/victory-area": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-area/-/victory-area-36.6.10.tgz",
- "integrity": "sha512-4SRXvxupIe04SMKD8DSbh5ns0/bVw20Ylp4bDXXHgAIo47iu+NmqNxnZ2CKDJ7vxN0nWPy0piQ5jO1ubhTGFIg==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-area/-/victory-area-36.6.11.tgz",
+ "integrity": "sha512-M/wQ0ryms6WpqGzpv+BMNfCLy0dlOtIxAuYgXJYwwDu55noAMbWlFahIzfllpjTmFOyCpCXF7EDraC3n2xRRFQ==",
"dependencies": {
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
- "victory-core": "^36.6.10",
- "victory-vendor": "^36.6.10"
+ "victory-core": "^36.6.11",
+ "victory-vendor": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-axis": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-axis/-/victory-axis-36.6.10.tgz",
- "integrity": "sha512-QsJrETq7mcM5AVBIPx7b31cwv901YaLGRHFWCIUGJgnKmaXdgBEl8cS9+VPrPnhhWhLeau2/LM5dENl1QwK2TQ==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-axis/-/victory-axis-36.6.11.tgz",
+ "integrity": "sha512-f2PUbEsE5wYXKRrgSYdoPRV6QXKNrZjTcd8YlymVGWsouJEFRZFOig8N3yU5lM7OuP98tOdurk4I91Py6NlXrA==",
"dependencies": {
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
- "victory-core": "^36.6.10"
+ "victory-core": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-bar": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-bar/-/victory-bar-36.6.10.tgz",
- "integrity": "sha512-3kmFa3ZEKEx968xrobWzpPebwoDxya3Xqox088NFCopLQ24FoEPLZQboJJY5PM51gyT5GdU+rAqtFc2TG1bL/Q==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-bar/-/victory-bar-36.6.11.tgz",
+ "integrity": "sha512-ANXZIYiDcvC1k3fvGbE8qHOi0POGOsYbzTgP/SBHXh9VQYa/NaYGZT3RO1mxp8wgpwaF+NZYZNC8mMO1pvcB2w==",
"dependencies": {
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
- "victory-core": "^36.6.10",
- "victory-vendor": "^36.6.10"
+ "victory-core": "^36.6.11",
+ "victory-vendor": "^36.6.11"
+ },
+ "peerDependencies": {
+ "react": ">=16.6.0"
+ }
+ },
+ "node_modules/victory-box-plot": {
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-box-plot/-/victory-box-plot-36.6.11.tgz",
+ "integrity": "sha512-+J7Hb0Vf6cQe+qZyRhm6sM7V7AMS43jSTXnrFtRP7Bn+HdAb7p2S7h8abtgUhg3uVeTQa9UUqJBmC/maP8V3Nw==",
+ "dependencies": {
+ "lodash": "^4.17.19",
+ "prop-types": "^15.8.1",
+ "victory-core": "^36.6.11",
+ "victory-vendor": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-brush-container": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-brush-container/-/victory-brush-container-36.6.10.tgz",
- "integrity": "sha512-iDqdMm1C2uVkRRdWQMzDR0lRCK9icEjCCVHbPVxOUqThc/wiBK3GJNq4EL2lhX1F5ONxiwHzZuzK2C59fDMbAA==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-brush-container/-/victory-brush-container-36.6.11.tgz",
+ "integrity": "sha512-o0pPKzfQhKRlYNYUx3tHjuv9iTXqvgRtmu59L/h6l11DPaRo+jcHDBKEDRuoZxTinR/a1yqfLEJ1i9QgSE8o6w==",
"dependencies": {
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
"react-fast-compare": "^3.2.0",
- "victory-core": "^36.6.10"
+ "victory-core": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-chart": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-chart/-/victory-chart-36.6.10.tgz",
- "integrity": "sha512-W1yAYX16nASA8xllGkO6VvUAAGe9BehQ+558fhXeznIX+P4yXJ2v8CJG7NXD+bdh+Xwoft6GWouwp2ycANBKyw==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-chart/-/victory-chart-36.6.11.tgz",
+ "integrity": "sha512-t4RIeLT6PJxZaDqNeawtIPxuA48k98kBvYbEV9XEPrS3TPAYsrB6lgXjZKLoItYLh63Ry4nqZAnPti4RD0uTfQ==",
"dependencies": {
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
"react-fast-compare": "^3.2.0",
- "victory-axis": "^36.6.10",
- "victory-core": "^36.6.10",
- "victory-polar-axis": "^36.6.10",
- "victory-shared-events": "^36.6.10"
+ "victory-axis": "^36.6.11",
+ "victory-core": "^36.6.11",
+ "victory-polar-axis": "^36.6.11",
+ "victory-shared-events": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-core": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-core/-/victory-core-36.6.10.tgz",
- "integrity": "sha512-rXZh6Lm/ex/2pjQQr9kfmS1ebdpO/mYvHup1gFEqzpkTgVXag6QWV8PcZkEK07x9owcfnvgBlfJvYCE6h9NpcA==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-core/-/victory-core-36.6.11.tgz",
+ "integrity": "sha512-aYhFIRu8NQMwW/JbgqoAG7w0lUYbTB1Achx4mmBc6aL8RMkv6LhD/PFwjT3TLpH0AoEs3Rpty2g0UQ+7ulE7dA==",
"dependencies": {
"lodash": "^4.17.21",
"prop-types": "^15.8.1",
"react-fast-compare": "^3.2.0",
- "victory-vendor": "^36.6.10"
+ "victory-vendor": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-create-container": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-create-container/-/victory-create-container-36.6.10.tgz",
- "integrity": "sha512-gIGWWNpbRbBtEJWsFpABDkZuuTe5SjhynWe2GaLLl2Hi2cYWoo/WWMef09ChfnuLOXodc0MG149KAle5j6Cq7Q==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-create-container/-/victory-create-container-36.6.11.tgz",
+ "integrity": "sha512-Ve96DE9XDifmT2Bh/6Ptz7cgIV5DC2GYsr0Rl6I0sF6S02IH3V02NLpkcTthTRJHAvC9MkHwjiBlvFEZsXHOtg==",
"dependencies": {
"lodash": "^4.17.19",
- "victory-brush-container": "^36.6.10",
- "victory-core": "^36.6.10",
- "victory-cursor-container": "^36.6.10",
- "victory-selection-container": "^36.6.10",
- "victory-voronoi-container": "^36.6.10",
- "victory-zoom-container": "^36.6.10"
+ "victory-brush-container": "^36.6.11",
+ "victory-core": "^36.6.11",
+ "victory-cursor-container": "^36.6.11",
+ "victory-selection-container": "^36.6.11",
+ "victory-voronoi-container": "^36.6.11",
+ "victory-zoom-container": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-cursor-container": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-cursor-container/-/victory-cursor-container-36.6.10.tgz",
- "integrity": "sha512-o7zc5NObAwYqD51/9GYf+jD7tQtcXdmknKdYwxcN3uCLL/MQ2R1Ql3FdCyK+GjIlim6UXukJeWWhCelApEIOIQ==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-cursor-container/-/victory-cursor-container-36.6.11.tgz",
+ "integrity": "sha512-rdQAZb3RGYfijjqIQkuPGLNY5UOhuqyzlxQFaVtkpkDSZKiPMtbfLvR7F0Yfa9cs8OeQU0KAtAiK8R33o7su/Q==",
"dependencies": {
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
- "victory-core": "^36.6.10"
+ "victory-core": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-group": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-group/-/victory-group-36.6.10.tgz",
- "integrity": "sha512-Dt25PXQBuJaa5yR1/ke0MTgzYZ/yQMGyGWVwN1buPIEQ3h7E3tqTVcB5oNXLiQ80MMip3U3i/yj3oASuicIyQw==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-group/-/victory-group-36.6.11.tgz",
+ "integrity": "sha512-PTRrH31gsGk3KFzeTzAkyvgjtilWYHWkx06oouh70KuAJ7f+9pRMrRMal8v+npH6a8Wp0KKW198AqpkPaZqHyQ==",
"dependencies": {
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
"react-fast-compare": "^3.2.0",
- "victory-core": "^36.6.10",
- "victory-shared-events": "^36.6.10"
+ "victory-core": "^36.6.11",
+ "victory-shared-events": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-legend": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-legend/-/victory-legend-36.6.10.tgz",
- "integrity": "sha512-+pKrkBBzcf1TxiwUsWlV6Vti+HRDvF4GUa15LTszt+J6LOoJIEFM7iNS2EuWBJRM30xkJKogDjn9NhngqRa/Aw==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-legend/-/victory-legend-36.6.11.tgz",
+ "integrity": "sha512-eL310Qh3WcZyjFI18hABVodwHpgZtokHD3r5HKpgZVY8MWkMD9mXErphWbkNHTVi5ya+I3QbRQ7ToRbPUl/Jog==",
"dependencies": {
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
- "victory-core": "^36.6.10"
+ "victory-core": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-line": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-line/-/victory-line-36.6.10.tgz",
- "integrity": "sha512-hS7CC5AgD9hkzu9F/b01j+q9UJk2SErcVrU8EP2SEv92M2ISH2dbFoLL/mioAPPUkSBh03o/9DDCMu7YeiZspw==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-line/-/victory-line-36.6.11.tgz",
+ "integrity": "sha512-SDQCS6qDSixnYPB1kHEQsue06N6x2cxkIA6uqL45LRFMkKWG4OtwTBORVhtK6lfKzq1OvJs3msoZ+uoRIW1gaA==",
"dependencies": {
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
- "victory-core": "^36.6.10",
- "victory-vendor": "^36.6.10"
+ "victory-core": "^36.6.11",
+ "victory-vendor": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-pie": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-pie/-/victory-pie-36.6.10.tgz",
- "integrity": "sha512-ZgNBS3TNs89kjLe05IGjYDN0GK2wf0DfZFUcXdopL/EosdhKyWAVI7txJ8cUUH1Nex8UGLuI8rfuY4wWPe7rkw==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-pie/-/victory-pie-36.6.11.tgz",
+ "integrity": "sha512-vQPAzrubo3BX/1pujSlKKTBGNSj/8fxUJ0vSZPZ6EE1y6SRnPJoLYi2OkDQVT1s3rM9xvW00SflCD3GO/Z3xWA==",
"dependencies": {
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
- "victory-core": "^36.6.10",
- "victory-vendor": "^36.6.10"
+ "victory-core": "^36.6.11",
+ "victory-vendor": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-polar-axis": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-polar-axis/-/victory-polar-axis-36.6.10.tgz",
- "integrity": "sha512-fZt+Ww9nizkfhlqH/XvdSCiTyFcmprLl1vlPxQAHNmiLFYxDT9fmJYmcMKD/idLzVkK1HjLpHE2/jB+u4dGgmw==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-polar-axis/-/victory-polar-axis-36.6.11.tgz",
+ "integrity": "sha512-wDkyY1rKQTRUVt4+e0QNQgSIJCqXazNhkjWXla8ZWj52GzPP/QSDuzr8SO1oHA3++1jOpdD0R2FTxm+pAea/Yw==",
"dependencies": {
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
- "victory-core": "^36.6.10"
+ "victory-core": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-scatter": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-scatter/-/victory-scatter-36.6.10.tgz",
- "integrity": "sha512-gRTPkJzTluqFBBvEu3cetP/riKRHVkcO5xiK5mQ/6Rwg8iqQbsIE+QmGSngPAd9emYjy1qIWebPy92QN5/j/5A==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-scatter/-/victory-scatter-36.6.11.tgz",
+ "integrity": "sha512-x46AfmhiKijXe59kqm7xI0CCjbY8J0VB02HUN3TynMx7xzhW2yOP+QQqgyk+C4im/MS33HKU402Q7cUfF3pgtw==",
"dependencies": {
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
- "victory-core": "^36.6.10"
+ "victory-core": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-selection-container": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-selection-container/-/victory-selection-container-36.6.10.tgz",
- "integrity": "sha512-jk7kqDepkTdML6NiOAz6ZQdhShm0MH4rO1lLnakA/2VYb7FpWtEYUNWs+v+OMaqzT067d3gzEqgQ5FljttuJDA==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-selection-container/-/victory-selection-container-36.6.11.tgz",
+ "integrity": "sha512-pRQz++0ERZVuIgxpmqLkDgf6hiCAS2m8iGcox8tryWzE1NpADG/IJiHh3AeJgGeiLNMeoJ48hsOZP1C9CCxwrQ==",
"dependencies": {
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
- "victory-core": "^36.6.10"
+ "victory-core": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-shared-events": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-shared-events/-/victory-shared-events-36.6.10.tgz",
- "integrity": "sha512-WPz0Xkz0EChnajm5qYACcFfStxnr7C885XDw8d7fpeJV+oMfdtdMRUKLtY7HatyIVn15dJhmx5jkLEiNveUnug==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-shared-events/-/victory-shared-events-36.6.11.tgz",
+ "integrity": "sha512-ia6ijfgfYMb+gGFPEq4F6rqzB9p5EkjKpjvmEv4Ww7VjrtdORu7PPfAgTxXw/9QgFSq4iOUnDtzjObABua09fQ==",
"dependencies": {
"json-stringify-safe": "^5.0.1",
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
"react-fast-compare": "^3.2.0",
- "victory-core": "^36.6.10"
+ "victory-core": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-stack": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-stack/-/victory-stack-36.6.10.tgz",
- "integrity": "sha512-NPvpHFbR9E4z5HlDs0ERVsd0CPRBcsaParKaddG/te1U1eArEKOUxIoseT3J/Q22eaZoXI0x4E5zvqMddFNjCA==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-stack/-/victory-stack-36.6.11.tgz",
+ "integrity": "sha512-kE/915RdcKes69WpxZ5j6MyCIJqdzIZnzIg6OArBeDlD+LuinNb2oNxYpMXzur1KFSyk5PCUckHgEbR2XLoXrw==",
"dependencies": {
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
"react-fast-compare": "^3.2.0",
- "victory-core": "^36.6.10",
- "victory-shared-events": "^36.6.10"
+ "victory-core": "^36.6.11",
+ "victory-shared-events": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-tooltip": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-tooltip/-/victory-tooltip-36.6.10.tgz",
- "integrity": "sha512-if1pSHJQCScPFThhz7qChYqGScRn0rbAm1Vis/ceRuTRryza4a/pOoYL0unQCZSV6q/pd0WYz7P2Pc4STNpS/Q==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-tooltip/-/victory-tooltip-36.6.11.tgz",
+ "integrity": "sha512-YxAPkGAqTYOIW4aE5InGFABmYjiBfuQFjCe9hwFGvIC/Uqn202xgs5kYVEZXUX3vc9W8XOl7plaQJzmtr2ZZBQ==",
"dependencies": {
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
- "victory-core": "^36.6.10"
+ "victory-core": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-vendor": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.6.10.tgz",
- "integrity": "sha512-7YqYGtsA4mByokBhCjk+ewwPhUfzhR1I3Da6/ZsZUv/31ceT77RKoaqrxRq5Ki+9we4uzf7+A+7aG2sfYhm7nA==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.6.11.tgz",
+ "integrity": "sha512-nT8kCiJp8dQh8g991J/R5w5eE2KnO8EAIP0xocWlh9l2okngMWglOPoMZzJvek8Q1KUc4XE/mJxTZnvOB1sTYg==",
"dependencies": {
"@types/d3-array": "^3.0.3",
"@types/d3-ease": "^3.0.0",
@@ -18133,29 +18107,29 @@
}
},
"node_modules/victory-voronoi-container": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-voronoi-container/-/victory-voronoi-container-36.6.10.tgz",
- "integrity": "sha512-uAMr5SYg2RQE7nN6i0/v40QX/+9GdsnoEXy7qldONp+7O/YaeIHF5s5Tgw4hi3NT5Ge0TzhyHm8tBna2KDK+lg==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-voronoi-container/-/victory-voronoi-container-36.6.11.tgz",
+ "integrity": "sha512-KNB814e5uhs00oNFdkPucXMlpNILnWabHM7iKLBz26nlgqiu6dctZZoWU+HKjxbPkHdic6JQsg28Nk5bThaulw==",
"dependencies": {
"delaunay-find": "0.0.6",
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
"react-fast-compare": "^3.2.0",
- "victory-core": "^36.6.10",
- "victory-tooltip": "^36.6.10"
+ "victory-core": "^36.6.11",
+ "victory-tooltip": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
}
},
"node_modules/victory-zoom-container": {
- "version": "36.6.10",
- "resolved": "https://registry.npmjs.org/victory-zoom-container/-/victory-zoom-container-36.6.10.tgz",
- "integrity": "sha512-PwVBFhVsRBSSbq+UUqDS/udlwIahn8NOBeRSeDhKErFR5+3zNUdS9P2nUnqb2yJHXSzFMM2/slMAdPOAyzEG4g==",
+ "version": "36.6.11",
+ "resolved": "https://registry.npmjs.org/victory-zoom-container/-/victory-zoom-container-36.6.11.tgz",
+ "integrity": "sha512-DRS12HZEmy5oJanlnSK9Wtp/6HQQbwvK0idVU+Lhf2lw3r9gauWp/ymWwWzaHd7Mn5cCODuNW1le2bqb71j3wg==",
"dependencies": {
"lodash": "^4.17.19",
"prop-types": "^15.8.1",
- "victory-core": "^36.6.10"
+ "victory-core": "^36.6.11"
},
"peerDependencies": {
"react": ">=16.6.0"
@@ -18192,14 +18166,6 @@
"makeerror": "1.0.12"
}
},
- "node_modules/warning": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
- "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
- "dependencies": {
- "loose-envify": "^1.0.0"
- }
- },
"node_modules/watchpack": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
@@ -18671,9 +18637,9 @@
}
},
"node_modules/word-wrap": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
- "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+ "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
"dev": true,
"engines": {
"node": ">=0.10.0"
diff --git a/karavan-web/karavan-app/src/main/webui/package.json b/karavan-web/karavan-app/src/main/webui/package.json
index 81399892..bf5945fc 100644
--- a/karavan-web/karavan-app/src/main/webui/package.json
+++ b/karavan-web/karavan-app/src/main/webui/package.json
@@ -27,12 +27,12 @@
},
"dependencies": {
"@microsoft/fetch-event-source": "^2.0.1",
- "@monaco-editor/react": "4.5.0",
- "@patternfly/patternfly": "4.224.2",
- "@patternfly/react-charts": "6.94.19",
- "@patternfly/react-core": "4.276.8",
- "@patternfly/react-log-viewer": "4.87.100",
- "@patternfly/react-table": "4.113.0",
+ "@monaco-editor/react": "4.5.1",
+ "@patternfly/patternfly": "^5.0.2",
+ "@patternfly/react-charts": "^7.0.0",
+ "@patternfly/react-core": "^5.0.0",
+ "@patternfly/react-log-viewer": "^5.0.0",
+ "@patternfly/react-table": "^5.0.0",
"@types/js-yaml": "4.0.5",
"@types/lodash.debounce": "^4.0.7",
"@types/node": "18.16.3",
@@ -59,7 +59,7 @@
"@typescript-eslint/eslint-plugin": "^5.51.0",
"@typescript-eslint/parser": "^5.51.0",
"eslint": "^8.33.0",
- "monaco-editor": "0.36.1",
+ "monaco-editor": "0.41.0",
"react-scripts": "^5.0.1",
"typescript": "^4.9.5"
},
diff --git a/karavan-web/karavan-app/src/main/webui/src/api/ProjectModels.ts b/karavan-web/karavan-app/src/main/webui/src/api/ProjectModels.ts
index 0c8893b5..763f2f76 100644
--- a/karavan-web/karavan-app/src/main/webui/src/api/ProjectModels.ts
+++ b/karavan-web/karavan-app/src/main/webui/src/api/ProjectModels.ts
@@ -155,9 +155,9 @@ export class ToastMessage {
id: string = ''
text: string = ''
title: string = ''
- variant?: 'success' | 'danger' | 'warning' | 'info' | 'default';
+ variant?: 'success' | 'danger' | 'warning' | 'info' | 'custom';
- constructor(title: string, text: string, variant: 'success' | 'danger' | 'warning' | 'info' | 'default') {
+ constructor(title: string, text: string, variant: 'success' | 'danger' | 'warning' | 'info' | 'custom') {
this.id = uuidv4();
this.title = title;
this.text = text;
diff --git a/karavan-web/karavan-app/src/main/webui/src/containers/ContainerTableRow.tsx b/karavan-web/karavan-app/src/main/webui/src/containers/ContainerTableRow.tsx
index 0e2a1091..bc023917 100644
--- a/karavan-web/karavan-app/src/main/webui/src/containers/ContainerTableRow.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/containers/ContainerTableRow.tsx
@@ -57,7 +57,7 @@ export const ContainerTableRow = (props: Props) => {
</Td>
<Td>
{!inTransit && <Label color={color}>{container.state}</Label>}
- {inTransit && <Spinner isSVG size="lg" aria-label="spinner"/>}
+ {inTransit && <Spinner size="lg" aria-label="spinner"/>}
</Td>
<Td>
{container.type !== 'internal' &&
diff --git a/karavan-web/karavan-app/src/main/webui/src/containers/ContainersPage.tsx b/karavan-web/karavan-app/src/main/webui/src/containers/ContainersPage.tsx
index a2ae7686..9ef596b7 100644
--- a/karavan-web/karavan-app/src/main/webui/src/containers/ContainersPage.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/containers/ContainersPage.tsx
@@ -5,14 +5,24 @@ import {
PageSection, Spinner,
Text,
TextContent,
- TextInput, Title, ToggleGroup, ToggleGroupItem,
+ TextInput, ToggleGroup, ToggleGroupItem,
Toolbar,
ToolbarContent,
- ToolbarItem
+ ToolbarItem, EmptyStateHeader
} from '@patternfly/react-core';
import '../designer/karavan.css';
import {ContainerStatus} from "../api/ProjectModels";
-import {TableComposable, TableVariant, Tbody, Td, Th, Thead, Tr} from "@patternfly/react-table";
+import {
+ TableVariant,
+ Tbody,
+ Td,
+ Th,
+ Thead,
+ Tr
+} from '@patternfly/react-table';
+import {
+ Table
+} from '@patternfly/react-table/deprecated';
import SearchIcon from "@patternfly/react-icons/dist/esm/icons/search-icon";
import {MainToolbar} from "../designer/MainToolbar";
import {useAppConfigStore, useStatusesStore} from "../api/ProjectStore";
@@ -46,7 +56,8 @@ export const ContainersPage = () => {
<ToolbarItem>
<ToggleGroup aria-label="Default with single selectable">
{config.environments.map(env => (
- <ToggleGroupItem key={env} text={env} buttonId={env} isSelected={selectedEnv.includes(env)} onChange={selected => selectEnvironment(env, selected)}/>
+ <ToggleGroupItem key={env} text={env} buttonId={env} isSelected={selectedEnv.includes(env)}
+ onChange={(_, selected) => selectEnvironment(env, selected)}/>
))}
</ToggleGroup>
</ToolbarItem>
@@ -54,7 +65,7 @@ export const ContainersPage = () => {
<TextInput className="text-field" type="search" id="search" name="search"
autoComplete="off" placeholder="Search by name"
value={filter}
- onChange={e => setFilter(e)}/>
+ onChange={(_, e) => setFilter(e)}/>
</ToolbarItem>
</ToolbarContent>
</Toolbar>);
@@ -84,13 +95,10 @@ export const ContainersPage = () => {
<Tr>
<Td colSpan={8}>
<Bullseye>
- {loading && <Spinner className="progress-stepper" isSVG diameter="80px" aria-label="Loading..."/>}
+ {loading && <Spinner className="progress-stepper" diameter="80px" aria-label="Loading..."/>}
{!loading &&
- <EmptyState variant={EmptyStateVariant.small}>
- <EmptyStateIcon icon={SearchIcon}/>
- <Title headingLevel="h2" size="lg">
- No results found
- </Title>
+ <EmptyState variant={EmptyStateVariant.sm}>
+ <EmptyStateHeader titleText="No results found" icon={<EmptyStateIcon icon={SearchIcon}/>} headingLevel="h2" />
</EmptyState>
}
</Bullseye>
@@ -107,7 +115,7 @@ export const ContainersPage = () => {
<MainToolbar title={title()} tools={tools()}/>
</PageSection>
<PageSection isFilled className="kamelets-page">
- <TableComposable aria-label="Projects" variant={TableVariant.compact}>
+ <Table aria-label="Projects" variant={TableVariant.compact}>
<Thead>
<Tr>
<Th />
@@ -124,7 +132,7 @@ export const ContainersPage = () => {
<ContainerTableRow key={container.containerName} index={index} container={container}/>
))}
{conts?.length === 0 && getEmptyState()}
- </TableComposable>
+ </Table>
</PageSection>
</PageSection>
)
diff --git a/karavan-web/karavan-app/src/main/webui/src/dashboard/DashboardPage.tsx b/karavan-web/karavan-app/src/main/webui/src/dashboard/DashboardPage.tsx
index 30dad19e..9b54deba 100644
--- a/karavan-web/karavan-app/src/main/webui/src/dashboard/DashboardPage.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/dashboard/DashboardPage.tsx
@@ -7,14 +7,24 @@ import {
PageSection, Spinner,
Text,
TextContent,
- TextInput, Title, ToggleGroup, ToggleGroupItem,
+ TextInput, ToggleGroup, ToggleGroupItem,
Toolbar,
ToolbarContent,
- ToolbarItem, Tooltip
+ ToolbarItem, Tooltip, EmptyStateHeader
} from '@patternfly/react-core';
import '../designer/karavan.css';
import {CamelStatus, ContainerStatus, DeploymentStatus, Project, ServiceStatus} from "../api/ProjectModels";
-import {TableComposable, TableVariant, Tbody, Td, Th, Thead, Tr} from "@patternfly/react-table";
+import {
+ TableVariant,
+ Tbody,
+ Td,
+ Th,
+ Thead,
+ Tr
+} from '@patternfly/react-table';
+import {
+ Table
+} from '@patternfly/react-table/deprecated';
import {camelIcon, CamelUi} from "../designer/utils/CamelUi";
import {KaravanApi} from "../api/KaravanApi";
import Icon from "../Logo";
@@ -101,7 +111,8 @@ export const DashboardPage = () => {
<ToolbarItem>
<ToggleGroup aria-label="Default with single selectable">
{config.environments.map(env => (
- <ToggleGroupItem key={env} text={env} buttonId={env} isSelected={selectedEnv.includes(env)} onChange={selected => selectEnvironment(env, selected)}/>
+ <ToggleGroupItem key={env} text={env} buttonId={env} isSelected={selectedEnv.includes(env)}
+ onChange={(_, selected) => selectEnvironment(env, selected)}/>
))}
</ToggleGroup>
</ToolbarItem>
@@ -109,7 +120,7 @@ export const DashboardPage = () => {
<TextInput className="text-field" type="search" id="search" name="search"
autoComplete="off" placeholder="Search by name"
value={filter}
- onChange={e => setFilter(e)}/>
+ onChange={(_, e) => setFilter(e)}/>
</ToolbarItem>
</ToolbarContent>
</Toolbar>);
@@ -211,13 +222,10 @@ export const DashboardPage = () => {
<Tr>
<Td colSpan={8}>
<Bullseye>
- {loading && <Spinner className="progress-stepper" isSVG diameter="80px" aria-label="Loading..."/>}
+ {loading && <Spinner className="progress-stepper" diameter="80px" aria-label="Loading..."/>}
{!loading &&
- <EmptyState variant={EmptyStateVariant.small}>
- <EmptyStateIcon icon={SearchIcon}/>
- <Title headingLevel="h2" size="lg">
- No results found
- </Title>
+ <EmptyState variant={EmptyStateVariant.sm}>
+ <EmptyStateHeader titleText="No results found" icon={<EmptyStateIcon icon={SearchIcon}/>} headingLevel="h2" />
</EmptyState>
}
</Bullseye>
@@ -229,7 +237,7 @@ export const DashboardPage = () => {
function getKubernetesTable() {
const deps = Array.from(new Set(deployments.filter(d => d.name.toLowerCase().includes(filter)).map(d => d.name)));
return (
- <TableComposable aria-label="Projects" variant={TableVariant.compact}>
+ <Table aria-label="Projects" variant={TableVariant.compact}>
<Thead>
<Tr>
<Th key='type'>Type</Th>
@@ -297,7 +305,7 @@ export const DashboardPage = () => {
))}
{deps.length === 0 && getEmptyState()}
</Tbody>
- </TableComposable>
+ </Table>
)
}
@@ -306,7 +314,7 @@ export const DashboardPage = () => {
.filter(c => ['devmode', 'project'].includes(c.type))
.filter(d => d.containerName.toLowerCase().includes(filter));
return (
- <TableComposable aria-label="Projects" variant={TableVariant.compact}>
+ <Table aria-label="Projects" variant={TableVariant.compact}>
<Thead>
<Tr>
<Th key='type'>Type</Th>
@@ -374,7 +382,7 @@ export const DashboardPage = () => {
))}
{conts.length === 0 && getEmptyState()}
</Tbody>
- </TableComposable>
+ </Table>
)
}
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/beans/BeanProperties.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/beans/BeanProperties.tsx
index 45f773fc..4470c01a 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/beans/BeanProperties.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/beans/BeanProperties.tsx
@@ -18,7 +18,7 @@ import React from 'react';
import {
Form,
FormGroup,
- TextInput, Button, Title, Tooltip, Popover, InputGroup,
+ TextInput, Button, Title, Tooltip, Popover, InputGroup, InputGroupItem,
} from '@patternfly/react-core';
import '../karavan.css';
import "@patternfly/patternfly/patternfly.css";
@@ -167,8 +167,8 @@ export class BeanProperties extends React.Component<Props, State> {
<button type="button" aria-label="More info" onClick={e => {
e.preventDefault();
e.stopPropagation();
- }} className="pf-c-form__group-label-help">
- <HelpIcon noVerticalAlign/>
+ }} className="pf-v5-c-form__group-label-help">
+ <HelpIcon />
</button>
</Popover>
)
@@ -188,10 +188,11 @@ export class BeanProperties extends React.Component<Props, State> {
</div>
<FormGroup label="Name" fieldId="name" isRequired labelIcon={this.getLabelIcon("Name", "Bean name used as a reference ex: myBean")}>
<TextInput className="text-field" isRequired type="text" id="name" name="name" value={bean?.name}
- onChange={e => this.beanChanged("name", e)}/>
+ onChange={(_, value)=> this.beanChanged("name", value)}/>
</FormGroup>
<FormGroup label="Type" fieldId="type" isRequired labelIcon={this.getLabelIcon("Type", "Bean class Canonical Name ex: org.demo.MyBean")}>
- <TextInput className="text-field" isRequired type="text" id="type" name="type" value={bean?.type} onChange={e => this.beanChanged("type", e)}/>
+ <TextInput className="text-field" isRequired type="text" id="type" name="type" value={bean?.type}
+ onChange={(_, value) => this.beanChanged("type", value)}/>
</FormGroup>
<FormGroup label="Properties" fieldId="properties" className="bean-properties">
{Array.from(this.state.properties.entries()).map((v, index, array) => {
@@ -205,7 +206,9 @@ export class BeanProperties extends React.Component<Props, State> {
return (
<div key={"key-" + i} className="bean-property">
<TextInput placeholder="Bean Field Name" className="text-field" isRequired type="text" id="key" name="key" value={key}
- onChange={e => this.propertyChanged(i, e, value, showPassword)}/>
+ onChange={(_, beanFieldName) => {
+ this.propertyChanged(i, beanFieldName, value, showPassword)
+ }}/>
<InputGroup>
{inInfrastructure &&
<Tooltip position="bottom-end" content="Select value from Infrastructure">
@@ -213,15 +216,19 @@ export class BeanProperties extends React.Component<Props, State> {
{icon}
</Button>
</Tooltip>}
- <TextInput
- placeholder="Bean Field Value"
- type={isSecret && !showPassword ? "password" : "text"}
- className="text-field"
- isRequired
- id="value"
- name="value"
- value={value}
- onChange={e => this.propertyChanged(i, key, e, showPassword)}/>
+ <InputGroupItem isFill>
+ <TextInput
+ placeholder="Bean Field Value"
+ type={isSecret && !showPassword ? "password" : "text"}
+ className="text-field"
+ isRequired
+ id="value"
+ name="value"
+ value={value}
+ onChange={(_, value) => {
+ this.propertyChanged(i, key, value, showPassword)
+ }}/>
+ </InputGroupItem>
{isSecret && <Tooltip position="bottom-end" content={showPassword ? "Hide" : "Show"}>
<Button variant="control" onClick={e => this.propertyChanged(i, key, value, !showPassword)}>
{showPassword ? <ShowIcon/> : <HideIcon/>}
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/karavan.css b/karavan-web/karavan-app/src/main/webui/src/designer/karavan.css
index 5bfd3fef..59a44eda 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/karavan.css
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/karavan.css
@@ -35,7 +35,7 @@
}
.karavan .header-button {
- margin-left: var(--pf-c-page__header-tools--MarginRight);
+ margin-left: var(--pf-v5-c-page__header-tools--MarginRight);
}
.karavan .page-header {
@@ -43,7 +43,7 @@
justify-content: space-between;
}
-.karavan .page-header .top-toolbar .pf-c-page__header-tools {
+.karavan .page-header .top-toolbar .pf-v5-c-page__header-tools {
margin-right: 0;
}
@@ -51,7 +51,7 @@
width: 100%;
}
-.karavan .page-header .pf-c-page__header-brand {
+.karavan .page-header .pf-v5-c-page__header-brand {
padding-right: 16px;
}
@@ -63,29 +63,29 @@
width: 100%;
}
-.modal-footer .deploy-buttons .pf-c-form__actions {
+.modal-footer .deploy-buttons .pf-v5-c-form__actions {
justify-content: flex-end;
margin-top: 16px;
}
-.modal-footer .deploy-buttons .pf-c-button {
+.modal-footer .deploy-buttons .pf-v5-c-button {
margin-left: 16px;
}
-.action-buttons .pf-c-form__actions {
+.action-buttons .pf-v5-c-form__actions {
justify-content: flex-end;
margin-top: 16px;
}
-.action-buttons .pf-c-button {
+.action-buttons .pf-v5-c-button {
margin-left: 16px;
}
-.pf-c-modal-box__footer .hidden {
+.pf-v5-c-modal-box__footer .hidden {
display: none;
}
-.upload-buttons .pf-c-form__actions {
+.upload-buttons .pf-v5-c-form__actions {
margin-top: 20px;
justify-content: flex-end;
}
@@ -96,7 +96,7 @@
height: 160px;
}
-.integration-page .integration-card .pf-c-card__header {
+.integration-page .integration-card .pf-v5-c-card__header {
padding-right: 6px;
}
@@ -125,16 +125,26 @@
height: 160px;
}
-.kamelets-page .kamelet-card .pf-c-card__header .custom {
+
+.kamelets-page .kamelet-card .pf-v5-c-card__header {
+ padding-top: var(--pf-v5-global--spacer--sm);
+}
+
+.kamelets-page .kamelet-card .pf-v5-c-card__header .custom {
margin-left: auto;
}
-.kamelets-page .kamelet-card .pf-c-card__title {
+.kamelets-page .kamelet-card .pf-v5-c-card__header .pf-v5-c-card__header-main {
+ display: flex;
+ flex-direction: row;
+}
+
+.kamelets-page .kamelet-card .pf-v5-c-card__title {
font-size: 15px;
font-weight: 400;
}
-.kamelets-page .kamelet-card .pf-c-card__body {
+.kamelets-page .kamelet-card .pf-v5-c-card__body {
overflow: hidden;
position: relative;
line-height: 1.6em;
@@ -142,7 +152,7 @@
.kamelets-page .kamelet-card .icon {
height: 24px;
- width: 24px;
+ max-width: 24px;
margin-top: auto;
margin-bottom: auto;
margin-right: 5px;
@@ -184,13 +194,13 @@
}
/*kamelet modal*/
-.kamelet-modal-card .pf-c-card__header {
+.kamelet-modal-card .pf-v5-c-card__header {
padding-right: 6px;
display: flex;
justify-content: space-between;
}
-.kamelet-modal-card .pf-c-card__title {
+.kamelet-modal-card .pf-v5-c-card__title {
font-weight: 600;
}
@@ -243,7 +253,7 @@
}
.karavan .main-tabs .top-menu-item .count {
- background: var(--pf-global--active-color--100);
+ background: var(--pf-v5-global--active-color--100);
color: white;
height: fit-content;
margin-top: auto;
@@ -251,12 +261,12 @@
min-width: 0px;
}
-.karavan .main-tabs .pf-c-tabs__link .pf-c-tabs__item-icon {
+.karavan .main-tabs .pf-v5-c-tabs__link .pf-v5-c-tabs__item-icon {
height: 24px;
margin-right: 0;
}
-.karavan .main-tabs .pf-c-tabs__item-text {
+.karavan .main-tabs .pf-v5-c-tabs__item-text {
font-size: 14px;
font-weight: bold;
margin-top: auto;
@@ -279,12 +289,12 @@
margin-bottom: 70px;
}
-.karavan .pf-c-drawer__splitter {
+.karavan .pf-v5-c-drawer__splitter {
width: 2px;
background-color: #fcfcfc;
}
-.karavan .pf-c-drawer__splitter-handle {
+.karavan .pf-v5-c-drawer__splitter-handle {
display: none;
}
@@ -311,17 +321,17 @@
display: contents;
}
-.karavan .properties .pf-c-form {
+.karavan .properties .pf-v5-c-form {
row-gap: 10px;
}
-.karavan .properties .pf-c-form__group-label {
+.karavan .properties .pf-v5-c-form__group-label {
padding-bottom: 3px;
display: flex;
justify-content: space-between;
}
-.karavan .properties .pf-c-form__label {
+.karavan .properties .pf-v5-c-form__label {
font-size: 14px;
}
@@ -330,41 +340,41 @@
height: auto;
}
-.karavan .properties .pf-c-select {
- --pf-c-select__toggle--FontSize: 14px;
- --pf-c-select__menu-item--FontSize: 14px;
+.karavan .properties .pf-v5-c-select {
+ --pf-v5-c-select__toggle--FontSize: 14px;
+ --pf-v5-c-select__menu-item--FontSize: 14px;
}
-.karavan .properties .input-group .pf-c-text-input-group__text {
+.karavan .properties .input-group .pf-v5-c-text-input-group__text {
width: 100%;
}
-.karavan .properties .input-group .pf-c-chip-group,
-.karavan .properties .input-group .pf-c-text-input-group__main,
-.karavan .properties .input-group .pf-c-chip-group .pf-c-chip-group__list,
-.karavan .properties .input-group .pf-c-chip-group .pf-c-chip-group__list .pf-c-chip-group__list-item,
-.karavan .properties .input-group .pf-c-chip-group .pf-c-chip-group__main {
+.karavan .properties .input-group .pf-v5-c-chip-group,
+.karavan .properties .input-group .pf-v5-c-text-input-group__main,
+.karavan .properties .input-group .pf-v5-c-chip-group .pf-v5-c-chip-group__list,
+.karavan .properties .input-group .pf-v5-c-chip-group .pf-v5-c-chip-group__list .pf-v5-c-chip-group__list-item,
+.karavan .properties .input-group .pf-v5-c-chip-group .pf-v5-c-chip-group__main {
display: block;
}
-.karavan .properties .input-group .pf-c-chip-group {
+.karavan .properties .input-group .pf-v5-c-chip-group {
margin-left: 0;
}
-.karavan .properties .input-group .pf-c-chip-group .pf-c-chip .pf-c-chip__text {
+.karavan .properties .input-group .pf-v5-c-chip-group .pf-v5-c-chip .pf-v5-c-chip__text {
max-width: inherit;
}
-.karavan .properties .input-group .pf-c-chip-group .pf-c-chip {
+.karavan .properties .input-group .pf-v5-c-chip-group .pf-v5-c-chip {
width: 100%;
}
-.karavan .properties .input-group .pf-c-text-input-group__utilities {
+.karavan .properties .input-group .pf-v5-c-text-input-group__utilities {
align-items: end;
margin-top: auto;
}
-.karavan .properties .chip .pf-c-button {
+.karavan .properties .chip .pf-v5-c-button {
position: absolute;
right: 0;
}
@@ -378,20 +388,20 @@
font-size: 13px;
}
-.karavan .properties .pf-c-select__menu-search {
+.karavan .properties .pf-v5-c-select__menu-search {
padding: 0px 6px 6px 6px;
}
-.karavan .properties .pf-c-select__toggle-typeahead {
+.karavan .properties .pf-v5-c-select__toggle-typeahead {
font-size: 14px;
height: auto;
}
-.karavan .properties .pf-c-select__menu-item {
+.karavan .properties .pf-v5-c-select__menu-item {
/*width: 280px;*/
}
-.karavan .properties .pf-c-select__menu-item-description {
+.karavan .properties .pf-v5-c-select__menu-item-description {
overflow-wrap: anywhere;
}
@@ -406,12 +416,12 @@
.karavan .properties .number .clear-button {
color: #b1b1b7;
- --pf-c-button--BorderRadius: var(--pf-c-button--m-control--BorderRadius);
- --pf-c-button--disabled--BackgroundColor: var(--pf-c-button--m-control--disabled--BackgroundColor);
- --pf-c-button--after--BorderWidth: var(--pf-c-button--m-control--after--BorderWidth);
- --pf-c-button--after--BorderColor: var(--pf-c-button--m-control--after--BorderTopColor) var(--pf-c-button--m-control--after--BorderRightColor) var(--pf-c-button--m-control--after--BorderBottomColor) var(--pf-c-button--m-control--after--BorderLeftColor);
- color: var(--pf-c-button--m-control--Color);
- background-color: var(--pf-c-button--m-control--BackgroundColor);
+ --pf-v5-c-button--BorderRadius: var(--pf-v5-c-button--m-control--BorderRadius);
+ --pf-v5-c-button--disabled--BackgroundColor: var(--pf-v5-c-button--m-control--disabled--BackgroundColor);
+ --pf-v5-c-button--after--BorderWidth: var(--pf-v5-c-button--m-control--after--BorderWidth);
+ --pf-v5-c-button--after--BorderColor: var(--pf-v5-c-button--m-control--after--BorderTopColor) var(--pf-v5-c-button--m-control--after--BorderRightColor) var(--pf-v5-c-button--m-control--after--BorderBottomColor) var(--pf-v5-c-button--m-control--after--BorderLeftColor);
+ color: var(--pf-v5-c-button--m-control--Color);
+ background-color: var(--pf-v5-c-button--m-control--BackgroundColor);
padding-left: 5px;
padding-right: 5px;
}
@@ -421,11 +431,11 @@
}
.karavan .properties .component-selector {
- border-width: var(--pf-global--BorderWidth--sm);
- border-top-color: var(--pf-global--BorderColor--300);
- border-right-color: var(--pf-global--BorderColor--300);
- border-bottom-color: var(--pf-global--BorderColor--200);
- border-left-color: var(--pf-global--BorderColor--300);
+ border-width: var(--pf-v5-global--BorderWidth--sm);
+ border-top-color: var(--pf-v5-global--BorderColor--300);
+ border-right-color: var(--pf-v5-global--BorderColor--300);
+ border-bottom-color: var(--pf-v5-global--BorderColor--200);
+ border-left-color: var(--pf-v5-global--BorderColor--300);
border-style: solid;
}
@@ -471,24 +481,24 @@
width: 100%;
}
-.karavan .properties .expression .pf-c-form__group-label,
-.karavan .properties .object .pf-c-form__group-label,
-.karavan .properties .dataformat .pf-c-form__group-label,
-.karavan .properties .parameters .pf-c-form__group-label {
+.karavan .properties .expression .pf-v5-c-form__group-label,
+.karavan .properties .object .pf-v5-c-form__group-label,
+.karavan .properties .dataformat .pf-v5-c-form__group-label,
+.karavan .properties .parameters .pf-v5-c-form__group-label {
font-weight: 100;
}
-.karavan .properties .expression .pf-c-form__group,
-.karavan .properties .object .pf-c-form__group,
-.karavan .properties .dataformat .pf-c-form__group,
-.karavan .properties .parameters .pf-c-form__group {
+.karavan .properties .expression .pf-v5-c-form__group,
+.karavan .properties .object .pf-v5-c-form__group,
+.karavan .properties .dataformat .pf-v5-c-form__group,
+.karavan .properties .parameters .pf-v5-c-form__group {
margin-bottom: 10px;
}
-.karavan .properties .expression .pf-c-select__menu-wrapper,
-.karavan .properties .object .pf-c-select__menu-wrapper,
-.karavan .properties .dataformat .pf-c-select__menu-wrapper,
-.karavan .properties .parameters .pf-c-select__menu-wrapper {
+.karavan .properties .expression .pf-v5-c-select__menu-wrapper,
+.karavan .properties .object .pf-v5-c-select__menu-wrapper,
+.karavan .properties .dataformat .pf-v5-c-select__menu-wrapper,
+.karavan .properties .parameters .pf-v5-c-select__menu-wrapper {
width: 350px;
}
@@ -507,23 +517,23 @@
}
.karavan .properties .add-button {
- color: var(--pf-global--active-color--100);
+ color: var(--pf-v5-global--active-color--100);
}
.karavan .properties .delete-button {
color: #909090;
}
-.karavan .properties .pf-c-expandable-section__toggle {
+.karavan .properties .pf-v5-c-expandable-section__toggle {
margin: 0;
padding: 0;
}
-.karavan .properties .pf-c-expandable-section__content {
+.karavan .properties .pf-v5-c-expandable-section__content {
margin: 0;
}
-.karavan .properties .pf-c-expandable-section__content p {
+.karavan .properties .pf-v5-c-expandable-section__content p {
min-height: 6px;
}
@@ -566,19 +576,19 @@
}
.karavan .dsl-page .graph .connections .arrow {
- stroke: var(--pf-global--Color--200);
- fill: var(--pf-global--Color--200);
+ stroke: var(--pf-v5-global--Color--200);
+ fill: var(--pf-v5-global--Color--200);
}
.karavan .dsl-page .graph .connections .path {
- stroke: var(--pf-global--Color--200);
+ stroke: var(--pf-v5-global--Color--200);
stroke-width: 1;
fill: transparent;
}
.karavan .dsl-page .graph .connections .circle-outgoing,
.karavan .dsl-page .graph .connections .circle-incoming {
- stroke: var(--pf-global--Color--200);
+ stroke: var(--pf-v5-global--Color--200);
stroke-width: 1;
fill: white;
}
@@ -587,14 +597,14 @@
stroke-dasharray: 5;
-webkit-animation: dashdraw .5s linear infinite;
animation: dashdraw .5s linear infinite;
- stroke: var(--pf-global--Color--200);
+ stroke: var(--pf-v5-global--Color--200);
stroke-width: 1;
fill: transparent;
}
.karavan .dsl-page .graph .connections .path-direct {
stroke-dasharray: 0;
- stroke: var(--pf-global--Color--200);
+ stroke: var(--pf-v5-global--Color--200);
stroke-width: 0.7;
stroke-opacity: 0.7;
fill: transparent;
@@ -602,7 +612,7 @@
.karavan .dsl-page .graph .connections .path-direct-selected {
stroke-dasharray: 0;
- stroke: var(--pf-global--active-color--100);
+ stroke: var(--pf-v5-global--active-color--100);
stroke-width: 1;
stroke-opacity: 1;
fill: transparent;
@@ -610,7 +620,7 @@
.karavan .dsl-page .graph .connections .path-seda {
stroke-dasharray: 2;
- stroke: var(--pf-global--Color--200);
+ stroke: var(--pf-v5-global--Color--200);
-webkit-animation: dashdraw .5s linear infinite;
animation: dashdraw .5s linear infinite;
stroke-width: 1;
@@ -629,7 +639,7 @@
display: flex;
flex-direction: column;
width: fit-content;
- border-color: var(--pf-global--Color--200);
+ border-color: var(--pf-v5-global--Color--200);
border-radius: 16px;
border-width: 1px;
min-width: 120px;
@@ -639,8 +649,8 @@
}
.karavan {
- --step-border-color: var(--pf-global--Color--200);
- --step-border-color-selected: var(--pf-global--active-color--100);
+ --step-border-color: var(--pf-v5-global--Color--200);
+ --step-border-color-selected: var(--pf-v5-global--active-color--100);
}
.karavan .dsl-page .flows .children {
@@ -712,12 +722,12 @@
}
.karavan .step-element-selected {
- background-color: rgba(var(--pf-global--palette--blue-50), 1);
+ background-color: rgba(var(--pf-v5-global--palette--blue-50), 1);
}
.karavan .step-element .selected .header-icon {
- border-color: var(--pf-global--primary-color--100);
- background-color: var(--pf-global--palette--blue-50);
+ border-color: var(--pf-v5-global--primary-color--100);
+ background-color: var(--pf-v5-global--palette--blue-50);
border-width: 2px;
}
@@ -745,12 +755,12 @@
}
.karavan .step-element .header .header-text-required {
- color: var(--pf-global--danger-color--100);
+ color: var(--pf-v5-global--danger-color--100);
font-weight: bold;
}
.karavan .step-element .header-icon {
- border-color: var(--pf-global--Color--200);
+ border-color: var(--pf-v5-global--Color--200);
border-style: solid;
border-radius: 30px;
border-width: 1px;
@@ -784,7 +794,7 @@
border: 0;
padding: 0;
background: transparent;
- color: var(--pf-global--primary-color--100);
+ color: var(--pf-v5-global--primary-color--100);
visibility: hidden;
z-index: 100;
position: absolute;
@@ -801,7 +811,7 @@
margin: 0 0 0 -25px;
background: transparent;
background: transparent;
- color: var(--pf-global--primary-color--100);
+ color: var(--pf-v5-global--primary-color--100);
visibility: hidden;
z-index: 100;
}
@@ -828,7 +838,7 @@
padding: 0;
margin: 0;
background: transparent;
- color: var(--pf-global--primary-color--100);
+ color: var(--pf-v5-global--primary-color--100);
visibility: hidden;
z-index: 100;
}
@@ -846,7 +856,7 @@
padding: 0;
margin: 3px auto 0 auto;
background: transparent;
- color: var(--pf-global--primary-color--100);
+ color: var(--pf-v5-global--primary-color--100);
visibility: hidden;
height: 100%;
display: flex;
@@ -872,13 +882,24 @@
.dsl-modal {
height: 80%;
- color: var(--pf-global--Color--100);
+ color: var(--pf-v5-global--Color--100);
}
.dsl-modal .dsl-card {
cursor: pointer;
}
+.dsl-modal .dsl-card .pf-v5-c-card__header-main {
+ display: flex;
+ flex-direction: row;
+}
+
+.dsl-modal .dsl-card .header-labels .pf-v5-c-card__header-main {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+}
+
.dsl-modal .dsl-card .icon {
height: 20px;
width: auto;
@@ -899,7 +920,7 @@
}
-.dsl-modal .search .pf-c-form__group-label {
+.dsl-modal .search .pf-v5-c-form__group-label {
padding: 0;
margin: auto;
}
@@ -909,23 +930,23 @@
height: auto;
}
-.dsl-modal .pf-c-form.pf-m-horizontal .pf-c-form__group {
+.dsl-modal .pf-v5-c-form.pf-v5-m-horizontal .pf-v5-c-form__group {
display: contents;
}
-.dsl-modal .pf-c-card__body {
+.dsl-modal .pf-v5-c-card__body {
padding-bottom: 0;
height: 54px;
}
-.dsl-modal .pf-c-card__body p {
+.dsl-modal .dsl-card p {
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
-.dsl-modal .pf-c-card__footer {
+.dsl-modal .pf-v5-c-card__footer {
padding-bottom: 1em;
}
@@ -936,14 +957,14 @@
flex-wrap: wrap;
}
-.dsl-modal .pf-c-card.pf-m-compact .header-labels {
+.dsl-modal .dsl-card .header-labels {
padding: 5px;
display: flex;
flex-direction: row;
justify-content: space-between;
}
-.dsl-modal .pf-c-card.pf-m-compact .footer-labels {
+.dsl-modal .dsl-card .footer-labels {
padding: 5px;
display: flex;
flex-direction: row;
@@ -970,11 +991,11 @@
width: 270px !important;
}
-.move-modal .pf-c-modal-box__body {
+.move-modal .pf-v5-c-modal-box__body {
margin-right: 0 !important;
}
-.move-modal .pf-m-plain {
+.move-modal .pf-v5-m-plain {
display: none;
}
@@ -985,7 +1006,7 @@
padding-bottom: 100px;
}
-.pf-c-popover__footer {
+.pf-v5-c-popover__footer {
overflow-wrap: anywhere;
}
@@ -1041,18 +1062,18 @@
.karavan .rest-page .rest-card-unselected,
.karavan .rest-page .rest-config-card-unselected,
.karavan .rest-page .method-card-unselected {
- border-color: var(--pf-global--Color--200);
+ border-color: var(--pf-v5-global--Color--200);
background-color: transparent;
}
.karavan .rest-page .rest-card-selected,
.karavan .rest-page .rest-config-card-selected,
.karavan .rest-page .method-card-selected {
- border-color: var(--pf-global--primary-color--100);
+ border-color: var(--pf-v5-global--primary-color--100);
}
.karavan .rest-page .rest-card-selected .title {
- color: var(--pf-global--primary-color--100);
+ color: var(--pf-v5-global--primary-color--100);
}
.karavan .rest-page .rest-config-card,
@@ -1095,11 +1116,11 @@
}
.karavan .rest-page .method-card-unselected .method {
- background: var(--pf-global--Color--400);
+ background: var(--pf-v5-global--Color--400);
}
.karavan .rest-page .method-card-selected .method {
- background: var(--pf-global--primary-color--100);
+ background: var(--pf-v5-global--primary-color--100);
}
.karavan .rest-page .rest-card .title,
@@ -1147,7 +1168,7 @@
font-size: 15px;
border: 0;
background: transparent;
- color: var(--pf-global--primary-color--100);
+ color: var(--pf-v5-global--primary-color--100);
z-index: 100;
}
@@ -1160,7 +1181,7 @@
}
/*Beans*/
-.karavan .rest-page .properties .bean-properties .pf-c-form__group-control {
+.karavan .rest-page .properties .bean-properties .pf-v5-c-form__group-control {
display: flex;
flex-direction: column;
gap: 6px;
@@ -1201,9 +1222,9 @@
background: #fafafa;
}
-.karavan .templates-page-columns .pf-c-empty-state,
-.karavan .exception-page-columns .pf-c-empty-state,
-.karavan .error-page-columns .pf-c-empty-state {
+.karavan .templates-page-columns .pf-v5-c-empty-state,
+.karavan .exception-page-columns .pf-v5-c-empty-state,
+.karavan .error-page-columns .pf-v5-c-empty-state {
margin: auto;
height: 100%;
}
@@ -1239,12 +1260,12 @@
padding-right: 10px;
}
-.karavan .project-builder .pf-c-toolbar__content {
+.karavan .project-builder .pf-v5-c-toolbar__content {
padding: 0;
}
-.karavan .project-builder .pf-c-tabs__link,
-.karavan .project-builder .pf-c-card__title,
+.karavan .project-builder .pf-v5-c-tabs__link,
+.karavan .project-builder .pf-v5-c-card__title,
.karavan .project-builder .profile-caption {
font-size: 14px;
}
@@ -1257,11 +1278,11 @@
opacity: 0.4;
}
-.karavan .project-builder .pf-c-form__label {
+.karavan .project-builder .pf-v5-c-form__label {
font-size: 14px;
}
-.karavan .project-builder .pf-c-check__label {
+.karavan .project-builder .pf-v5-c-check__label {
font-size: 14px;
}
@@ -1270,23 +1291,23 @@
height: auto;
}
-.karavan .project-builder .pf-c-input-group button {
+.karavan .project-builder .pf-v5-c-input-group button {
font-size: 14px;
height: auto;
}
-.karavan .project-builder .pf-c-form {
- --pf-c-form--GridGap: 1em;
+.karavan .project-builder .pf-v5-c-form {
+ --pf-v5-c-form--GridGap: 1em;
}
-.karavan .project-builder .pf-c-card__body {
- --pf-c-card--child--PaddingRight: 0.5em;
- --pf-c-card--child--PaddingBottom: 1em;
- --pf-c-card--child--PaddingLeft: 1em;
+.karavan .project-builder .pf-v5-c-card__body {
+ --pf-v5-c-card--child--PaddingRight: 0.5em;
+ --pf-v5-c-card--child--PaddingBottom: 1em;
+ --pf-v5-c-card--child--PaddingLeft: 1em;
}
-.karavan .project-builder .pf-c-card__header {
- --pf-c-card--first-child--PaddingTop: 0.5em;
+.karavan .project-builder .pf-v5-c-card__header {
+ --pf-v5-c-card--first-child--PaddingTop: 0.5em;
}
.karavan .project-builder .center {
@@ -1343,7 +1364,7 @@
margin-top: 6px;
}
-.root .tooltip-required-field .pf-c-tooltip__content {
+.root .tooltip-required-field .pf-v5-c-tooltip__content {
text-align: start;
}
@@ -1357,7 +1378,7 @@
overflow: auto;
flex-shrink: unset;
flex-grow: 1;
- background-color: var(--pf-global--BackgroundColor--light-300);
+ background-color: var(--pf-v5-global--BackgroundColor--light-300);
}
.karavan .designer-page {
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/rest/RestMethodSelector.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/rest/RestMethodSelector.tsx
index 316145ce..d3c4ec66 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/rest/RestMethodSelector.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/rest/RestMethodSelector.tsx
@@ -50,7 +50,7 @@ export class RestMethodSelector extends React.Component<Props, State> {
getCard(dsl: DslMetaModel, index: number) {
return (
- <Card key={dsl.dsl + index} isHoverable isCompact className="dsl-card"
+ <Card key={dsl.dsl + index} isCompact className="dsl-card"
onClick={event => this.selectMethod(event, dsl)}>
<CardHeader>
{CamelUi.getIconForDsl(dsl)}
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/route/DslElement.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/route/DslElement.tsx
index f9cd9498..2ea1aaa2 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/route/DslElement.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/route/DslElement.tsx
@@ -379,7 +379,7 @@ export class DslElement extends React.Component<Props, State> {
content={<div>{"Add step to " + CamelUi.getTitle(step)}</div>}>
<button type="button" aria-label="Add" onClick={e => this.openSelector(e)}
className={this.isAddStepButtonLeft() ? "add-button add-button-left" : "add-button add-button-bottom"}>
- <AddIcon noVerticalAlign/>
+ <AddIcon />
</button>
</Tooltip>
)
@@ -393,7 +393,7 @@ export class DslElement extends React.Component<Props, State> {
aria-label="Add"
onClick={e => this.openSelector(e, false)}
className={"add-element-button"}>
- <AddIcon noVerticalAlign/>
+ <AddIcon />
</button>
</Tooltip>
)
@@ -402,7 +402,7 @@ export class DslElement extends React.Component<Props, State> {
getInsertElementButton() {
return (
<Tooltip position={"left"} content={<div>{"Insert element before"}</div>}>
- <button type="button" aria-label="Insert" onClick={e => this.openSelector(e, true, true)} className={"insert-element-button"}><InsertIcon noVerticalAlign/>
+ <button type="button" aria-label="Insert" onClick={e => this.openSelector(e, true, true)} className={"insert-element-button"}><InsertIcon />
</button>
</Tooltip>
)
@@ -411,7 +411,7 @@ export class DslElement extends React.Component<Props, State> {
getDeleteButton() {
return (
<Tooltip position={"right"} content={<div>{"Delete element"}</div>}>
- <button type="button" aria-label="Delete" onClick={e => this.delete(e)} className="delete-button"><DeleteIcon noVerticalAlign/></button>
+ <button type="button" aria-label="Delete" onClick={e => this.delete(e)} className="delete-button"><DeleteIcon /></button>
</Tooltip>
)
}
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/route/DslProperties.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/route/DslProperties.tsx
index f10a0eec..87f93c79 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/route/DslProperties.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/route/DslProperties.tsx
@@ -128,7 +128,7 @@ export class DslProperties extends React.Component<Props, State> {
</div>
<Text component={TextVariants.p}>{descriptionLines.at(0)}</Text>
{descriptionLines.length > 1 && <ExpandableSection toggleText={isDescriptionExpanded ? 'Show less' : 'Show more'}
- onToggle={isExpanded => this.setState({isDescriptionExpanded: !isDescriptionExpanded})}
+ onToggle={(_event, isExpanded) => this.setState({isDescriptionExpanded: !isDescriptionExpanded})}
isExpanded={isDescriptionExpanded}>
{descriptionLines.filter((value, index) => index > 0)
.map((desc, index, array) => <Text key={index} component={TextVariants.p}>{desc}</Text>)}
@@ -204,7 +204,7 @@ export class DslProperties extends React.Component<Props, State> {
&& propertiesAdvanced.length > 0 &&
<ExpandableSection
toggleText={'Advanced properties'}
- onToggle={isExpanded => this.setState({isShowAdvanced: !this.state.isShowAdvanced})}
+ onToggle={(_event, isExpanded) => this.setState({isShowAdvanced: !this.state.isShowAdvanced})}
isExpanded={this.state.isShowAdvanced}>
<div className="parameters">
{this.getPropertyFields(propertiesAdvanced)}
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/route/DslSelector.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/route/DslSelector.tsx
index eb66e7ec..47eb3b39 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/route/DslSelector.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/route/DslSelector.tsx
@@ -17,7 +17,7 @@
import React from 'react';
import {
Badge,
- Card, CardBody, CardFooter, CardHeader, Flex, FlexItem, Form, FormGroup, Gallery, Label, Modal, PageSection,
+ Card, CardBody, CardFooter, CardHeader, Flex, FlexItem, Form, FormGroup, Gallery, Modal, PageSection,
Tab, Tabs, TabTitleText,
Text, TextInput, ToggleGroup, ToggleGroupItem,
} from '@patternfly/react-core';
@@ -71,9 +71,9 @@ export class DslSelector extends React.Component<Props, State> {
return (
<Form isHorizontal className="search" autoComplete="off">
<FormGroup fieldId="search">
- <TextInput className="text-field" type="text" id="search" name="search" iconVariant='search'
- value={this.state.filter}
- onChange={e => this.setState({filter: e})}/>
+ <TextInput className="text-field" type="text" id="search" name="search"
+ value={this.state.filter}
+ onChange={(_, value) => this.setState({filter: value})}/>
</FormGroup>
</Form>
)
@@ -176,7 +176,7 @@ export class DslSelector extends React.Component<Props, State> {
</Flex>
}
actions={{}}>
- <PageSection variant={this.props.dark ? "darker" : "light"}>
+ <PageSection padding={{default:"noPadding"}} variant={this.props.dark ? "darker" : "light"}>
{isEip && <ToggleGroup aria-label="Labels" isCompact>
{eipLabels.map(eipLabel => <ToggleGroupItem
key={eipLabel}
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/route/RouteDesigner.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/route/RouteDesigner.tsx
index db2662e0..f7607b90 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/route/RouteDesigner.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/route/RouteDesigner.tsx
@@ -146,7 +146,7 @@ export class RouteDesigner extends React.Component<Props, RouteDesignerState> {
getPropertiesPanel() {
return (
- <DrawerPanelContent onResize={width => this.setState({key: Math.random().toString()})}
+ <DrawerPanelContent onResize={(_event, width) => this.setState({key: Math.random().toString()})}
style={{transform: "initial"}} isResizable hasNoBorder defaultSize={'400px'}
maxSize={'800px'} minSize={'300px'}>
<DslProperties ref={this.state.ref}
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/ComponentParameterField.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/ComponentParameterField.tsx
index 2a7996df..69175d98 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/ComponentParameterField.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/ComponentParameterField.tsx
@@ -16,15 +16,22 @@
*/
import React from 'react';
import {
- FormGroup,
- TextInput,
- Popover,
- Switch,
- Select,
- SelectVariant,
- SelectDirection,
- SelectOption, InputGroup, TextArea, Tooltip, Button, capitalize,
+ FormGroup,
+ TextInput,
+ Popover,
+ Switch,
+ InputGroup,
+ TextArea,
+ Tooltip,
+ Button,
+ capitalize, InputGroupItem
} from '@patternfly/react-core';
+import {
+ Select,
+ SelectVariant,
+ SelectDirection,
+ SelectOption
+} from '@patternfly/react-core/deprecated';
import '../../karavan.css';
import "@patternfly/patternfly/patternfly.css";
import HelpIcon from "@patternfly/react-icons/dist/js/icons/help-icon";
@@ -99,7 +106,7 @@ export class ComponentParameterField extends React.Component<Props, State> {
id={this.state.id} name={this.state.id}
variant={SelectVariant.single}
aria-label={property.name}
- onToggle={isExpanded => {
+ onToggle={(_event, isExpanded) => {
this.openSelect(property.name, isExpanded)
}}
onSelect={(e, value, isPlaceholder) => this.parametersChanged(property.name, (!isPlaceholder ? value : undefined))}
@@ -147,12 +154,12 @@ export class ComponentParameterField extends React.Component<Props, State> {
<SelectOption key={value} value={value ? value.trim() : value}/>));
}
return <InputGroup id={this.state.id} name={this.state.id}>
- <Select
+ <InputGroupItem><Select
id={this.state.id} name={this.state.id}
placeholderText="Select or type an URI"
variant={SelectVariant.typeahead}
aria-label={property.name}
- onToggle={isExpanded => {
+ onToggle={(_event, isExpanded) => {
this.openSelect(property.name, isExpanded)
}}
onSelect={(e, value, isPlaceholder) => {
@@ -167,8 +174,8 @@ export class ComponentParameterField extends React.Component<Props, State> {
direction={SelectDirection.down}
>
{selectOptions}
- </Select>
- <Tooltip position="bottom-end" content={"Create route"}>
+ </Select></InputGroupItem>
+ <InputGroupItem><Tooltip position="bottom-end" content={"Create route"}>
<Button isDisabled={value === undefined} variant="control" onClick={e => {
if (value) {
const newRoute = !internalUris.includes(value.toString()) ? new RouteToCreate(componentName, value.toString()) : undefined;
@@ -177,7 +184,7 @@ export class ComponentParameterField extends React.Component<Props, State> {
}}>
{<PlusIcon/>}
</Button>
- </Tooltip>
+ </Tooltip></InputGroupItem>
</InputGroup>
}
@@ -233,14 +240,14 @@ export class ComponentParameterField extends React.Component<Props, State> {
type={property.secret && !showPassword ? "password" : "text"}
id={this.state.id} name={this.state.id}
value={value !== undefined ? value : property.defaultValue}
- onChange={e => this.parametersChanged(property.name, e, property.kind === 'path')}/>}
+ onChange={(e, value) => this.parametersChanged(property.name, value, property.kind === 'path')}/>}
{showEditor && !property.secret &&
<TextArea autoResize={true} ref={this.state.ref}
className="text-field" isRequired
type="text"
id={this.state.id} name={this.state.id}
value={value !== undefined ? value : property.defaultValue}
- onChange={e => this.parametersChanged(property.name, e, property.kind === 'path')}/>}
+ onChange={(e, value) => this.parametersChanged(property.name, value, property.kind === 'path')}/>}
{!property.secret &&
<Tooltip position="bottom-end" content={showEditor ? "Change to TextField" : "Change to Text Area"}>
<Button variant="control" onClick={e => this.setState({showEditor: !showEditor})}>
@@ -265,7 +272,9 @@ export class ComponentParameterField extends React.Component<Props, State> {
type={['integer', 'int', 'number'].includes(property.type) ? 'number' : (property.secret ? "password" : "text")}
id={this.state.id} name={this.state.id}
value={value !== undefined ? value : property.defaultValue}
- onChange={e => this.parametersChanged(property.name, ['integer', 'int', 'number'].includes(property.type) ? Number(e) : e, property.kind === 'path')}/>
+ onChange={(e, value) => {
+ this.parametersChanged(property.name, ['integer', 'int', 'number'].includes(property.type) ? Number(value) : value, property.kind === 'path')
+ }}/>
)
}
@@ -280,7 +289,7 @@ export class ComponentParameterField extends React.Component<Props, State> {
id={this.state.id} name={this.state.id}
variant={SelectVariant.single}
aria-label={property.name}
- onToggle={isExpanded => {
+ onToggle={(_event, isExpanded) => {
this.openSelect(property.name, isExpanded)
}}
onSelect={(e, value, isPlaceholder) => this.parametersChanged(property.name, (!isPlaceholder ? value : undefined), property.kind === 'path')}
@@ -326,8 +335,8 @@ export class ComponentParameterField extends React.Component<Props, State> {
</div>
}>
<button type="button" aria-label="More info" onClick={e => e.preventDefault()}
- className="pf-c-form__group-label-help">
- <HelpIcon noVerticalAlign/>
+ className="pf-v5-c-form__group-label-help">
+ <HelpIcon />
</button>
</Popover>
}>
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/DataFormatField.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/DataFormatField.tsx
index aad00220..ef447b6f 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/DataFormatField.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/DataFormatField.tsx
@@ -16,11 +16,14 @@
*/
import React from 'react';
import {
- Select,
- SelectVariant,
- SelectDirection,
- SelectOption, ExpandableSection,
+ ExpandableSection
} from '@patternfly/react-core';
+import {
+ Select,
+ SelectVariant,
+ SelectDirection,
+ SelectOption
+} from '@patternfly/react-core/deprecated';
import '../../karavan.css';
import "@patternfly/patternfly/patternfly.css";
import {CamelMetadataApi, PropertyMeta} from "karavan-core/lib/model/CamelMetadata";
@@ -135,9 +138,9 @@ export class DataFormatField extends React.Component<Props, State> {
return (
<div>
<div>
- <label className="pf-c-form__label" htmlFor="expression">
- <span className="pf-c-form__label-text">{"Data Format"}</span>
- <span className="pf-c-form__label-required" aria-hidden="true"> *</span>
+ <label className="pf-v5-c-form__label" htmlFor="expression">
+ <span className="pf-v5-c-form__label-text">{"Data Format"}</span>
+ <span className="pf-v5-c-form__label-required" aria-hidden="true"> *</span>
</label>
<Select
variant={SelectVariant.typeahead}
@@ -160,7 +163,7 @@ export class DataFormatField extends React.Component<Props, State> {
{propertiesAdvanced.length > 0 &&
<ExpandableSection
toggleText={'Advanced properties'}
- onToggle={isExpanded => this.setState({isShowAdvanced: !this.state.isShowAdvanced})}
+ onToggle={(_event, isExpanded) => this.setState({isShowAdvanced: !this.state.isShowAdvanced})}
isExpanded={this.state.isShowAdvanced}>
{this.getPropertyFields(value, propertiesAdvanced)}
</ExpandableSection>}
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/DslPropertyField.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/DslPropertyField.tsx
index 63ff380f..3021baf2 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/DslPropertyField.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/DslPropertyField.tsx
@@ -16,27 +16,30 @@
*/
import React from 'react';
import {
- FormGroup,
- TextInput,
- Popover,
- Switch,
- Select,
- SelectVariant,
- SelectDirection,
- SelectOption,
- ExpandableSection,
- TextArea,
- Chip,
- TextInputGroup,
- TextInputGroupMain,
- TextInputGroupUtilities,
- ChipGroup,
- Button,
- Text,
- Tooltip,
- Card,
- InputGroup, capitalize,
+ FormGroup,
+ TextInput,
+ Popover,
+ Switch,
+ ExpandableSection,
+ TextArea,
+ Chip,
+ TextInputGroup,
+ TextInputGroupMain,
+ TextInputGroupUtilities,
+ ChipGroup,
+ Button,
+ Text,
+ Tooltip,
+ Card,
+ InputGroup,
+ capitalize, InputGroupItem
} from '@patternfly/react-core';
+import {
+ Select,
+ SelectVariant,
+ SelectDirection,
+ SelectOption
+} from '@patternfly/react-core/deprecated';
import '../../karavan.css';
import "@patternfly/patternfly/patternfly.css";
import HelpIcon from "@patternfly/react-icons/dist/js/icons/help-icon";
@@ -155,7 +158,7 @@ export class DslPropertyField extends React.Component<Props, State> {
const tooltip = value ? "Delete " + property.name : "Add " + property.name;
const className = value ? "change-button delete-button" : "change-button add-button";
const x = value ? undefined : CamelDefinitionApi.createStep(property.type, {});
- const icon = value ? (<DeleteIcon noVerticalAlign/>) : (<AddIcon noVerticalAlign/>);
+ const icon = value ? (<DeleteIcon />) : (<AddIcon />);
return (
<div style={{display: "flex"}}>
<Text>{property.displayName} </Text>
@@ -173,7 +176,7 @@ export class DslPropertyField extends React.Component<Props, State> {
isUriReadOnly = (property: PropertyMeta): boolean => {
const dslName: string = this.props.element?.dslName || '';
- return property.name === 'uri' && !['ToDefinition', 'ToDynamicDefinition', 'WireTapDefinition'].includes(dslName)
+ return property.name === 'uri' && !['ToDynamicDefinition', 'WireTapDefinition'].includes(dslName)
}
selectInfrastructure = (value: string) => {
@@ -225,20 +228,22 @@ export class DslPropertyField extends React.Component<Props, State> {
</Tooltip>}
{(!showEditor || property.secret) && <TextInput
ref={this.state.ref}
- className="text-field" isRequired isReadOnly={this.isUriReadOnly(property)}
+ className="text-field" isRequired
type={['integer', 'number'].includes(property.type) ? 'number' : (property.secret ? "password" : "text")}
id={property.name} name={property.name}
value={value?.toString()}
- onChange={e => this.propertyChanged(property.name, ['integer', 'number'].includes(property.type) ? Number(e) : e)}/>
+ onChange={(_, v) => this.propertyChanged(property.name, ['integer', 'number'].includes(property.type) ? Number(v) : v)}
+ readOnlyVariant={this.isUriReadOnly(property) ? "default" : undefined}/>
}
{showEditor && !property.secret && <TextArea
ref={this.state.ref}
autoResize={true}
- className="text-field" isRequired isReadOnly={this.isUriReadOnly(property)}
+ className="text-field" isRequired
type="text"
id={property.name} name={property.name}
value={value?.toString()}
- onChange={e => this.propertyChanged(property.name, ['integer', 'number'].includes(property.type) ? Number(e) : e)}/>
+ onChange={(_, v) => this.propertyChanged(property.name, ['integer', 'number'].includes(property.type) ? Number(v) : v)}
+ readOnlyVariant={this.isUriReadOnly(property) ? "default" : undefined}/>
}
{!property.secret &&
<Tooltip position="bottom-end" content={showEditor ? "Change to TextField" : "Change to Text Area"}>
@@ -266,19 +271,24 @@ export class DslPropertyField extends React.Component<Props, State> {
const {dslLanguage, dark} = this.props;
const {showEditor, customCode} = this.state;
return (<InputGroup>
- <TextInput
- ref={this.state.ref}
- className="text-field" isRequired isReadOnly={this.isUriReadOnly(property)}
- type="text"
- id={property.name} name={property.name}
- value={value?.toString()}
- onChange={e => this.propertyChanged(property.name, CamelUtil.capitalizeName(e?.replace(/\s/g, '')))}/>
- <Tooltip position="bottom-end" content={"Create Java Class"}>
+ <InputGroupItem isFill >
+ <TextInput
+ ref={this.state.ref}
+ className="text-field" isRequired
+ type="text"
+ id={property.name} name={property.name}
+ value={value?.toString()}
+ onChange={(_, value) => {
+ this.propertyChanged(property.name, CamelUtil.capitalizeName(value?.replace(/\s/g, '')))
+ }}
+ readOnlyVariant={this.isUriReadOnly(property) ? "default" : undefined}/>
+ </InputGroupItem>
+ <InputGroupItem><Tooltip position="bottom-end" content={"Create Java Class"}>
<Button isDisabled={value?.length === 0} variant="control" onClick={e => this.showCode(value, property.javaType)}>
<PlusIcon/>
</Button>
- </Tooltip>
- <ModalEditor property={property}
+ </Tooltip></InputGroupItem>
+ <InputGroupItem><ModalEditor property={property}
customCode={customCode}
showEditor={showEditor}
dark={dark}
@@ -289,7 +299,7 @@ export class DslPropertyField extends React.Component<Props, State> {
this.propertyChanged(fieldId, value);
KaravanInstance.getProps().onSaveCustomCode?.call(this, value, value1);
this.setState({showEditor: false});
- }}/>
+ }}/></InputGroupItem>
</InputGroup>)
}
@@ -298,7 +308,7 @@ export class DslPropertyField extends React.Component<Props, State> {
const {showEditor} = this.state;
return (
<InputGroup>
- <TextArea
+ <InputGroupItem isFill ><TextArea
autoResize
className="text-field" isRequired
type={"text"}
@@ -306,13 +316,13 @@ export class DslPropertyField extends React.Component<Props, State> {
name={property.name}
height={"100px"}
value={value?.toString()}
- onChange={e => this.propertyChanged(property.name, e)}/>
- <Tooltip position="bottom-end" content={"Show Editor"}>
+ onChange={(_, v) => this.propertyChanged(property.name, v)}/></InputGroupItem>
+ <InputGroupItem><Tooltip position="bottom-end" content={"Show Editor"}>
<Button variant="control" onClick={e => this.setState({showEditor: !showEditor})}>
<EditorIcon/>
</Button>
- </Tooltip>
- <ModalEditor property={property}
+ </Tooltip></InputGroupItem>
+ <InputGroupItem><ModalEditor property={property}
customCode={value}
showEditor={showEditor}
dark={dark}
@@ -322,7 +332,7 @@ export class DslPropertyField extends React.Component<Props, State> {
onSave={(fieldId, value1) => {
this.propertyChanged(fieldId, value1);
this.setState({showEditor: false});
- }}/>
+ }}/></InputGroupItem>
</InputGroup>
)
}
@@ -359,7 +369,7 @@ export class DslPropertyField extends React.Component<Props, State> {
value={value?.toString()}
aria-label={property.name}
isChecked={isChecked}
- onChange={e => this.propertyChanged(property.name, e)}/>
+ onChange={(_, v) => this.propertyChanged(property.name, v)}/>
)
}
@@ -374,7 +384,7 @@ export class DslPropertyField extends React.Component<Props, State> {
<Select
variant={SelectVariant.single}
aria-label={property.name}
- onToggle={isExpanded => {
+ onToggle={(_event, isExpanded) => {
this.openSelect(property.name, isExpanded)
}}
onSelect={(e, value, isPlaceholder) => this.propertyChanged(property.name, (!isPlaceholder ? value : undefined))}
@@ -399,7 +409,7 @@ export class DslPropertyField extends React.Component<Props, State> {
<Select
variant={SelectVariant.single}
aria-label={property.name}
- onToggle={isExpanded => {
+ onToggle={(_event, isExpanded) => {
this.openSelect(property.name, isExpanded)
}}
onSelect={(e, value, isPlaceholder) => this.propertyChanged(property.name, (!isPlaceholder ? value : undefined))}
@@ -433,7 +443,7 @@ export class DslPropertyField extends React.Component<Props, State> {
placeholderText="Select Media Type"
variant={SelectVariant.typeahead}
aria-label={property.name}
- onToggle={isExpanded => {
+ onToggle={(_event, isExpanded) => {
this.openSelect(property.name, isExpanded)
}}
onSelect={(e, value, isPlaceholder) => this.propertyChanged(property.name, (!isPlaceholder ? value : undefined))}
@@ -490,7 +500,7 @@ export class DslPropertyField extends React.Component<Props, State> {
variant={SelectVariant.typeahead}
aria-label={property.name}
onClear={event => this.clearSelection(property.name)}
- onToggle={isExpanded => {
+ onToggle={(_event, isExpanded) => {
this.openSelect(property.name, isExpanded)
}}
onSelect={(e, value, isPlaceholder) => {
@@ -621,7 +631,7 @@ export class DslPropertyField extends React.Component<Props, State> {
return (
<ExpandableSection
toggleText={label}
- onToggle={isExpanded => {
+ onToggle={(_event, isExpanded) => {
this.setState(state => {
state.isShowAdvanced.set(label, !state.isShowAdvanced.get(label));
return {isShowAdvanced: state.isShowAdvanced};
@@ -659,8 +669,8 @@ export class DslPropertyField extends React.Component<Props, State> {
<button type="button" aria-label="More info" onClick={e => {
e.preventDefault();
e.stopPropagation();
- }} className="pf-c-form__group-label-help">
- <HelpIcon noVerticalAlign/>
+ }} className="pf-v5-c-form__group-label-help">
+ <HelpIcon />
</button>
</Popover>
: <div></div>
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/ExpressionField.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/ExpressionField.tsx
index 95cf6383..135c11fe 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/ExpressionField.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/ExpressionField.tsx
@@ -16,13 +16,15 @@
*/
import React from 'react';
import {
- FormGroup,
- Popover,
- Select,
- SelectVariant,
- SelectDirection,
- SelectOption
+ FormGroup,
+ Popover
} from '@patternfly/react-core';
+import {
+ Select,
+ SelectVariant,
+ SelectDirection,
+ SelectOption
+} from '@patternfly/react-core/deprecated';
import '../../karavan.css';
import "@patternfly/patternfly/patternfly.css";
import HelpIcon from "@patternfly/react-icons/dist/js/icons/help-icon";
@@ -109,14 +111,14 @@ export class ExpressionField extends React.Component<Props, State> {
})
return (
<div>
- <label className="pf-c-form__label" htmlFor="expression">
- <span className="pf-c-form__label-text">Language</span>
- <span className="pf-c-form__label-required" aria-hidden="true"> *</span>
+ <label className="pf-v5-c-form__label" htmlFor="expression">
+ <span className="pf-v5-c-form__label-text">Language</span>
+ <span className="pf-v5-c-form__label-required" aria-hidden="true"> *</span>
</label>
<Select
variant={SelectVariant.typeahead}
aria-label={property.name}
- onToggle={isExpanded => {
+ onToggle={(_event, isExpanded) => {
this.openSelect(isExpanded)
}}
onSelect={(e, lang, isPlaceholder) => {
@@ -141,8 +143,8 @@ export class ExpressionField extends React.Component<Props, State> {
e.preventDefault();
e.stopPropagation();
}}
- className="pf-c-form__group-label-help">
- <HelpIcon noVerticalAlign/>
+ className="pf-v5-c-form__group-label-help">
+ <HelpIcon />
</button>
</Popover> : <div></div>
}>
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/InfrastructureSelector.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/InfrastructureSelector.tsx
index e0069bc0..a9e9649f 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/InfrastructureSelector.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/InfrastructureSelector.tsx
@@ -22,7 +22,7 @@ import {
Tab, Tabs, TabTitleText, TextInput,
} from '@patternfly/react-core';
import '../../karavan.css';
-import {TableComposable, Tbody, Td, Th, Thead, Tr} from "@patternfly/react-table";
+import {Table /* data-codemods */, Tbody, Td, Th, Thead, Tr} from "@patternfly/react-table";
import {InfrastructureAPI} from "../../utils/InfrastructureAPI";
interface Props {
@@ -65,9 +65,11 @@ export class InfrastructureSelector extends React.Component<Props, State> {
return (
<Form isHorizontal className="search" autoComplete="off">
<FormGroup fieldId="search">
- <TextInput className="text-field" type="text" id="search" name="search" iconVariant='search'
- value={this.state.filter}
- onChange={e => this.setState({filter: e})}/>
+ <TextInput className="text-field" type="text" id="search" name="search"
+ value={this.state.filter}
+ onChange={(_, value) => {
+ this.setState({filter: value})
+ }}/>
</FormGroup>
</Form>
)
@@ -76,7 +78,7 @@ export class InfrastructureSelector extends React.Component<Props, State> {
getConfigMapTable() {
const configMaps = this.state.configMaps;
return (
- <TableComposable variant='compact' borders={false}>
+ <Table variant='compact' borders={false}>
<Thead>
<Tr>
<Th/>
@@ -108,14 +110,14 @@ export class InfrastructureSelector extends React.Component<Props, State> {
)
})}
</Tbody>
- </TableComposable>
+ </Table>
)
}
getSecretsTable() {
const secrets = this.state.secrets;
return (
- <TableComposable variant='compact' borders={false}>
+ <Table variant='compact' borders={false}>
<Thead>
<Tr>
<Th/>
@@ -147,14 +149,14 @@ export class InfrastructureSelector extends React.Component<Props, State> {
)
})}
</Tbody>
- </TableComposable>
+ </Table>
)
}
getServicesTable() {
const services = this.state.services;
return (
- <TableComposable variant='compact' borders={false}>
+ <Table variant='compact' borders={false}>
<Thead>
<Tr>
<Th/>
@@ -202,7 +204,7 @@ export class InfrastructureSelector extends React.Component<Props, State> {
)
})}
</Tbody>
- </TableComposable>
+ </Table>
)
}
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/KameletPropertyField.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/KameletPropertyField.tsx
index 9b0a3b39..e837677f 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/KameletPropertyField.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/KameletPropertyField.tsx
@@ -127,14 +127,14 @@ export class KameletPropertyField extends React.Component<Props, State> {
type={property.format && !showPassword ? "password" : "text"}
id={id} name={id}
value={value}
- onChange={e => this.parametersChanged(property.id, e)}/>}
+ onChange={(e, value) => this.parametersChanged(property.id, value)}/>}
{showEditor && property.format !== "password" &&
<TextArea autoResize={true}
className="text-field" isRequired
type="text"
id={id} name={id}
value={value}
- onChange={e => this.parametersChanged(property.id, e)}/>}
+ onChange={(e, value) => this.parametersChanged(property.id, value)}/>}
{property.format !== "password" &&
<Tooltip position="bottom-end" content={showEditor ? "Change to TextField" : "Change to Text Area"}>
<Button variant="control" onClick={e => this.setState({showEditor: !showEditor})}>
@@ -177,8 +177,8 @@ export class KameletPropertyField extends React.Component<Props, State> {
</div>
}>
<button type="button" aria-label="More info" onClick={e => e.preventDefault()}
- className="pf-c-form__group-label-help">
- <HelpIcon noVerticalAlign/>
+ className="pf-v5-c-form__group-label-help">
+ <HelpIcon />
</button>
</Popover>
}>
@@ -186,7 +186,7 @@ export class KameletPropertyField extends React.Component<Props, State> {
}
{['integer', 'int', 'number'].includes(property.type) &&
<TextInput className="text-field" isRequired type='number' id={id} name={id} value={value}
- onChange={e => this.parametersChanged(property.id, Number(e))}
+ onChange={(e, value) => this.parametersChanged(property.id, Number(value))}
/>
}
{property.type === 'boolean' && <Switch
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/ModalEditor.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/ModalEditor.tsx
index 0d5568e8..ac953db3 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/ModalEditor.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/ModalEditor.tsx
@@ -71,14 +71,14 @@ export class ModalEditor extends React.Component<Props, State> {
<Title id="modal-custom-header-label" headingLevel="h1" size={TitleSizes['2xl']}>
{title}
</Title>
- <p className="pf-u-pt-sm">{dslLanguage?.[2]}</p>
+ <p className="pf-v5-u-pt-sm">{dslLanguage?.[2]}</p>
</React.Fragment>}
isOpen={showEditor}
onClose={() => this.close()}
actions={[
- <Button key="save" variant="primary" isSmall
+ <Button key="save" variant="primary" size="sm"
onClick={e => this.closeAndSave()}>Save</Button>,
- <Button key="cancel" variant="secondary" isSmall
+ <Button key="cancel" variant="secondary" size="sm"
onClick={e => this.close()}>Close</Button>
]}
onEscapePress={e => this.close()}>
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/templates/TemplatesDesigner.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/templates/TemplatesDesigner.tsx
index 78c8b070..ffc5d9d9 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/templates/TemplatesDesigner.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/templates/TemplatesDesigner.tsx
@@ -17,7 +17,7 @@
import React from 'react';
import {
EmptyState, EmptyStateBody, EmptyStateIcon,
- PageSection, Title
+ PageSection, EmptyStateHeader,
} from '@patternfly/react-core';
import '../karavan.css';
import {CamelElement, Integration} from "karavan-core/lib/model/IntegrationDefinition";
@@ -59,10 +59,7 @@ export class TemplatesDesigner extends React.Component<Props, State> {
<PageSection className="templates-page" isFilled padding={{default: 'noPadding'}}>
<div className="templates-page-columns">
<EmptyState>
- <EmptyStateIcon icon={CubesIcon} />
- <Title headingLevel="h4" size="lg">
- Templates
- </Title>
+ <EmptyStateHeader titleText="Templates" icon={<EmptyStateIcon icon={CubesIcon} />} headingLevel="h4" />
<EmptyStateBody>
Templates not implemented yet
</EmptyStateBody>
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/utils/KaravanComponents.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/utils/KaravanComponents.tsx
index 72b92b93..faddd84d 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/utils/KaravanComponents.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/utils/KaravanComponents.tsx
@@ -35,8 +35,8 @@ export class IntegrationHeader extends React.Component<Props> {
{/* }/>*/}
{/*</FormGroup>*/}
<FormGroup label="Name" fieldId="name" isRequired>
- <TextInput className="text-field" type="text" id="name" name="name" isReadOnly
- value={this.props.integration.metadata.name}/>
+ <TextInput className="text-field" type="text" id="name" name="name"
+ value={this.props.integration.metadata.name} readOnlyVariant="default"/>
</FormGroup>
</div>
)
diff --git a/karavan-web/karavan-app/src/main/webui/src/index.css b/karavan-web/karavan-app/src/main/webui/src/index.css
index b884e05c..c013e3fd 100644
--- a/karavan-web/karavan-app/src/main/webui/src/index.css
+++ b/karavan-web/karavan-app/src/main/webui/src/index.css
@@ -8,7 +8,7 @@
flex-direction: column;
}
-.karavan .pf-c-page__main {
+.karavan .pf-v5-c-page__main {
overflow: hidden;
}
@@ -23,7 +23,7 @@
}
.karavan .nav-buttons {
- background: var(--pf-c-page__header--BackgroundColor);
+ background: var(--pf-v5-c-page__header--BackgroundColor);
}
.karavan .nav-buttons .logo {
@@ -33,14 +33,14 @@
height: 32px;
}
-.karavan .nav-buttons .pf-c-button {
+.karavan .nav-buttons .pf-v5-c-button {
padding: 0;
width: 64px;
height: 64px;
- color: var(--pf-global--Color--light-100);
+ color: var(--pf-v5-global--Color--light-100);
}
-.karavan .nav-buttons .pf-c-button svg {
+.karavan .nav-buttons .pf-v5-c-button svg {
width: 24px;
}
@@ -48,25 +48,25 @@
width: 32px;
height: 32px;
margin-bottom: 6px;
- border: solid var(--pf-global--Color--light-100) 1px;
- background-color: var(--pf-global--Color--light-100);
+ border: solid var(--pf-v5-global--Color--light-100) 1px;
+ background-color: var(--pf-v5-global--Color--light-100);
border-radius: 32px;
padding: 6px;
}
-.karavan .nav-buttons .pf-c-button.pf-m-plain {
+.karavan .nav-buttons .pf-v5-c-button.pf-m-plain {
border-left-width: 3px;
border-left-style: solid;
border-left-color: transparent;
border-radius: 0;
}
-.karavan .nav-button-selected .pf-c-button.pf-m-plain {
- border-left-color: var(--pf-global--active-color--400);
- background-color: var(--pf-global--BackgroundColor--dark-400);
+.karavan .nav-button-selected .pf-v5-c-button.pf-m-plain {
+ border-left-color: var(--pf-v5-global--active-color--400);
+ background-color: var(--pf-v5-global--BackgroundColor--dark-400);
}
-.karavan .integration-card .pf-c-card__footer {
+.karavan .integration-card .pf-v5-c-card__footer {
text-align: end;
}
@@ -87,12 +87,12 @@
/*Projects*/
-.karavan .tools .pf-c-button {
+.karavan .tools .pf-v5-c-button {
font-size: 14px;
}
-.karavan .projects-page .pf-c-table tr {
- --pf-c-table--cell--FontSize: 14px;
+.karavan .projects-page .pf-v5-c-table tr {
+ --pf-v5-c-table--cell--FontSize: 14px;
}
.karavan .projects-page .icon-td {
@@ -126,7 +126,7 @@
font-size: 14px;
}
-.karavan .project-page .project-title .pf-l-flex.pf-m-column > * {
+.karavan .project-page .project-title .pf-v5-l-flex.pf-m-column > * {
margin-bottom: 0;
}
@@ -141,16 +141,16 @@
background-color: white;
}
-.karavan .project-page .pf-c-description-list__group {
+.karavan .project-page .pf-v5-c-description-list__group {
min-height: 30px;
}
-.karavan .project-page .pf-c-tabs__link,
+.karavan .project-page .pf-v5-c-tabs__link,
.karavan .project-page .pf-m-link {
font-size: 14px;
}
-.karavan .project-page .pf-c-description-list__text {
+.karavan .project-page .pf-v5-c-description-list__text {
font-size: 15px;
}
@@ -170,10 +170,10 @@
height: 30px;
}
-.karavan .project-page .project-development .pf-c-panel__header {
+.karavan .project-page .project-development .pf-v5-c-panel__header {
padding: 0;
}
-.karavan .project-page .project-development .pf-c-panel__main {
+.karavan .project-page .project-development .pf-v5-c-panel__main {
max-height: 212px;
}
@@ -181,7 +181,7 @@
margin-bottom: 16px;
}
-.karavan .project-page .project-tab-panel .pf-c-panel__header {
+.karavan .project-page .project-tab-panel .pf-v5-c-panel__header {
padding-bottom: 0;
}
@@ -204,32 +204,32 @@
display: flex;
flex-direction: row;
justify-content: flex-end;
- border-top: 1px solid var(--pf-global--BorderColor--100);
+ border-top: 1px solid var(--pf-v5-global--BorderColor--100);
padding-right: 6px;
}
.karavan .project-log .buttons button,
-.karavan .project-log .buttons .pf-c-check {
+.karavan .project-log .buttons .pf-v5-c-check {
padding: 8px;
}
-.karavan .project-log .buttons .pf-c-check .pf-c-check__label{
+.karavan .project-log .buttons .pf-v5-c-check .pf-v5-c-check__label{
font-size: 12px;
line-height: 20px;
padding: 0;
}
-.karavan .project-log .pf-c-log-viewer__scroll-container {
+.karavan .project-log .pf-v5-c-log-viewer__scroll-container {
/*height: 100% !important;*/
}
-.karavan .project-log .pf-c-log-viewer__text {
+.karavan .project-log .pf-v5-c-log-viewer__text {
font-size: 12px;
}
.karavan .project-log .log-name {
- --pf-c-label__content--before--BorderWidth: 0;
- --pf-c-label--BackgroundColor: transparent;
+ --pf-v5-c-label__content--before--BorderWidth: 0;
+ --pf-v5-c-label--BackgroundColor: transparent;
margin-right: auto;
font-size: 12px;
}
@@ -281,7 +281,7 @@
color: white;
}
-.karavan .project-page .pipeline .pf-c-progress-stepper__step-main {
+.karavan .project-page .pipeline .pf-v5-c-progress-stepper__step-main {
display: none;
}
@@ -295,19 +295,19 @@
margin: 0;
}
-.karavan .project-page .pf-c-label__icon {
+.karavan .project-page .pf-v5-c-label__icon {
height: 16px;
}
-.karavan .project-page .pf-c-label__icon svg {
+.karavan .project-page .pf-v5-c-label__icon svg {
height: 16px;
}
-.karavan .project-page .pf-c-label__icon, .spinner {
+.karavan .project-page .pf-v5-c-label__icon, .spinner {
margin-bottom: -2px;
}
-.karavan .project-page .pf-c-label__icon, .not-spinner {
+.karavan .project-page .pf-v5-c-label__icon, .not-spinner {
margin-bottom: 3px;
}
@@ -315,7 +315,7 @@
padding: 0;
}
-.create-file-form .pf-c-form__group {
+.create-file-form .pf-v5-c-form__group {
grid-template-columns: 80px 1fr !important;
}
@@ -323,7 +323,7 @@
margin-left: 16px;
}
-.karavan .pf-c-code-block__code {
+.karavan .pf-v5-c-code-block__code {
overflow-wrap: anywhere;
}
@@ -354,7 +354,7 @@
margin-top: 3px;
}
-.karavan .dashboard-page .camel-label-group .pf-c-label-group__list {
+.karavan .dashboard-page .camel-label-group .pf-v5-c-label-group__list {
flex-wrap: nowrap;
}
@@ -373,14 +373,14 @@
/*Modals*/
-.new-project .pf-c-radio,
+.new-project .pf-v5-c-radio,
.new-project .runtime-radio {
display: flex;
flex-direction: row;
align-items: center;
}
-.new-project .pf-c-radio__body {
+.new-project .pf-v5-c-radio__body {
margin: 0 6px 0 6px;
}
@@ -398,10 +398,15 @@
opacity: 0.5;
}
+.karavan .projects-page .labeled-button,
+.karavan .project-page .labeled-button {
+ padding: 0 5px 0 5px;
+}
+
.projects-page tr:hover .project-action-buttons {
opacity: 1;
}
-.projects-page .pf-c-table.pf-m-compact tr:not(.pf-c-table__expandable-row) > *:last-child {
- --pf-c-table--cell--PaddingRight: 0;
+.projects-page .pf-v5-c-table.pf-m-compact tr:not(.pf-v5-c-table__expandable-row) > *:last-child {
+ --pf-v5-c-table--cell--PaddingRight: 0;
}
\ No newline at end of file
diff --git a/karavan-web/karavan-app/src/main/webui/src/knowledgebase/KnowledgebasePage.tsx b/karavan-web/karavan-app/src/main/webui/src/knowledgebase/KnowledgebasePage.tsx
index d7856f55..02c6b641 100644
--- a/karavan-web/karavan-app/src/main/webui/src/knowledgebase/KnowledgebasePage.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/knowledgebase/KnowledgebasePage.tsx
@@ -45,13 +45,13 @@ export const KnowledgebasePage = (props: Props) => {
<Switch
label="Custom only"
isChecked={customOnly}
- onChange={checked => setCustomOnly(checked)}
+ onChange={(_event, checked) => setCustomOnly(checked)}
/>
</ToolbarItem>}
<ToolbarItem>
<TextInput className="text-field" type="search" id="search" name="search"
value={filter}
- onChange={value => setFilter(value)}
+ onChange={(_event, value) => setFilter(value)}
autoComplete="off"
placeholder="Search by name"/>
</ToolbarItem>
diff --git a/karavan-web/karavan-app/src/main/webui/src/knowledgebase/components/ComponentModal.tsx b/karavan-web/karavan-app/src/main/webui/src/knowledgebase/components/ComponentModal.tsx
index 7d622425..fd082fee 100644
--- a/karavan-web/karavan-app/src/main/webui/src/knowledgebase/components/ComponentModal.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/knowledgebase/components/ComponentModal.tsx
@@ -21,11 +21,10 @@ import {
ActionGroup,
Text,
CardHeader,
- CardActions,
Badge, Flex, CardTitle,
} from '@patternfly/react-core';
import '../../designer/karavan.css';
-import {TableComposable, Tbody, Td, Th, Thead, Tr} from "@patternfly/react-table";
+import {Table /* data-codemods */, Tbody, Td, Th, Thead, Tr} from "@patternfly/react-table";
import {Component} from "karavan-core/lib/model/ComponentModels";
import {CamelUi} from "../../designer/utils/CamelUi";
import {ComponentApi} from "karavan-core/lib/api/ComponentApi";
@@ -84,18 +83,16 @@ export class ComponentModal extends React.Component<Props, State> {
>
<Flex direction={{default: 'column'}} key={component?.component.name}
className="kamelet-modal-card">
- <CardHeader>
+ <CardHeader actions={{ actions: <><Badge className="badge"
+ isRead> {component?.component.label}</Badge></>, hasNoOffset: false, className: undefined}} >
{component && CamelUi.getIconForComponent(component.component.title, component.component.label)}
- <CardActions>
- <Badge className="badge"
- isRead> {component?.component.label}</Badge>
- </CardActions>
+
</CardHeader>
<Text className="description">{component?.component.description}</Text>
{props.size !== 0 &&
<div>
<CardTitle>Properties</CardTitle>
- <TableComposable aria-label="Simple table" variant='compact'>
+ <Table aria-label="Simple table" variant='compact'>
<Thead>
<Tr>
<Th key='name'>Display Name / Name</Th>
@@ -122,7 +119,7 @@ export class ComponentModal extends React.Component<Props, State> {
</Tr>
))}
</Tbody>
- </TableComposable>
+ </Table>
</div>
}
</Flex>
diff --git a/karavan-web/karavan-app/src/main/webui/src/knowledgebase/eip/EipCard.tsx b/karavan-web/karavan-app/src/main/webui/src/knowledgebase/eip/EipCard.tsx
index 2fee706f..db980615 100644
--- a/karavan-web/karavan-app/src/main/webui/src/knowledgebase/eip/EipCard.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/knowledgebase/eip/EipCard.tsx
@@ -45,13 +45,15 @@ export class EipCard extends React.Component<Props, State> {
render() {
const component = this.state.element;
return (
- <Card isHoverable isCompact key={component.name} className="kamelet-card"
+ <Card isCompact key={component.name} className="kamelet-card"
onClick={event => this.click(event)}
>
+ <CardHeader>
+ </CardHeader>
<CardHeader>
{CamelUi.getIconForDslName(component.className)}
+ <CardTitle>{component.title}</CardTitle>
</CardHeader>
- <CardTitle>{component.title}</CardTitle>
<CardBody>{component.description}</CardBody>
<CardFooter className="footer-labels">
<div>
diff --git a/karavan-web/karavan-app/src/main/webui/src/knowledgebase/eip/EipModal.tsx b/karavan-web/karavan-app/src/main/webui/src/knowledgebase/eip/EipModal.tsx
index 55ae5f36..4757b953 100644
--- a/karavan-web/karavan-app/src/main/webui/src/knowledgebase/eip/EipModal.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/knowledgebase/eip/EipModal.tsx
@@ -21,11 +21,10 @@ import {
ActionGroup,
Text,
CardHeader,
- CardActions,
Badge, Flex, CardTitle,
} from '@patternfly/react-core';
import '../../designer/karavan.css';
-import {TableComposable, Tbody, Td, Th, Thead, Tr} from "@patternfly/react-table";
+import {Table /* data-codemods */, Tbody, Td, Th, Thead, Tr} from "@patternfly/react-table";
import {CamelUi} from "../../designer/utils/CamelUi";
import {ElementMeta, PropertyMeta} from "karavan-core/lib/model/CamelMetadata";
@@ -77,18 +76,16 @@ export class EipModal extends React.Component<Props, State> {
>
<Flex direction={{default: 'column'}} key={component?.name}
className="kamelet-modal-card">
- <CardHeader>
+ <CardHeader actions={{ actions: <><Badge className="badge"
+ isRead> {component?.labels}</Badge></>, hasNoOffset: false, className: undefined}} >
{component && CamelUi.getIconForDslName(component?.className)}
- <CardActions>
- <Badge className="badge"
- isRead> {component?.labels}</Badge>
- </CardActions>
+
</CardHeader>
<Text className="description">{component?.description}</Text>
{component?.properties.length !== 0 &&
<div>
<CardTitle>Properties</CardTitle>
- <TableComposable aria-label="Simple table" variant='compact'>
+ <Table aria-label="Simple table" variant='compact'>
<Thead>
<Tr>
<Th key='name'>Display Name / Name</Th>
@@ -115,7 +112,7 @@ export class EipModal extends React.Component<Props, State> {
</Tr>
))}
</Tbody>
- </TableComposable>
+ </Table>
</div>
}
</Flex>
diff --git a/karavan-web/karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletCard.tsx b/karavan-web/karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletCard.tsx
index 649076b3..948ffb70 100644
--- a/karavan-web/karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletCard.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletCard.tsx
@@ -47,7 +47,7 @@ export class KameletCard extends React.Component<Props, State> {
const kamelet = this.state.kamelet;
const isCustom = KameletApi.getCustomKameletNames().includes(kamelet.metadata.name);
return (
- <Card isHoverable isCompact key={kamelet.metadata.name} className="kamelet-card"
+ <Card isCompact key={kamelet.metadata.name} className="kamelet-card"
onClick={event => this.click(event)}
>
<CardHeader className="header-labels">
diff --git a/karavan-web/karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletModal.tsx b/karavan-web/karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletModal.tsx
index cf9ba3c1..33801485 100644
--- a/karavan-web/karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletModal.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletModal.tsx
@@ -21,12 +21,11 @@ import {
ActionGroup,
Text,
CardHeader,
- CardActions,
Badge, Flex, CardTitle,
} from '@patternfly/react-core';
import '../../designer/karavan.css';
import {KameletModel, Property} from "karavan-core/lib/model/KameletModels";
-import {TableComposable, Tbody, Td, Th, Thead, Tr} from "@patternfly/react-table";
+import {Table /* data-codemods */, Tbody, Td, Th, Thead, Tr} from "@patternfly/react-table";
import {CamelUi} from "../../designer/utils/CamelUi";
interface Props {
@@ -82,18 +81,16 @@ export class KameletModal extends Component<Props, State> {
>
<Flex direction={{default: 'column'}} key={this.state.kamelet?.metadata.name}
className="kamelet-modal-card">
- <CardHeader>
+ <CardHeader actions={{ actions: <><Badge className="badge"
+ isRead> {this.state.kamelet?.metadata.labels["camel.apache.org/kamelet.type"].toLowerCase()}</Badge></>, hasNoOffset: false, className: undefined}} >
{this.state.kamelet && CamelUi.getIconFromSource(this.state.kamelet?.icon())}
- <CardActions>
- <Badge className="badge"
- isRead> {this.state.kamelet?.metadata.labels["camel.apache.org/kamelet.type"].toLowerCase()}</Badge>
- </CardActions>
+
</CardHeader>
<Text className="description">{this.state.kamelet?.spec.definition.description}</Text>
{this.state.kamelet?.spec.definition.properties && this.state.kamelet?.spec.definition.properties.length !== 0 &&
<div>
<CardTitle>Properties</CardTitle>
- <TableComposable aria-label="Simple table" variant='compact'>
+ <Table aria-label="Simple table" variant='compact'>
<Thead>
<Tr>
<Th key='title'>Title</Th>
@@ -114,7 +111,7 @@ export class KameletModal extends Component<Props, State> {
</Tr>
))}
</Tbody>
- </TableComposable>
+ </Table>
</div>
}
</Flex>
diff --git a/karavan-web/karavan-app/src/main/webui/src/main/DataPoller.tsx b/karavan-web/karavan-app/src/main/webui/src/main/DataPoller.tsx
index 5c3aa622..e3c0998a 100644
--- a/karavan-web/karavan-app/src/main/webui/src/main/DataPoller.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/main/DataPoller.tsx
@@ -1,31 +1,15 @@
import React, {useEffect, useState} from 'react';
-import {
- Page,
- Flex,
- FlexItem,
- Spinner, Bullseye
-} from '@patternfly/react-core';
+
import {KaravanApi} from "../api/KaravanApi";
import {SsoApi} from "../api/SsoApi";
import {KameletApi} from "karavan-core/lib/api/KameletApi";
import '../designer/karavan.css';
import {v4 as uuidv4} from "uuid";
import {ComponentApi} from "karavan-core/lib/api/ComponentApi";
-import Icon from "../Logo";
-import {ProjectsPage} from "../projects/ProjectsPage";
-import {MainLogin} from "./MainLogin";
-import {DashboardPage} from "../dashboard/DashboardPage";
-import {ContainersPage} from "../containers/ContainersPage";
-import {ProjectEventBus} from "../api/ProjectEventBus";
-import {AppConfig, ContainerStatus, Project, ToastMessage} from "../api/ProjectModels";
-import {ProjectPage} from "../project/ProjectPage";
+import {AppConfig, ContainerStatus} from "../api/ProjectModels";
import {useAppConfigStore, useStatusesStore} from "../api/ProjectStore";
-import {Notification} from "./Notification";
import {InfrastructureAPI} from "../designer/utils/InfrastructureAPI";
-import {KnowledgebasePage} from "../knowledgebase/KnowledgebasePage";
-import {ServicesPage} from "../services/ServicesPage";
import {shallow} from "zustand/shallow";
-import {PageNavigation} from "./PageNavigation";
export const DataPoller = () => {
diff --git a/karavan-web/karavan-app/src/main/webui/src/main/Main.tsx b/karavan-web/karavan-app/src/main/webui/src/main/Main.tsx
index 2d40b1f4..0c68bf5e 100644
--- a/karavan-web/karavan-app/src/main/webui/src/main/Main.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/main/Main.tsx
@@ -121,7 +121,7 @@ export const Main = () => {
});
}
- function toast(title: string, text: string, variant: 'success' | 'danger' | 'warning' | 'info' | 'default') {
+ function toast(title: string, text: string, variant: 'success' | 'danger' | 'warning' | 'info' | 'custom') {
ProjectEventBus.sendAlert(new ToastMessage(title, text, variant))
}
@@ -150,7 +150,7 @@ export const Main = () => {
<Page className="karavan">
{KaravanApi.authType === undefined &&
<Bullseye className="loading-page">
- <Spinner className="spinner" isSVG diameter="140px" aria-label="Loading..."/>
+ <Spinner className="spinner" diameter="140px" aria-label="Loading..."/>
<div className="logo-placeholder">{Icon()}</div>
</Bullseye>}
{(KaravanApi.isAuthorized || KaravanApi.authType === 'public') && getMain()}
diff --git a/karavan-web/karavan-app/src/main/webui/src/main/MainLogin.tsx b/karavan-web/karavan-app/src/main/webui/src/main/MainLogin.tsx
index 289ea792..40426253 100644
--- a/karavan-web/karavan-app/src/main/webui/src/main/MainLogin.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/main/MainLogin.tsx
@@ -43,12 +43,12 @@ export class MainLogin extends React.Component<Props, State> {
showHelperText={true}
usernameLabel="Username"
usernameValue={this.state.username}
- onChangeUsername={value => this.setState({username: value})}
+ onChangeUsername={(_event, value) => this.setState({username: value})}
isValidUsername={this.state.isValidUsername}
passwordLabel="Password"
passwordValue={this.state.password}
isShowPasswordEnabled
- onChangePassword={value => this.setState({password: value})}
+ onChangePassword={(_event, value) => this.setState({password: value})}
isValidPassword={this.state.isValidPassword}
onLoginButtonClick={this.onLoginButtonClick}
loginButtonLabel="Log in"
diff --git a/karavan-web/karavan-app/src/main/webui/src/main/PageNavigation.tsx b/karavan-web/karavan-app/src/main/webui/src/main/PageNavigation.tsx
index f723cd34..76497ce3 100644
--- a/karavan-web/karavan-app/src/main/webui/src/main/PageNavigation.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/main/PageNavigation.tsx
@@ -85,8 +85,8 @@ export const PageNavigation = () => {
position={"right-end"}
hideOnOutsideClick={false}
isVisible={showUser}
- shouldClose={tip => setShowUser(false)}
- shouldOpen={tip => setShowUser(true)}
+ shouldClose={(_event, tip) => setShowUser(false)}
+ shouldOpen={(_event, tip) => setShowUser(true)}
headerContent={<div>{KaravanApi.me.userName}</div>}
bodyContent={
<Flex direction={{default: "row"}}>
diff --git a/karavan-web/karavan-app/src/main/webui/src/project/DevModeToolbar.tsx b/karavan-web/karavan-app/src/main/webui/src/project/DevModeToolbar.tsx
index e8462d90..7f6d0ec8 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/DevModeToolbar.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/DevModeToolbar.tsx
@@ -32,12 +32,12 @@ export const DevModeToolbar = (props: Props) => {
const icon = isRunning ? <UpIcon/> : <DownIcon/>;
return (<Flex className="toolbar" direction={{default: "row"}} alignItems={{default: "alignItemsCenter"}}>
<FlexItem>
- {(inTransit || isLoading) && <Spinner isSVG size="lg" aria-label="spinner"/>}
+ {(inTransit || isLoading) && <Spinner size="lg" aria-label="spinner"/>}
</FlexItem>
{containerStatus?.containerId && <FlexItem>
<Label icon={icon} color={color}>
<Tooltip content={"Show log"} position={TooltipPosition.bottom}>
- <Button variant="link" isDisabled={!isRunning}
+ <Button className='labeled-button' variant="link" isDisabled={!isRunning}
onClick={e =>
useLogStore.setState({showLog: true, type: 'container', podName: containerStatus.containerName})}>
{containerStatus.containerName}
@@ -50,13 +50,13 @@ export const DevModeToolbar = (props: Props) => {
<Switch aria-label="verbose"
id="verbose"
isChecked={verbose}
- onChange={checked => setVerbose(checked)}
+ onChange={(_, checked) => setVerbose(checked)}
/>
</Tooltip>
</FlexItem>
{!isRunning && <FlexItem>
<Tooltip content="Run in developer mode" position={TooltipPosition.bottom}>
- <Button isSmall
+ <Button size="sm"
isDisabled={(!(commands.length === 0) && !commands.includes('run')) || inTransit}
variant={"primary"}
icon={<RocketIcon/>}
@@ -67,7 +67,7 @@ export const DevModeToolbar = (props: Props) => {
</FlexItem>}
{isRunning && <FlexItem>
<Tooltip content="Reload" position={TooltipPosition.bottom}>
- <Button isSmall
+ <Button size="sm"
isDisabled={inTransit}
variant={"primary"}
className="project-button"
@@ -79,7 +79,7 @@ export const DevModeToolbar = (props: Props) => {
{config.infrastructure !== 'kubernetes' &&
<FlexItem>
<Tooltip content="Stop container" position={TooltipPosition.bottom}>
- <Button isSmall
+ <Button size="sm"
isDisabled={!commands.includes('stop') || inTransit}
variant={"control"}
icon={<StopIcon/>}
@@ -90,7 +90,7 @@ export const DevModeToolbar = (props: Props) => {
}
<FlexItem>
<Tooltip content="Delete container" position={TooltipPosition.bottom}>
- <Button isSmall
+ <Button size="sm"
isDisabled={!commands.includes('delete') || inTransit}
variant={"control"}
icon={<DeleteIcon/>}
diff --git a/karavan-web/karavan-app/src/main/webui/src/project/ProjectToolbar.tsx b/karavan-web/karavan-app/src/main/webui/src/project/ProjectToolbar.tsx
index 748a1594..07ed9373 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/ProjectToolbar.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/ProjectToolbar.tsx
@@ -76,9 +76,9 @@ export const ProjectToolbar = () => {
{isYaml() && <FlexItem>
<ToggleGroup>
<ToggleGroupItem text="Design" buttonId="design" isSelected={mode === "design"}
- onChange={s => setMode("design")}/>
+ onChange={(_event, s) => setMode("design")}/>
<ToggleGroupItem text="Code" buttonId="code" isSelected={mode === "code"}
- onChange={s => setMode("code")}/>
+ onChange={(_event, s) => setMode("code")}/>
</ToggleGroup>
</FlexItem>}
@@ -87,16 +87,16 @@ export const ProjectToolbar = () => {
id="advanced"
label="Edit advanced"
isChecked={editAdvancedProperties}
- onChange={checked => setEditAdvancedProperties(checked)}
+ onChange={(_, checked) => setEditAdvancedProperties(checked)}
/>
</FlexItem>}
{isProperties() && <FlexItem>
- <Button isSmall variant="primary" icon={<PlusIcon/>} onClick={e => addProperty()}>Add property</Button>
+ <Button size="sm" variant="primary" icon={<PlusIcon/>} onClick={e => addProperty()}>Add property</Button>
</FlexItem>}
{isIntegration() && <FlexItem>
<Tooltip content="Download image" position={"bottom-end"}>
- <Button isSmall variant="control" icon={<DownloadImageIcon/>} onClick={e => downloadImage()}/>
+ <Button size="sm" variant="control" icon={<DownloadImageIcon/>} onClick={e => downloadImage()}/>
</Tooltip>
</FlexItem>}
</Flex>
diff --git a/karavan-web/karavan-app/src/main/webui/src/project/file/PropertiesTable.tsx b/karavan-web/karavan-app/src/main/webui/src/project/file/PropertiesTable.tsx
index 50ada72c..5d131dea 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/file/PropertiesTable.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/file/PropertiesTable.tsx
@@ -21,8 +21,16 @@ import {
PageSection,
} from '@patternfly/react-core';
import '../../designer/karavan.css';
-import {TableComposable, Tbody, Td, Th, Thead, Tr} from "@patternfly/react-table";
-import DeleteIcon from "@patternfly/react-icons/dist/js/icons/times-icon";
+import {
+ Tbody,
+ Th,
+ Thead,
+ Tr
+} from '@patternfly/react-table';
+import {
+ Table
+} from '@patternfly/react-table/deprecated';
+
import {ProjectModel, ProjectProperty} from "karavan-core/lib/model/ProjectModel";
import {useFileStore} from "../../api/ProjectStore";
import {ProjectModelApi} from "karavan-core/lib/api/ProjectModelApi";
@@ -95,7 +103,7 @@ export const PropertiesTable = () => {
<PageSection isFilled className="kamelets-page" padding={{default: file !== undefined ? 'noPadding' : 'padding'}}>
<PageSection padding={{default: "noPadding"}}>
{properties.length > 0 &&
- <TableComposable aria-label="Property table" variant='compact' borders={false}
+ <Table aria-label="Property table" variant='compact' borders={false}
className="project-properties">
<Thead>
<Tr>
@@ -111,7 +119,7 @@ export const PropertiesTable = () => {
<PropertyField property={property} readOnly={readOnly} changeProperty={changeProperty} onDelete={startDelete}/>
)})}
</Tbody>
- </TableComposable>}
+ </Table>}
{showDeleteConfirmation && getDeleteConfirmation()}
</PageSection>
</PageSection>
diff --git a/karavan-web/karavan-app/src/main/webui/src/project/file/PropertyField.tsx b/karavan-web/karavan-app/src/main/webui/src/project/file/PropertyField.tsx
index 5719bd55..b9e0160f 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/file/PropertyField.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/file/PropertyField.tsx
@@ -45,7 +45,7 @@ export const PropertyField = (props: Props) => {
<TextInput isDisabled={props.readOnly} isRequired={true} className="text-field" type={"text"}
id={"key-" + props.property.id}
value={key}
- onChange={(val, e) => {
+ onChange={(e, val) => {
e.preventDefault();
setKey(val)
props.changeProperty?.call(this, new ProjectProperty({id: props.property.id, key: val, value: value}));
@@ -55,7 +55,7 @@ export const PropertyField = (props: Props) => {
<TextInput isDisabled={props.readOnly} isRequired={true} className="text-field" type={"text"}
id={"value-" + props.property.id}
value={value }
- onChange={(val, e) => {
+ onChange={(e, val) => {
e.preventDefault();
setValue(val);
props.changeProperty?.call(this, new ProjectProperty({id: props.property.id, key: key, value: val}));
diff --git a/karavan-web/karavan-app/src/main/webui/src/project/files/CreateFileModal.tsx b/karavan-web/karavan-app/src/main/webui/src/project/files/CreateFileModal.tsx
index 90d1d682..587d5244 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/files/CreateFileModal.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/files/CreateFileModal.tsx
@@ -73,15 +73,15 @@ export const CreateFileModal = (props: Props) => {
const title = p.title + ' (' + p.extension + ')';
return <ToggleGroupItem key={title} text={title} buttonId={p.name}
isSelected={fileType === p.name}
- onChange={selected => {
+ onChange={(_, selected) => {
setFileType(p.name);
}}/>
})}
</ToggleGroup>
</FormGroup>
<FormGroup label="Name" fieldId="name" isRequired>
- <TextInput id="name" aria-label="name" value={name} onChange={value => setName(value)}/>
- <FormHelperText isHidden={false} component="div">
+ <TextInput id="name" aria-label="name" value={name} onChange={(_, value) => setName(value)}/>
+ <FormHelperText >
<HelperText id="helper-text1">
<HelperTextItem variant={'default'}>{filename + '.' + extension}</HelperTextItem>
</HelperText>
diff --git a/karavan-web/karavan-app/src/main/webui/src/project/files/FilesTab.tsx b/karavan-web/karavan-app/src/main/webui/src/project/files/FilesTab.tsx
index b6767a64..12218265 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/files/FilesTab.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/files/FilesTab.tsx
@@ -6,10 +6,19 @@ import {
EmptyState,
EmptyStateVariant,
EmptyStateIcon,
- Title, PageSection, PanelHeader, Panel, Tooltip, Label,
+ PageSection, PanelHeader, Panel, Tooltip, Label, EmptyStateHeader,
} from '@patternfly/react-core';
import '../../designer/karavan.css';
-import {TableComposable, Tbody, Td, Th, Thead, Tr} from "@patternfly/react-table";
+import {
+ Tbody,
+ Td,
+ Th,
+ Thead,
+ Tr
+} from '@patternfly/react-table';
+import {
+ Table
+} from '@patternfly/react-table/deprecated';
import DeleteIcon from "@patternfly/react-icons/dist/js/icons/times-icon";
import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
import {useFilesStore, useFileStore, useProjectStore} from "../../api/ProjectStore";
@@ -67,7 +76,7 @@ export const FilesTab = () => {
<FileToolbar/>
</PanelHeader>
</Panel>
- <TableComposable aria-label="Files" variant={"compact"} className={"table"}>
+ <Table aria-label="Files" variant={"compact"} className={"table"}>
<Thead>
<Tr>
<Th key='type' width={20}>Type</Th>
@@ -110,7 +119,7 @@ export const FilesTab = () => {
</Button>
}
<Tooltip content="Download source" position={"bottom-end"}>
- <Button isSmall variant="plain" icon={<DownloadIcon/>} onClick={e => download(file)}/>
+ <Button size="sm" variant="plain" icon={<DownloadIcon/>} onClick={e => download(file)}/>
</Tooltip>
</Td>
</Tr>
@@ -119,18 +128,15 @@ export const FilesTab = () => {
<Tr>
<Td colSpan={8}>
<Bullseye>
- <EmptyState variant={EmptyStateVariant.small}>
- <EmptyStateIcon icon={SearchIcon}/>
- <Title headingLevel="h2" size="lg">
- No results found
- </Title>
+ <EmptyState variant={EmptyStateVariant.sm}>
+ <EmptyStateHeader titleText="No results found" icon={<EmptyStateIcon icon={SearchIcon}/>} headingLevel="h2" />
</EmptyState>
</Bullseye>
</Td>
</Tr>
}
</Tbody>
- </TableComposable>
+ </Table>
<CreateFileModal types={types}/>
<UploadFileModal projectId={project.projectId} isOpen={operation === 'upload'} />
<DeleteFileModal />
diff --git a/karavan-web/karavan-app/src/main/webui/src/project/files/FilesToolbar.tsx b/karavan-web/karavan-app/src/main/webui/src/project/files/FilesToolbar.tsx
index d35ed094..da56443a 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/files/FilesToolbar.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/files/FilesToolbar.tsx
@@ -61,8 +61,8 @@ export const FileToolbar = () => {
>
<Form autoComplete="off" isHorizontal className="create-file-form">
<FormGroup label="Message" fieldId="name" isRequired>
- <TextInput value={commitMessage} onChange={value => setCommitMessage(value)}/>
- <FormHelperText isHidden={false} component="div"/>
+ <TextInput value={commitMessage} onChange={(_, value) => setCommitMessage(value)}/>
+ <FormHelperText />
</FormGroup>
</Form>
</Modal>
@@ -110,7 +110,7 @@ export const FileToolbar = () => {
<FlexItem>
<Tooltip content="Commit and push to git" position={"bottom-end"}>
<Button isLoading={isPushing ? true : undefined}
- isSmall
+ size="sm"
variant={needCommit() ? "primary" : "secondary"}
className="project-button"
icon={!isPushing ? <PushIcon/> : <div></div>}
@@ -123,11 +123,11 @@ export const FileToolbar = () => {
</Tooltip>
</FlexItem>
<FlexItem>
- <Button isSmall variant={"secondary"} icon={<PlusIcon/>}
+ <Button size="sm" variant={"secondary"} icon={<PlusIcon/>}
onClick={e => useFileStore.setState({operation:"create"})}>Create</Button>
</FlexItem>
<FlexItem>
- <Button isSmall variant="secondary" icon={<UploadIcon/>}
+ <Button size="sm" variant="secondary" icon={<UploadIcon/>}
onClick={e => useFileStore.setState({operation:"upload"})}>Upload</Button>
</FlexItem>
{getCommitModal()}
diff --git a/karavan-web/karavan-app/src/main/webui/src/project/files/UploadFileModal.tsx b/karavan-web/karavan-app/src/main/webui/src/project/files/UploadFileModal.tsx
index cc5779eb..8777441c 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/files/UploadFileModal.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/files/UploadFileModal.tsx
@@ -24,6 +24,7 @@ import {ProjectFile, ToastMessage} from "../../api/ProjectModels";
import {KaravanApi} from "../../api/KaravanApi";
import {useFileStore} from "../../api/ProjectStore";
import {ProjectEventBus} from "../../api/ProjectEventBus";
+import {Accept, DropEvent, FileRejection} from "react-dropzone";
interface Props {
projectId: string,
@@ -84,11 +85,11 @@ export class UploadFileModal extends React.Component<Props, State> {
}
}
- handleFileInputChange = (event: React.ChangeEvent<HTMLInputElement> | React.DragEvent<HTMLElement>, file: File) => this.setState({filename: file.name});
+ handleFileInputChange = (file: File) => this.setState({filename: file.name});
handleFileReadStarted = (fileHandle: File) => this.setState({isLoading: true});
handleFileReadFinished = (fileHandle: File) => this.setState({isLoading: false});
handleTextOrDataChange = (data: string) => this.setState({data: data});
- handleFileRejected = (acceptedOrRejected: File[], event: React.DragEvent<HTMLElement>) => this.setState({isRejected: true});
+ handleFileRejected = (fileRejections: FileRejection[], event: DropEvent) => this.setState({isRejected: true});
handleClear = (event: React.MouseEvent<HTMLButtonElement>) => this.setState({
filename: '',
data: '',
@@ -101,7 +102,9 @@ export class UploadFileModal extends React.Component<Props, State> {
const isDisabled = this.state.type === 'integration'
? fileNotUploaded
: !(!fileNotUploaded && this.state.integrationName !== undefined && this.state.integrationName.endsWith(".yaml"));
- const accept = this.state.type === 'integration' ? '.yaml' : '.json, .yaml';
+ const accept : Accept = this.state.type === 'integration'
+ ? {'application/yaml': ['.yaml', '.yml']}
+ : {'application/yaml': ['.yaml', '.yml'], 'application/json': ['.json'], 'plain/text': ['.sql']};
return (
<Modal
title="Upload"
@@ -116,10 +119,10 @@ export class UploadFileModal extends React.Component<Props, State> {
<Form>
<FormGroup fieldId="type">
<Radio value="Integration" label="Integration yaml" name="Integration" id="Integration" isChecked={this.state.type === 'integration'}
- onChange={(_, event) => this.setState({ type: _ ? 'integration': 'openapi' })}
+ onChange={(event, _) => this.setState({ type: _ ? 'integration': 'openapi' })}
/>{' '}
<Radio value="OpenAPI" label="OpenAPI json/yaml" name="OpenAPI" id="OpenAPI" isChecked={this.state.type === 'openapi'}
- onChange={(_, event) => this.setState({ type: _ ? 'openapi' : 'integration' })}
+ onChange={(event, _) => this.setState({ type: _ ? 'openapi' : 'integration' })}
/>
</FormGroup>
<FormGroup fieldId="upload">
@@ -131,11 +134,11 @@ export class UploadFileModal extends React.Component<Props, State> {
hideDefaultPreview
browseButtonText="Upload"
isLoading={this.state.isLoading}
- onFileInputChange={this.handleFileInputChange}
- onDataChange={data => this.handleTextOrDataChange(data)}
- onTextChange={text => this.handleTextOrDataChange(text)}
- onReadStarted={this.handleFileReadStarted}
- onReadFinished={this.handleFileReadFinished}
+ onFileInputChange={(_event, fileHandle: File) => this.handleFileInputChange(fileHandle)}
+ onDataChange={(_event, data) => this.handleTextOrDataChange(data)}
+ onTextChange={(_event, text) => this.handleTextOrDataChange(text)}
+ onReadStarted={(_event, fileHandle: File) => this.handleFileReadStarted(fileHandle)}
+ onReadFinished={(_event, fileHandle: File) => this.handleFileReadFinished(fileHandle)}
allowEditingUploadedText={false}
onClearClick={this.handleClear}
dropzoneProps={{accept: accept, onDropRejected: this.handleFileRejected}}
@@ -148,7 +151,7 @@ export class UploadFileModal extends React.Component<Props, State> {
label="Generate REST DSL"
labelOff="Do not generate REST DSL"
isChecked={this.state.generateRest}
- onChange={checked => this.setState({generateRest: checked})}
+ onChange={(_, checked) => this.setState({generateRest: checked})}
/>
</FormGroup>}
{this.state.type === 'openapi' && this.state.generateRest && <FormGroup fieldId="generateRoutes">
@@ -157,7 +160,7 @@ export class UploadFileModal extends React.Component<Props, State> {
label="Generate Routes"
labelOff="Do not generate Routes"
isChecked={this.state.generateRoutes}
- onChange={checked => this.setState({generateRoutes: checked})}
+ onChange={(_, checked) => this.setState({generateRoutes: checked})}
/>
</FormGroup>}
{this.state.type === 'openapi' && this.state.generateRest && <FormGroup fieldId="integrationName" label="Integration name">
@@ -166,8 +169,7 @@ export class UploadFileModal extends React.Component<Props, State> {
type="text"
placeholder="Integration file name with yaml extension"
required
-
- onChange={value => this.setState({integrationName: value})}
+ onChange={(_, value) => this.setState({integrationName: value})}
/>
</FormGroup>}
</Form>
diff --git a/karavan-web/karavan-app/src/main/webui/src/project/log/ProjectLogPanel.tsx b/karavan-web/karavan-app/src/main/webui/src/project/log/ProjectLogPanel.tsx
index d02ee9ac..ba5e4d7e 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/log/ProjectLogPanel.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/log/ProjectLogPanel.tsx
@@ -56,10 +56,10 @@ export const ProjectLogPanel = () => {
</Tooltip>
<Checkbox label="Wrap text" aria-label="wrap text checkbox" isChecked={isTextWrapped}
id="wrap-text-checkbox"
- onChange={checked => setIsTextWrapped(checked)}/>
+ onChange={(_, checked) => setIsTextWrapped(checked)}/>
<Checkbox label="Autoscroll" aria-label="autoscroll checkbox" isChecked={autoScroll}
id="autoscroll-checkbox"
- onChange={checked => setAutoScroll(checked)}/>
+ onChange={(_, checked) => setAutoScroll(checked)}/>
{/*<Tooltip content={"Scroll to bottom"} position={TooltipPosition.bottom}>*/}
{/* <Button variant="plain" onClick={() => } icon={<ScrollIcon/>}/>*/}
{/*</Tooltip>*/}
diff --git a/karavan-web/karavan-app/src/main/webui/src/project/pipeline/ProjectStatus.tsx b/karavan-web/karavan-app/src/main/webui/src/project/pipeline/ProjectStatus.tsx
index b59ac766..ae022589 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/pipeline/ProjectStatus.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/pipeline/ProjectStatus.tsx
@@ -127,7 +127,7 @@ export class ProjectStatus extends React.Component<Props, State> {
return (<Tooltip content="Start build pipeline" position={"left"}>
<Button isLoading={isBuilding ? true : undefined}
isDisabled={isBuilding || isRunning || isPushing}
- isSmall
+ size="sm"
variant="secondary"
className="project-button"
icon={!isBuilding ? <BuildIcon/> : <div></div>}
@@ -140,7 +140,7 @@ export class ProjectStatus extends React.Component<Props, State> {
rolloutButton = () => {
const isRolling = this.state.isRolling;
return (<Tooltip content="Rollout deployment" position={"left"}>
- <Button isLoading={isRolling ? true : undefined} isSmall variant="secondary"
+ <Button isLoading={isRolling ? true : undefined} size="sm" variant="secondary"
className="project-button"
icon={!isRolling ? <RolloutIcon/> : <div></div>}
onClick={e => this.rollout()}>
@@ -151,7 +151,7 @@ export class ProjectStatus extends React.Component<Props, State> {
deleteDeploymentButton = (env: string) => {
return (<Tooltip content="Delete deployment" position={"left"}>
- <Button isSmall variant="secondary"
+ <Button size="sm" variant="secondary"
className="project-button"
icon={<DeleteIcon/>}
onClick={e => this.setState({
@@ -283,9 +283,9 @@ export class ProjectStatus extends React.Component<Props, State> {
<FlexItem>
<Tooltip content={pipelineResult} position={"right"}>
<LabelGroup numLabels={2}>
- <Label icon={isRunning ? <Spinner isSVG diameter="16px" className="spinner"/> : icon} color={color}>
+ <Label icon={isRunning ? <Spinner diameter="16px" className="spinner"/> : icon} color={color}>
{pipeline
- ? <Button variant="link" onClick={e =>
+ ? <Button className='labeled-button' variant="link" onClick={e =>
useLogStore.setState({showLog: true, type: 'pipeline', podName: pipeline})
}>
{pipeline}
diff --git a/karavan-web/karavan-app/src/main/webui/src/project/trace/TraceTab.tsx b/karavan-web/karavan-app/src/main/webui/src/project/trace/TraceTab.tsx
index f10bf0ab..c62aa090 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/trace/TraceTab.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/trace/TraceTab.tsx
@@ -24,11 +24,20 @@ import {
Panel,
PanelHeader,
Text,
- Switch, TextContent, TextVariants, Title, PageSection,
+ Switch, TextContent, TextVariants, PageSection, EmptyStateHeader,
} from '@patternfly/react-core';
import '../../designer/karavan.css';
import {RunnerInfoTraceModal} from "./RunnerInfoTraceModal";
-import {TableComposable, Tbody, Td, Th, Thead, Tr} from "@patternfly/react-table";
+import {
+ Tbody,
+ Td,
+ Th,
+ Thead,
+ Tr
+} from '@patternfly/react-table';
+import {
+ Table
+} from '@patternfly/react-table/deprecated';
import SearchIcon from "@patternfly/react-icons/dist/esm/icons/search-icon";
import {KaravanApi} from "../../api/KaravanApi";
import {useProjectStore} from "../../api/ProjectStore";
@@ -101,13 +110,13 @@ export const TraceTab = () => {
<Switch aria-label="refresh"
id="refresh"
isChecked={refreshTrace}
- onChange={checked => setRefreshTrace(checked)}
+ onChange={(_, checked) => setRefreshTrace(checked)}
/>
</FlexItem>
</Flex>
</PanelHeader>
</Panel>
- <TableComposable aria-label="Files" variant={"compact"} className={"table"}>
+ <Table aria-label="Files" variant={"compact"} className={"table"}>
<Thead>
<Tr>
<Th key='uid' width={30}>Type</Th>
@@ -142,18 +151,15 @@ export const TraceTab = () => {
<Tr>
<Td colSpan={8}>
<Bullseye>
- <EmptyState variant={EmptyStateVariant.small}>
- <EmptyStateIcon icon={SearchIcon}/>
- <Title headingLevel="h2" size="lg">
- No results found
- </Title>
+ <EmptyState variant={EmptyStateVariant.sm}>
+ <EmptyStateHeader titleText="No results found" icon={<EmptyStateIcon icon={SearchIcon}/>} headingLevel="h2" />
</EmptyState>
</Bullseye>
</Td>
</Tr>
}
</Tbody>
- </TableComposable>
+ </Table>
</PageSection>
);
}
diff --git a/karavan-web/karavan-app/src/main/webui/src/projects/CreateProjectModal.tsx b/karavan-web/karavan-app/src/main/webui/src/projects/CreateProjectModal.tsx
index 7c1546ff..0d7c1be1 100644
--- a/karavan-web/karavan-app/src/main/webui/src/projects/CreateProjectModal.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/projects/CreateProjectModal.tsx
@@ -1,8 +1,8 @@
import React, {useState} from 'react';
import {
- Button, Form, FormGroup,
+ Button, Form, FormGroup, FormHelperText, HelperText, HelperTextItem,
Modal,
- ModalVariant, Radio, TextInput, ToggleGroup, ToggleGroupItem,
+ ModalVariant, TextInput, ToggleGroup, ToggleGroupItem,
} from '@patternfly/react-core';
import '../designer/karavan.css';
import {CamelUtil} from "karavan-core/lib/api/CamelUtil";
@@ -79,18 +79,23 @@ export const CreateProjectModal = () => {
<FormGroup label="Name" fieldId="name" isRequired>
<TextInput className="text-field" type="text" id="name" name="name"
value={name}
- onChange={e => setName(e)}/>
+ onChange={(_, e) => setName(e)}/>
</FormGroup>
<FormGroup label="Description" fieldId="description" isRequired>
<TextInput className="text-field" type="text" id="description" name="description"
value={description}
- onChange={e => setDescription(e)}/>
+ onChange={(_, e) => setDescription(e)}/>
</FormGroup>
- <FormGroup label="Project ID" fieldId="projectId" isRequired helperText="Unique project name">
+ <FormGroup label="Project ID" fieldId="projectId" isRequired>
<TextInput className="text-field" type="text" id="projectId" name="projectId"
value={projectId}
onFocus={e => setProjectId(projectId === '' ? CamelUi.nameFromTitle(name) : projectId)}
- onChange={e => setProjectId(CamelUi.nameFromTitle(e))}/>
+ onChange={(_, e) => setProjectId(CamelUi.nameFromTitle(e))}/>
+ <FormHelperText>
+ <HelperText>
+ <HelperTextItem>Unique project name</HelperTextItem>
+ </HelperText>
+ </FormHelperText>
</FormGroup>
<FormGroup label="Runtime" fieldId="runtime" isRequired>
<ToggleGroup>
@@ -100,7 +105,7 @@ export const CreateProjectModal = () => {
isSelected={r === runtime}
text={getTitle(r)}
icon={getIcon(r)}
- onChange={checked => {
+ onChange={(_, checked) => {
if (checked) setRuntime(r)
}}
/>
diff --git a/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx b/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx
index f507b858..2c345339 100644
--- a/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx
@@ -12,12 +12,21 @@ import {
EmptyState,
EmptyStateVariant,
EmptyStateIcon,
- Title, Spinner
+ Spinner, EmptyStateHeader
} from '@patternfly/react-core';
import '../designer/karavan.css';
import RefreshIcon from '@patternfly/react-icons/dist/esm/icons/sync-alt-icon';
import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon';
-import {TableComposable, Tbody, Td, Th, Thead, Tr} from "@patternfly/react-table";
+import {
+ Tbody,
+ Td,
+ Th,
+ Thead,
+ Tr
+} from '@patternfly/react-table';
+import {
+ Table
+} from '@patternfly/react-table/deprecated';
import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
import {ProjectsTableRow} from "./ProjectsTableRow";
import {DeleteProjectModal} from "./DeleteProjectModal";
@@ -67,7 +76,7 @@ export const ProjectsPage = () => {
<TextInput className="text-field" type="search" id="search" name="search"
autoComplete="off" placeholder="Search by name"
value={filter}
- onChange={e => setFilter(e)}/>
+ onChange={(_, e) => setFilter(e)}/>
</ToolbarItem>
<ToolbarItem>
<Button icon={<PlusIcon/>}
@@ -91,13 +100,10 @@ export const ProjectsPage = () => {
<Td colSpan={8}>
<Bullseye>
{loading &&
- <Spinner className="progress-stepper" isSVG diameter="80px" aria-label="Loading..."/>}
+ <Spinner className="progress-stepper" diameter="80px" aria-label="Loading..."/>}
{!loading &&
- <EmptyState variant={EmptyStateVariant.small}>
- <EmptyStateIcon icon={SearchIcon}/>
- <Title headingLevel="h2" size="lg">
- No results found
- </Title>
+ <EmptyState variant={EmptyStateVariant.sm}>
+ <EmptyStateHeader titleText="No results found" icon={<EmptyStateIcon icon={SearchIcon}/>} headingLevel="h2" />
</EmptyState>
}
</Bullseye>
@@ -111,7 +117,7 @@ export const ProjectsPage = () => {
.filter(p => p.type === ProjectType.normal)
.filter(p => p.name.toLowerCase().includes(filter) || p.description.toLowerCase().includes(filter));
return (
- <TableComposable aria-label="Projects" variant={"compact"}>
+ <Table aria-label="Projects" variant={"compact"}>
<Thead>
<Tr>
<Th key='type' >Runtime</Th>
@@ -131,7 +137,7 @@ export const ProjectsPage = () => {
))}
{projs.length === 0 && getEmptyState()}
</Tbody>
- </TableComposable>
+ </Table>
)
}
diff --git a/karavan-web/karavan-app/src/main/webui/src/services/CreateServiceModal.tsx b/karavan-web/karavan-app/src/main/webui/src/services/CreateServiceModal.tsx
index 8061396f..3dbef3bc 100644
--- a/karavan-web/karavan-app/src/main/webui/src/services/CreateServiceModal.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/services/CreateServiceModal.tsx
@@ -1,6 +1,6 @@
import React, {useState} from 'react';
import {
- Button, Form, FormGroup,
+ Button, Form, FormGroup, FormHelperText, HelperText, HelperTextItem,
Modal,
ModalVariant, Radio, TextInput,
} from '@patternfly/react-core';
@@ -66,24 +66,29 @@ export const CreateServiceModal = () => {
<FormGroup label="Name" fieldId="name" isRequired>
<TextInput className="text-field" type="text" id="name" name="name"
value={name}
- onChange={e => setName(e)}/>
+ onChange={(_, e) => setName(e)}/>
</FormGroup>
<FormGroup label="Description" fieldId="description" isRequired>
<TextInput className="text-field" type="text" id="description" name="description"
value={description}
- onChange={e => setDescription(e)}/>
+ onChange={(_, e) => setDescription(e)}/>
</FormGroup>
- <FormGroup label="Project ID" fieldId="projectId" isRequired helperText="Unique project name">
+ <FormGroup label="Project ID" fieldId="projectId" isRequired>
<TextInput className="text-field" type="text" id="projectId" name="projectId"
value={projectId}
onFocus={e => setProjectId(projectId === '' ? CamelUi.nameFromTitle(name) : projectId)}
- onChange={e => setProjectId(CamelUi.nameFromTitle(e))}/>
+ onChange={(_, e) => setProjectId(CamelUi.nameFromTitle(e))}/>
+ <FormHelperText>
+ <HelperText>
+ <HelperTextItem>Unique service name</HelperTextItem>
+ </HelperText>
+ </FormHelperText>
</FormGroup>
<FormGroup label="Runtime" fieldId="runtime" isRequired>
{runtimes?.map((r: string) => (
<Radio key={r} id={r} name={r} className="radio" aria-label="runtime"
isChecked={r === runtime}
- onChange={checked => {
+ onChange={(_, checked) => {
if (checked) setRuntime(r)
}}
body={
diff --git a/karavan-web/karavan-app/src/main/webui/src/services/ServicesPage.tsx b/karavan-web/karavan-app/src/main/webui/src/services/ServicesPage.tsx
index b7dd8fde..2b945bae 100644
--- a/karavan-web/karavan-app/src/main/webui/src/services/ServicesPage.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/services/ServicesPage.tsx
@@ -11,12 +11,20 @@ import {
EmptyState,
EmptyStateVariant,
EmptyStateIcon,
- Title, Spinner
+ Spinner, EmptyStateHeader
} from '@patternfly/react-core';
import '../designer/karavan.css';
import RefreshIcon from '@patternfly/react-icons/dist/esm/icons/sync-alt-icon';
import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon';
-import {TableComposable, Td, Th, Thead, Tr} from "@patternfly/react-table";
+import {
+ Td,
+ Th,
+ Thead,
+ Tr
+} from '@patternfly/react-table';
+import {
+ Table
+} from '@patternfly/react-table/deprecated';
import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
import {ServicesTableRow} from "./ServicesTableRow";
import {DeleteServiceModal} from "./DeleteServiceModal";
@@ -79,13 +87,10 @@ export const ServicesPage = () => {
<Td colSpan={8}>
<Bullseye>
{loading &&
- <Spinner className="progress-stepper" isSVG diameter="80px" aria-label="Loading..."/>}
+ <Spinner className="progress-stepper" diameter="80px" aria-label="Loading..."/>}
{!loading &&
- <EmptyState variant={EmptyStateVariant.small}>
- <EmptyStateIcon icon={SearchIcon}/>
- <Title headingLevel="h2" size="lg">
- No results found
- </Title>
+ <EmptyState variant={EmptyStateVariant.sm}>
+ <EmptyStateHeader titleText="No results found" icon={<EmptyStateIcon icon={SearchIcon}/>} headingLevel="h2" />
</EmptyState>
}
</Bullseye>
@@ -100,7 +105,7 @@ export const ServicesPage = () => {
function getServicesTable() {
return (
- <TableComposable aria-label="Services" variant={"compact"}>
+ <Table aria-label="Services" variant={"compact"}>
<Thead>
<Tr>
<Th />
@@ -116,7 +121,7 @@ export const ServicesPage = () => {
<ServicesTableRow key={service.container_name} index={index} service={service} container={getContainer(service.container_name)}/>
))}
{services?.services.length === 0 && getEmptyState()}
- </TableComposable>
+ </Table>
)
}
diff --git a/karavan-web/karavan-app/src/main/webui/src/services/ServicesTableRow.tsx b/karavan-web/karavan-app/src/main/webui/src/services/ServicesTableRow.tsx
index c5bc953a..e8c5fe6c 100644
--- a/karavan-web/karavan-app/src/main/webui/src/services/ServicesTableRow.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/services/ServicesTableRow.tsx
@@ -2,10 +2,10 @@ import React, {useState} from 'react';
import {
Button,
Tooltip,
- Flex, FlexItem, Label, ToolbarContent, Toolbar, ToolbarItem, Spinner, TooltipPosition
+ Flex, FlexItem, Label, Spinner, TooltipPosition
} from '@patternfly/react-core';
import '../designer/karavan.css';
-import {ActionsColumn, ExpandableRowContent, Tbody, Td, Tr} from "@patternfly/react-table";
+import {ExpandableRowContent, Tbody, Td, Tr} from "@patternfly/react-table";
import StopIcon from "@patternfly/react-icons/dist/js/icons/stop-icon";
import PlayIcon from "@patternfly/react-icons/dist/esm/icons/play-icon";
import {DevService} from "../api/ServiceModels";
@@ -101,7 +101,7 @@ export const ServicesTableRow = (props: Props) => {
<Td>
{container && <Label icon={icon} color={color}>
<Tooltip content={"Show log"} position={TooltipPosition.bottom}>
- <Button variant="link" isDisabled={!isRunning}
+ <Button className='labeled-button' variant="link" isDisabled={!isRunning}
onClick={e => {
useLogStore.setState({showLog: true, type: 'container', podName: container.containerName});
}}>
@@ -120,7 +120,7 @@ export const ServicesTableRow = (props: Props) => {
</Td>
<Td>
{!inTransit && container?.state && <Label color={color}>{container?.state}</Label>}
- {inTransit && <Spinner isSVG size="lg" aria-label="spinner"/>}
+ {inTransit && <Spinner size="lg" aria-label="spinner"/>}
</Td>
{getButtons()}
</Tr>