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 06fe9ed Saas feature40 (#438)
06fe9ed is described below
commit 06fe9ed0ff3835c647e20f38df507c45ec069e85
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Fri Jul 29 18:16:05 2022 -0400
Saas feature40 (#438)
* Camel 3.18.1-SNAPSHOT
* Use camel 3.19.0-SNAPSHOT
* Fix ipaas isuues
---
karavan-app/src/main/webapp/src/Main.tsx | 7 +++----
karavan-app/src/main/webapp/src/avatarImg.svg | 18 ------------------
karavan-app/src/main/webapp/src/index.css | 10 +++++++++-
.../src/main/webapp/src/projects/ProjectPage.tsx | 8 ++++----
karavan-builder/openshift/karavan-quarkus-task.yaml | 6 +++---
5 files changed, 19 insertions(+), 30 deletions(-)
diff --git a/karavan-app/src/main/webapp/src/Main.tsx
b/karavan-app/src/main/webapp/src/Main.tsx
index 7d2fad7..89c0ec8 100644
--- a/karavan-app/src/main/webapp/src/Main.tsx
+++ b/karavan-app/src/main/webapp/src/Main.tsx
@@ -18,7 +18,6 @@ import './designer/karavan.css';
import {ConfigurationPage} from "./config/ConfigurationPage";
import {KameletsPage} from "./kamelets/KameletsPage";
import {v4 as uuidv4} from "uuid";
-import avatarImg from './avatarImg.svg';
import {ComponentApi} from "karavan-core/lib/api/ComponentApi";
import Icon from "./Logo";
import {ComponentsPage} from "./components/ComponentsPage";
@@ -26,8 +25,8 @@ import {EipPage} from "./eip/EipPage";
import {ProjectsPage} from "./projects/ProjectsPage";
import {Project} from "./models/ProjectModels";
import {ProjectPage} from "./projects/ProjectPage";
-import TachometerAltIcon from
"@patternfly/react-icons/dist/js/icons/tachometer-alt-icon";
import UsersIcon from "@patternfly/react-icons/dist/js/icons/users-icon";
+import UserIcon from "@patternfly/react-icons/dist/js/icons/user-icon";
import ProjectsIcon from
"@patternfly/react-icons/dist/js/icons/repository-icon";
import KameletsIcon from "@patternfly/react-icons/dist/js/icons/registry-icon";
import EipIcon from "@patternfly/react-icons/dist/js/icons/topology-icon";
@@ -153,7 +152,7 @@ export class Main extends React.Component<Props, State> {
<Divider/>
</FlexItem>
<FlexItem alignSelf={{default:"alignSelfCenter"}}>
- <Avatar src={avatarImg} alt="avatar" border="dark"/>
+ <UserIcon className="avatar"/>
</FlexItem>
</Flex>)
}
@@ -211,7 +210,7 @@ export class Main extends React.Component<Props, State> {
render() {
return (
<Page className="karavan">
- <Flex style={{width: "100%", height:"100%"}}
alignItems={{default:"alignItemsStretch"}} spaceItems={{ default:
'spaceItemsNone' }}>
+ <Flex direction={{default:"row"}} style={{width: "100%",
height:"100%"}} alignItems={{default:"alignItemsStretch"}} spaceItems={{
default: 'spaceItemsNone' }}>
<FlexItem>
{this.pageNav()}
</FlexItem>
diff --git a/karavan-app/src/main/webapp/src/avatarImg.svg
b/karavan-app/src/main/webapp/src/avatarImg.svg
deleted file mode 100644
index 73726f9..0000000
--- a/karavan-app/src/main/webapp/src/avatarImg.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
- viewBox="0 0 36 36" style="enable-background:new 0 0 36 36;"
xml:space="preserve">
-<style type="text/css">
- .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#F0F0F0;}
- .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#D2D2D2;}
- .st2{fill:#B8BBBE;}
- .st3{fill:#D2D2D2;}
-</style>
-<rect class="st0" width="36" height="36"/>
-<path class="st1"
d="M17.7,20.1c-3.5,0-6.4-2.9-6.4-6.4s2.9-6.4,6.4-6.4s6.4,2.9,6.4,6.4S21.3,20.1,17.7,20.1z"/>
-<path class="st2" d="M13.3,36l0-6.7c-2,0.4-2.9,1.4-3.1,3.5L10.1,36H13.3z"/>
-<path class="st3"
d="M10.1,36l0.1-3.2c0.2-2.1,1.1-3.1,3.1-3.5l0,6.7h9.4l0-6.7c2,0.4,2.9,1.4,3.1,3.5l0.1,3.2h4.7
-
c-0.4-3.9-1.3-9-2.9-11c-1.1-1.4-2.3-2.2-3.5-2.6s-1.8-0.6-6.3-0.6s-6.1,0.7-6.1,0.7c-1.2,0.4-2.4,1.2-3.4,2.6
- C6.7,27,5.8,32.2,5.4,36H10.1z"/>
-<path class="st2" d="M25.9,36l-0.1-3.2c-0.2-2.1-1.1-3.1-3.1-3.5l0,6.7H25.9z"/>
-</svg>
diff --git a/karavan-app/src/main/webapp/src/index.css
b/karavan-app/src/main/webapp/src/index.css
index e01f438..12b14e9 100644
--- a/karavan-app/src/main/webapp/src/index.css
+++ b/karavan-app/src/main/webapp/src/index.css
@@ -42,10 +42,14 @@
width: 24px;
}
-.karavan .nav-buttons .pf-c-avatar {
+.karavan .nav-buttons .avatar {
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-radius: 32px;
+ padding: 6px;
}
.karavan .nav-buttons .pf-c-button.pf-m-plain {
@@ -208,4 +212,8 @@
.logo-tooltip {
margin-left: 16px;
+}
+
+.karavan .pf-c-code-block__code {
+ overflow-wrap: anywhere;
}
\ No newline at end of file
diff --git a/karavan-app/src/main/webapp/src/projects/ProjectPage.tsx
b/karavan-app/src/main/webapp/src/projects/ProjectPage.tsx
index 2af988a..107470c 100644
--- a/karavan-app/src/main/webapp/src/projects/ProjectPage.tsx
+++ b/karavan-app/src/main/webapp/src/projects/ProjectPage.tsx
@@ -353,7 +353,7 @@ export class ProjectPage extends React.Component<Props,
State> {
)
}
- showPipelineLog = (type: 'container' | 'pipeline', name: string,
environment: string) => {
+ showLogs = (type: 'container' | 'pipeline', name: string, environment:
string) => {
const filename = name + ".log";
const code = '';
this.setState({file: new ProjectFile(filename,
this.props.project.projectId, code)});
@@ -388,9 +388,9 @@ export class ProjectPage extends React.Component<Props,
State> {
getLogView = () => {
const file = this.state.file;
return (
- <div style={{overflowX: "auto"}}>
+ <div style={{overflow: "auto"}}>
{file !== undefined && file.code.length !== 0 &&
- <CodeBlock>
+ <CodeBlock style={{width:"90%"}}>
<CodeBlockCode
id="code-content">{file.code}</CodeBlockCode>
</CodeBlock>}
{file === undefined || file.code.length === 0 &&
@@ -448,7 +448,7 @@ export class ProjectPage extends React.Component<Props,
State> {
</FlexItem>
<FlexItem>
<PageSection padding={{default: "padding"}}>
- {tab === 'details' && <ProjectInfo
project={this.props.project} config={this.props.config}
deleteEntity={this.deleteEntity} showLog={this.showPipelineLog}/>}
+ {tab === 'details' && <ProjectInfo
project={this.props.project} config={this.props.config}
deleteEntity={this.deleteEntity} showLog={this.showLogs}/>}
{tab === 'dashboard' && <ProjectDashboard
environments={this.state.environments} project={this.props.project}
config={this.props.config}/>}
</PageSection>
</FlexItem>
diff --git a/karavan-builder/openshift/karavan-quarkus-task.yaml
b/karavan-builder/openshift/karavan-quarkus-task.yaml
index d2e1bc8..51985e6 100644
--- a/karavan-builder/openshift/karavan-quarkus-task.yaml
+++ b/karavan-builder/openshift/karavan-quarkus-task.yaml
@@ -24,8 +24,8 @@ spec:
cd ${CHECKOUT_DIR}/$(inputs.params.project)
- entrypoint -Dcamel.jbang.version=3.18.1-SNAPSHOT camel@apache/camel
export
-
+ entrypoint -Dcamel.jbang.version=3.19.0-SNAPSHOT camel@apache/camel
export
+
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
export TOKEN=$(cat
/var/run/secrets/kubernetes.io/serviceaccount/token)
@@ -66,8 +66,8 @@ spec:
image-registry.openshift-image-registry.svc:5000/openshift/cli:latest
script: |
#!/usr/bin/env bash
- oc label dc/$(inputs.params.project) app.openshift.io/runtime=camel
--overwrite=true
oc rollout latest dc/$(inputs.params.project)
+ oc label dc/$(inputs.params.project) app.openshift.io/runtime=camel
--overwrite=true
workspaces:
- mountPath: /root/.m2
name: m2-cache
