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/03/28 16:21:04 UTC

[camel-karavan] branch main updated: UI cleanup

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 b69d4fd0 UI cleanup
b69d4fd0 is described below

commit b69d4fd082465ac594d8a2a3f9ba3d0af1470cbc
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Tue Mar 28 12:20:55 2023 -0400

    UI cleanup
---
 karavan-app/src/main/webui/src/components/ComponentCard.tsx   | 2 +-
 karavan-app/src/main/webui/src/designer/karavan.css           | 2 ++
 karavan-app/src/main/webui/src/designer/route/DslSelector.tsx | 5 +----
 karavan-app/src/main/webui/src/kamelets/KameletsPage.tsx      | 2 +-
 karavan-designer/src/components/ComponentCard.tsx             | 2 +-
 karavan-designer/src/designer/karavan.css                     | 2 ++
 karavan-designer/src/designer/route/DslSelector.tsx           | 5 +----
 karavan-space/src/components/ComponentCard.tsx                | 2 +-
 karavan-space/src/designer/karavan.css                        | 2 ++
 karavan-space/src/designer/route/DslSelector.tsx              | 5 +----
 10 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/karavan-app/src/main/webui/src/components/ComponentCard.tsx b/karavan-app/src/main/webui/src/components/ComponentCard.tsx
index 83521a66..c2a07924 100644
--- a/karavan-app/src/main/webui/src/components/ComponentCard.tsx
+++ b/karavan-app/src/main/webui/src/components/ComponentCard.tsx
@@ -64,4 +64,4 @@ export class ComponentCard extends React.Component<Props, State> {
             </Card>
         );
     }
