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 19f41856ad106fe861278b94eefdd75fc0051a96 Author: Marat Gubaidullin <[email protected]> AuthorDate: Fri Nov 18 16:27:18 2022 -0500 Cleanup designer --- karavan-designer/src/App.tsx | 2 +- karavan-designer/src/components/ComponentCard.tsx | 2 +- karavan-designer/src/designer/utils/CamelUi.tsx | 13 ------------- karavan-designer/src/eip/EipCard.tsx | 2 +- karavan-designer/src/kamelets/KameletCard.tsx | 2 +- karavan-space/src/space/SpacePage.tsx | 3 +-- 6 files changed, 5 insertions(+), 19 deletions(-) diff --git a/karavan-designer/src/App.tsx b/karavan-designer/src/App.tsx index 9af8955..10f2615 100644 --- a/karavan-designer/src/App.tsx +++ b/karavan-designer/src/App.tsx @@ -118,7 +118,7 @@ class App extends React.Component<Props, State> { save(filename: string, yaml: string, propertyOnly: boolean) { this.setState({name: filename, yaml: yaml}); - // console.log(yaml); + console.log(yaml); } getSpinner() { diff --git a/karavan-designer/src/components/ComponentCard.tsx b/karavan-designer/src/components/ComponentCard.tsx index 1fe5269..ba18bd4 100644 --- a/karavan-designer/src/components/ComponentCard.tsx +++ b/karavan-designer/src/components/ComponentCard.tsx @@ -51,7 +51,7 @@ export class ComponentCard extends React.Component<Props, State> { <CardHeader> {CamelUi.getIconFromSource(camelIcon)} </CardHeader> - <CardTitle>{CamelUi.titleFromName(component.component.name)}</CardTitle> + <CardTitle>{component.component.title}</CardTitle> <CardBody>{component.component.description}</CardBody> <CardFooter> <Badge isRead className="labels">{component.component.label}</Badge> diff --git a/karavan-designer/src/designer/utils/CamelUi.tsx b/karavan-designer/src/designer/utils/CamelUi.tsx index 3083c36..5c98f13 100644 --- a/karavan-designer/src/designer/utils/CamelUi.tsx +++ b/karavan-designer/src/designer/utils/CamelUi.tsx @@ -196,19 +196,6 @@ export class CamelUi { return name.split("-").map(v => CamelUtil.capitalizeName(v)).join(''); } - static titleFromName = (name?: string) => { - name = name ? (name.substring(0, name.lastIndexOf('.')) || name) : undefined; - return name - ? name - .replace(".yaml", "") - .split("-") - .map((value) => CamelUtil.capitalizeName(value)) - .reduce( - (previousValue, currentValue) => previousValue + " " + currentValue - ) - : name; - } - static isActionKamelet = (element: CamelElement): boolean => { const kamelet = CamelUtil.getKamelet(element); if (kamelet) return kamelet.type() === 'action' diff --git a/karavan-designer/src/eip/EipCard.tsx b/karavan-designer/src/eip/EipCard.tsx index 0fab47e..bfb2f8d 100644 --- a/karavan-designer/src/eip/EipCard.tsx +++ b/karavan-designer/src/eip/EipCard.tsx @@ -51,7 +51,7 @@ export class EipCard extends React.Component<Props, State> { <CardHeader> {CamelUi.getIconForDslName(component.className)} </CardHeader> - <CardTitle>{CamelUi.titleFromName(component.title)}</CardTitle> + <CardTitle>{component.title}</CardTitle> <CardBody>{component.description}</CardBody> <CardFooter> <Badge isRead className="labels">{component.labels}</Badge> diff --git a/karavan-designer/src/kamelets/KameletCard.tsx b/karavan-designer/src/kamelets/KameletCard.tsx index 2bae9fc..20d4388 100644 --- a/karavan-designer/src/kamelets/KameletCard.tsx +++ b/karavan-designer/src/kamelets/KameletCard.tsx @@ -51,7 +51,7 @@ export class KameletCard extends React.Component<Props, State> { <CardHeader> {CamelUi.getIconFromSource(kamelet.icon())} </CardHeader> - <CardTitle>{CamelUi.titleFromName(kamelet.metadata.name)}</CardTitle> + <CardTitle>{kamelet.spec.definition.title}</CardTitle> <CardBody>{kamelet.spec.definition.description}</CardBody> <CardFooter> {/*<div style={{justifyContent: "space-between"}}>*/} diff --git a/karavan-space/src/space/SpacePage.tsx b/karavan-space/src/space/SpacePage.tsx index 1cb9d7a..9365489 100644 --- a/karavan-space/src/space/SpacePage.tsx +++ b/karavan-space/src/space/SpacePage.tsx @@ -56,7 +56,6 @@ export class SpacePage extends React.Component<Props, State> { save(filename: string, yaml: string, propertyOnly: boolean) { this.props.onSave?.call(this, filename, yaml, propertyOnly); - this.setState({key: Math.random().toString()}) } download = () => { @@ -84,8 +83,8 @@ export class SpacePage extends React.Component<Props, State> { } addYaml = (yaml: string | undefined) => { - this.setState({showUploadModal: false }); this.save(this.props.name, this.props.yaml + "\n" + yaml, false); + this.setState({showUploadModal: false, key: Math.random().toString()}) } getDesigner = () => {
