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 2022/09/22 17:00:42 UTC
[camel-karavan] branch main updated (e8b1ef0 -> 2f4dfb4)
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 e8b1ef0 Expression editor in VSCode
new 868b6c5 Expression description in Editor Modal
new 2f4dfb4 Project info deployment status
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/webapp/src/projects/ProjectInfo.tsx | 3 +--
.../src/designer/route/property/DslPropertyField.tsx | 13 +++++++++----
.../src/designer/route/property/ExpressionField.tsx | 2 +-
3 files changed, 11 insertions(+), 7 deletions(-)
[camel-karavan] 02/02: Project info deployment status
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 2f4dfb4baa458b1ea799b893d69cd805d1653fbe
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Thu Sep 22 13:00:23 2022 -0400
Project info deployment status
---
karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx b/karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx
index 2e6dffe..74427e4 100644
--- a/karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx
+++ b/karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx
@@ -235,9 +235,8 @@ export class ProjectInfo extends React.Component<Props, State> {
}
getReplicasPanel(deploymentStatus: DeploymentStatus, env: string) {
- console.log(deploymentStatus);
const ok = (deploymentStatus && deploymentStatus?.readyReplicas > 0
- && (deploymentStatus.unavailableReplicas === 0 || deploymentStatus.unavailableReplicas === undefined)
+ && (deploymentStatus.unavailableReplicas === 0 || deploymentStatus.unavailableReplicas === undefined || deploymentStatus.unavailableReplicas === null)
&& deploymentStatus?.replicas === deploymentStatus?.readyReplicas)
return (
<Flex justifyContent={{default: "justifyContentSpaceBetween"}} alignItems={{default: "alignItemsCenter"}}>
[camel-karavan] 01/02: Expression description in Editor Modal
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 868b6c5caa6b7334631b96125fa9762d1a921017
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Thu Sep 22 12:49:33 2022 -0400
Expression description in Editor Modal
---
.../src/designer/route/property/DslPropertyField.tsx | 13 +++++++++----
.../src/designer/route/property/ExpressionField.tsx | 2 +-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/karavan-designer/src/designer/route/property/DslPropertyField.tsx b/karavan-designer/src/designer/route/property/DslPropertyField.tsx
index 37cadab..11b83a3 100644
--- a/karavan-designer/src/designer/route/property/DslPropertyField.tsx
+++ b/karavan-designer/src/designer/route/property/DslPropertyField.tsx
@@ -37,14 +37,14 @@ import {
Card,
InputGroup,
Modal,
- ModalVariant
+ ModalVariant, Title, TitleSizes
} from '@patternfly/react-core';
import '../../karavan.css';
import "@patternfly/patternfly/patternfly.css";
import HelpIcon from "@patternfly/react-icons/dist/js/icons/help-icon";
import DeleteIcon from "@patternfly/react-icons/dist/js/icons/times-circle-icon";
import {CamelUtil} from "karavan-core/lib/api/CamelUtil";
-import {PropertyMeta} from "karavan-core/lib/model/CamelMetadata";
+import {CamelMetadataApi, PropertyMeta} from "karavan-core/lib/model/CamelMetadata";
import {CamelDefinitionApiExt} from "karavan-core/lib/api/CamelDefinitionApiExt";
import {ExpressionField} from "./ExpressionField";
import {CamelUi, RouteToCreate} from "../../utils/CamelUi";
@@ -77,7 +77,7 @@ interface Props {
element?: CamelElement
integration: Integration,
hideLabel?: boolean,
- dslLanguage?: string,
+ dslLanguage?: [string, string, string],
dark: boolean
}
@@ -263,7 +263,12 @@ export class DslPropertyField extends React.Component<Props, State> {
</Tooltip>
<Modal
variant={ModalVariant.large}
- title="Expression"
+ header={<React.Fragment>
+ <Title id="modal-custom-header-label" headingLevel="h1" size={TitleSizes['2xl']}>
+ {`Expression (${dslLanguage?.[0]})`}
+ </Title>
+ <p className="pf-u-pt-sm">{dslLanguage?.[2]}</p>
+ </React.Fragment>}
isOpen={this.state.showEditor}
onClose={() => this.setState({showEditor: false})}
actions={[
diff --git a/karavan-designer/src/designer/route/property/ExpressionField.tsx b/karavan-designer/src/designer/route/property/ExpressionField.tsx
index 79e0177..7c756a9 100644
--- a/karavan-designer/src/designer/route/property/ExpressionField.tsx
+++ b/karavan-designer/src/designer/route/property/ExpressionField.tsx
@@ -156,7 +156,7 @@ export class ExpressionField extends React.Component<Props, State> {
onDataFormatChange={dataFormat => {console.log(dataFormat)}}
onChange={this.propertyChanged}
dark={this.props.dark}
- dslLanguage={dslLanguage?.[0]}/>
+ dslLanguage={dslLanguage}/>
)}
</FormGroup>
</div>