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/05/03 03:39:15 UTC
[camel-karavan] branch main updated (67749ab9 -> 77c0981c)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
from 67749ab9 Update app.yml
new abfd1a06 Fix #563
new 77c0981c Fix Quinoa build
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
karavan-app/src/main/webui/package.json | 20 ++++++++++----------
.../src/main/webui/src/projects/ProjectLog.tsx | 17 ++++++++---------
2 files changed, 18 insertions(+), 19 deletions(-)
[camel-karavan] 01/02: Fix #563
Posted by ma...@apache.org.
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
commit abfd1a0623420fec6e28aad41ee9b85d60ff3c06
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Tue May 2 22:48:17 2023 -0400
Fix #563
---
karavan-app/src/main/webui/src/projects/ProjectLog.tsx | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/karavan-app/src/main/webui/src/projects/ProjectLog.tsx b/karavan-app/src/main/webui/src/projects/ProjectLog.tsx
index f9c3e64c..3f314b9b 100644
--- a/karavan-app/src/main/webui/src/projects/ProjectLog.tsx
+++ b/karavan-app/src/main/webui/src/projects/ProjectLog.tsx
@@ -8,9 +8,8 @@ import CollapseIcon from '@patternfly/react-icons/dist/esm/icons/compress-icon';
import {LogViewer} from '@patternfly/react-log-viewer';
import {Subscription} from "rxjs";
import {ProjectEventBus, ShowLogCommand} from "./ProjectEventBus";
-import {findDOMNode} from "react-dom";
-import {ProjectFile} from "./ProjectModels";
-import {KaravanApi} from "../api/KaravanApi";
+
+const INITIAL_LOG_HEIGHT = "50%";
interface Props {
@@ -30,7 +29,7 @@ export class ProjectLog extends React.Component<Props, State> {
public state: State = {
showLog: false,
- height: "30%",
+ height: INITIAL_LOG_HEIGHT,
logViewerRef: React.createRef(),
isTextWrapped: true,
data: '',
@@ -42,7 +41,7 @@ export class ProjectLog extends React.Component<Props, State> {
componentDidMount() {
this.eventSource?.close();
this.sub = ProjectEventBus.onShowLog()?.subscribe((log: ShowLogCommand) => {
- this.setState({showLog: true, log: log});
+ this.setState({showLog: true, log: log, data: ''});
this.showLogs(log.type, log.name, log.environment);
});
}
@@ -65,7 +64,7 @@ export class ProjectLog extends React.Component<Props, State> {
}
getButtons() {
- const {height, isTextWrapped, logViewerRef, log} = this.state;
+ const {height, isTextWrapped, logViewerRef, log, data} = this.state;
return (<div className="buttons">
<Label className="log-name">{log?.type + ": " + log?.name}</Label>
<Checkbox label="Wrap text" aria-label="wrap text checkbox" isChecked={isTextWrapped} id="wrap-text-checkbox"
@@ -75,13 +74,13 @@ export class ProjectLog extends React.Component<Props, State> {
</Tooltip>
<Tooltip content={height === "100%" ? "Collapse": "Expand"} position={TooltipPosition.bottom}>
<Button variant="plain" onClick={() => {
- const h = height === "100%" ? "30%" : "100%";
- this.setState({height: h, showLog: true});
+ const h = height === "100%" ? INITIAL_LOG_HEIGHT : "100%";
+ this.setState({height: h, showLog: true, data: data.concat(' ')});
}} icon={height === "100%" ? <CollapseIcon/> : <ExpandIcon/>}/>
</Tooltip>
<Button variant="plain" onClick={() => {
this.eventSource?.close();
- this.setState({height: "30%", showLog: false, data: '', currentLine: 0});
+ this.setState({height: INITIAL_LOG_HEIGHT, showLog: false, data: '', currentLine: 0});
}} icon={<CloseIcon/>}/>
</div>);
}
[camel-karavan] 02/02: Fix Quinoa build
Posted by ma...@apache.org.
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
commit 77c0981ce7c3d740aee675177ef940c6571ba05c
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Tue May 2 23:38:39 2023 -0400
Fix Quinoa build
---
karavan-app/src/main/webui/package.json | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/karavan-app/src/main/webui/package.json b/karavan-app/src/main/webui/package.json
index 638c27ba..5e9c238c 100644
--- a/karavan-app/src/main/webui/package.json
+++ b/karavan-app/src/main/webui/package.json
@@ -26,16 +26,16 @@
]
},
"dependencies": {
- "@monaco-editor/react": "4.5.0",
+ "@monaco-editor/react": "4.4.6",
"@patternfly/patternfly": "4.224.2",
- "@patternfly/react-charts": "6.94.19",
- "@patternfly/react-core": "4.276.8",
- "@patternfly/react-log-viewer": "5.0.0-alpha.1",
- "@patternfly/react-table": "4.113.0",
+ "@patternfly/react-charts": "6.94.18",
+ "@patternfly/react-core": "4.276.6",
+ "@patternfly/react-log-viewer": "^4.87.100",
+ "@patternfly/react-table": "4.112.39",
"@types/js-yaml": "4.0.5",
- "@types/node": "18.16.3",
+ "@types/node": "18.11.18",
"@types/uuid": "9.0.1",
- "axios": "1.4.0",
+ "axios": "1.3.4",
"buffer": "^6.0.3",
"dagre": "0.8.5",
"file-saver": "^2.0.5",
@@ -44,8 +44,8 @@
"keycloak-js": "^19.0.1",
"react": "17.0.2",
"react-dom": "17.0.2",
- "react-scripts": "5.0.1",
- "rxjs": "7.8.1",
+ "react-scripts": "5.0.0",
+ "rxjs": "7.8.0",
"uuid": "9.0.0"
},
"devDependencies": {
@@ -57,7 +57,7 @@
"@typescript-eslint/eslint-plugin": "^5.51.0",
"@typescript-eslint/parser": "^5.51.0",
"eslint": "^8.33.0",
- "monaco-editor": "0.38.0",
+ "monaco-editor": "0.36.1",
"typescript": "^4.9.5"
}
}