-};
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/karavan-app/src/main/webui/src/designer/karavan.css b/karavan-app/src/main/webui/src/designer/karavan.css
index 4e714245..f90cc42b 100644
--- a/karavan-app/src/main/webui/src/designer/karavan.css
+++ b/karavan-app/src/main/webui/src/designer/karavan.css
@@ -175,6 +175,7 @@
 
 .kamelets-page .kamelet-card .labels {
     opacity: 0.5;
+    font-weight: 200;
 }
 
 .kamelets-page .kamelet-card:hover .labels {
@@ -946,6 +947,7 @@
 
 .dsl-modal .labels {
     opacity: 0.5;
+    font-weight: 200;
 }
 
 .dsl-modal .dsl-card:hover .labels {
diff --git a/karavan-app/src/main/webui/src/designer/route/DslSelector.tsx b/karavan-app/src/main/webui/src/designer/route/DslSelector.tsx
index f394a92e..64dc73a7 100644
--- a/karavan-app/src/main/webui/src/designer/route/DslSelector.tsx
+++ b/karavan-app/src/main/webui/src/designer/route/DslSelector.tsx
@@ -106,10 +106,7 @@ export class DslSelector extends React.Component<Props, State> {
                         </CardFooter>}
                     {dsl.navigation.toLowerCase() === "component"
                         && <CardFooter className="footer-labels">
-                            <div>
-                                {dsl.labels.split(',').map((s: string,  i: number) => <Badge key={s + i} isRead
-                                                                                         className="labels">{s}</Badge>)}
-                            </div>
+                            <Badge isRead className="labels">{dsl.labels}</Badge>
                             <Badge isRead className="version labels">{dsl.version}</Badge>
                         </CardFooter>
                     }
diff --git a/karavan-app/src/main/webui/src/kamelets/KameletsPage.tsx b/karavan-app/src/main/webui/src/kamelets/KameletsPage.tsx
index 1c500e49..f93717c2 100644
--- a/karavan-app/src/main/webui/src/kamelets/KameletsPage.tsx
+++ b/karavan-app/src/main/webui/src/kamelets/KameletsPage.tsx
@@ -102,7 +102,7 @@ export class KameletsPage extends React.Component<Props, State> {
                                         <Switch
                                             label="Custom only"
                                             isChecked={customOnly}
-                                            onChange={checked => this.setState({customOnly: checked})}
+                                            onChange={checked => this.setState({customOnly: checked, isModalOpen: false})}
                                         />
                                     </ToolbarItem>
                                     <ToolbarItem>
diff --git a/karavan-designer/src/components/ComponentCard.tsx b/karavan-designer/src/components/ComponentCard.tsx
index 83521a66..c2a07924 100644
--- a/karavan-designer/src/components/ComponentCard.tsx
+++ b/karavan-designer/src/components/ComponentCard.tsx
@@ -64,4 +64,4 @@ export class ComponentCard extends React.Component<Props, State> {
             </Card>
         );
     }
-};
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/karavan-designer/src/designer/karavan.css b/karavan-designer/src/designer/karavan.css
index 4e714245..f90cc42b 100644
--- a/karavan-designer/src/designer/karavan.css
+++ b/karavan-designer/src/designer/karavan.css
@@ -175,6 +175,7 @@
 
 .kamelets-page .kamelet-card .labels {
     opacity: 0.5;
+    font-weight: 200;
 }
 
 .kamelets-page .kamelet-card:hover .labels {
@@ -946,6 +947,7 @@
 
 .dsl-modal .labels {
     opacity: 0.5;
+    font-weight: 200;
 }
 
 .dsl-modal .dsl-card:hover .labels {
diff --git a/karavan-designer/src/designer/route/DslSelector.tsx b/karavan-designer/src/designer/route/DslSelector.tsx
index f394a92e..64dc73a7 100644
--- a/karavan-designer/src/designer/route/DslSelector.tsx
+++ b/karavan-designer/src/designer/route/DslSelector.tsx
@@ -106,10 +106,7 @@ export class DslSelector extends React.Component<Props, State> {
                         </CardFooter>}
                     {dsl.navigation.toLowerCase() === "component"
                         && <CardFooter className="footer-labels">
-                            <div>
-                                {dsl.labels.split(',').map((s: string,  i: number) => <Badge key={s + i} isRead
-                                                                                         className="labels">{s}</Badge>)}
-                            </div>
+                            <Badge isRead className="labels">{dsl.labels}</Badge>
                             <Badge isRead className="version labels">{dsl.version}</Badge>
                         </CardFooter>
                     }
diff --git a/karavan-space/src/components/ComponentCard.tsx b/karavan-space/src/components/ComponentCard.tsx
index 83521a66..c2a07924 100644
--- a/karavan-space/src/components/ComponentCard.tsx
+++ b/karavan-space/src/components/ComponentCard.tsx
@@ -64,4 +64,4 @@ export class ComponentCard extends React.Component<Props, State> {
             </Card>
         );
     }
-};
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/karavan-space/src/designer/karavan.css b/karavan-space/src/designer/karavan.css
index 4e714245..f90cc42b 100644
--- a/karavan-space/src/designer/karavan.css
+++ b/karavan-space/src/designer/karavan.css
@@ -175,6 +175,7 @@
 
 .kamelets-page .kamelet-card .labels {
     opacity: 0.5;
+    font-weight: 200;
 }
 
 .kamelets-page .kamelet-card:hover .labels {
@@ -946,6 +947,7 @@
 
 .dsl-modal .labels {
     opacity: 0.5;
+    font-weight: 200;
 }
 
 .dsl-modal .dsl-card:hover .labels {
diff --git a/karavan-space/src/designer/route/DslSelector.tsx b/karavan-space/src/designer/route/DslSelector.tsx
index f394a92e..64dc73a7 100644
--- a/karavan-space/src/designer/route/DslSelector.tsx
+++ b/karavan-space/src/designer/route/DslSelector.tsx
@@ -106,10 +106,7 @@ export class DslSelector extends React.Component<Props, State> {
                         </CardFooter>}
                     {dsl.navigation.toLowerCase() === "component"
                         && <CardFooter className="footer-labels">
-                            <div>
-                                {dsl.labels.split(',').map((s: string,  i: number) => <Badge key={s + i} isRead
-                                                                                         className="labels">{s}</Badge>)}
-                            </div>
+                            <Badge isRead className="labels">{dsl.labels}</Badge>
                             <Badge isRead className="version labels">{dsl.version}</Badge>
                         </CardFooter>
                     }