First try #1412

apache · Sep 16, 2024 · f673c38 · f673c38
1 parent 8c6b058
commit f673c38
Show file tree

Hide file tree

Showing 12 changed files with 5,117 additions and 1,339 deletions.
diff --git a/karavan-app/src/main/resources/metadata/kamelets.yaml b/karavan-app/src/main/resources/metadata/kamelets.yaml
diff --git a/karavan-app/src/main/webui/src/designer/selector/DslCard.tsx b/karavan-app/src/main/webui/src/designer/selector/DslCard.tsx
@@ -16,7 +16,7 @@
  */
 import React from 'react';
 import {
-    Badge,
+    Badge, capitalize,
     Card, CardBody, CardFooter,
     CardHeader,
     Text,
@@ -41,16 +41,17 @@ export function DslCard (props: Props) {
     }
 
     const {dsl, index} = props;
+    const navigation = dsl.navigation === 'eip' ? 'EIP' : capitalize(dsl.navigation);
     const labels = dsl.labels !== undefined ? dsl.labels.split(",").filter(label => label !== 'eip') : [];
     const isCustom = KameletApi.getCustomKameletNames().includes(dsl.name);
     const isRemote =  dsl.remote;
     return (
         <Card key={dsl.dsl + index} isCompact isPlain isFlat isRounded className="dsl-card"
               onClick={event => selectDsl(event, dsl)}>
             <CardHeader className="header-labels">
-                <Badge isRead className="support-level labels">{dsl.supportLevel}</Badge>
+                <Badge className="navigation-label">{navigation}</Badge>
                 {['kamelet', 'component'].includes(dsl.navigation.toLowerCase()) &&
-                    <Badge isRead className="version labels">{dsl.version}</Badge>
+                    <Badge isRead className="support-level labels">{dsl.supportLevel}</Badge>
                 }
             </CardHeader>
             <CardHeader>

diff --git a/karavan-app/src/main/webui/src/designer/selector/DslSelector.css b/karavan-app/src/main/webui/src/designer/selector/DslSelector.css
@@ -129,6 +129,11 @@
     white-space: nowrap;
 }
 
+.dsl-modal .pf-m-unread {
+    --pf-v5-c-badge--BackgroundColor: var(--pf-v5-global--info-color--100);
+    font-weight: 200;
+}
+
 .dsl-modal .labels {
     opacity: 0.5;
     font-weight: 200;

diff --git a/karavan-designer/public/metadata/kamelets.yaml b/karavan-designer/public/metadata/kamelets.yaml
diff --git a/karavan-designer/src/designer/selector/DslCard.tsx b/karavan-designer/src/designer/selector/DslCard.tsx
@@ -16,7 +16,7 @@
  */
 import React from 'react';
 import {
-    Badge,
+    Badge, capitalize,
     Card, CardBody, CardFooter,
     CardHeader,
     Text,
@@ -41,16 +41,17 @@ export function DslCard (props: Props) {
     }
 
     const {dsl, index} = props;
+    const navigation = dsl.navigation === 'eip' ? 'EIP' : capitalize(dsl.navigation);
     const labels = dsl.labels !== undefined ? dsl.labels.split(",").filter(label => label !== 'eip') : [];
     const isCustom = KameletApi.getCustomKameletNames().includes(dsl.name);
     const isRemote =  dsl.remote;
     return (
         <Card key={dsl.dsl + index} isCompact isPlain isFlat isRounded className="dsl-card"
               onClick={event => selectDsl(event, dsl)}>
             <CardHeader className="header-labels">
-                <Badge isRead className="support-level labels">{dsl.supportLevel}</Badge>
+                <Badge className="navigation-label">{navigation}</Badge>
                 {['kamelet', 'component'].includes(dsl.navigation.toLowerCase()) &&
-                    <Badge isRead className="version labels">{dsl.version}</Badge>
+                    <Badge isRead className="support-level labels">{dsl.supportLevel}</Badge>
                 }
             </CardHeader>
             <CardHeader>

diff --git a/karavan-designer/src/designer/selector/DslSelector.css b/karavan-designer/src/designer/selector/DslSelector.css
@@ -129,6 +129,11 @@
     white-space: nowrap;
 }
 
+.dsl-modal .pf-m-unread {
+    --pf-v5-c-badge--BackgroundColor: var(--pf-v5-global--info-color--100);
+    font-weight: 200;
+}
+
 .dsl-modal .labels {
     opacity: 0.5;
     font-weight: 200;

diff --git a/karavan-generator/dependency-reduced-pom.xml b/karavan-generator/dependency-reduced-pom.xml
@@ -69,7 +69,7 @@
   </repositories>
   <properties>
     <maven.compiler.source>17</maven.compiler.source>
-    <version.camel-kamelet>4.7.0</version.camel-kamelet>
+    <version.camel-kamelet>4.8.0-SNAPSHOT</version.camel-kamelet>
     <compiler-plugin.version>3.8.1</compiler-plugin.version>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <version.vertx>4.5.9</version.vertx>

diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml
@@ -29,7 +29,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
         <version.camel-core>4.8.0</version.camel-core>
-        <version.camel-kamelet>4.7.0</version.camel-kamelet>
+        <version.camel-kamelet>4.8.0-SNAPSHOT</version.camel-kamelet>
         <version.vertx>4.5.9</version.vertx>
     </properties>
     <dependencies>

diff --git a/karavan-space/public/metadata/kamelets.yaml b/karavan-space/public/metadata/kamelets.yaml
diff --git a/karavan-space/src/designer/selector/DslCard.tsx b/karavan-space/src/designer/selector/DslCard.tsx
@@ -16,7 +16,7 @@
  */
 import React from 'react';
 import {
-    Badge,
+    Badge, capitalize,
     Card, CardBody, CardFooter,
     CardHeader,
     Text,
@@ -41,16 +41,17 @@ export function DslCard (props: Props) {
     }
 
     const {dsl, index} = props;
+    const navigation = dsl.navigation === 'eip' ? 'EIP' : capitalize(dsl.navigation);
     const labels = dsl.labels !== undefined ? dsl.labels.split(",").filter(label => label !== 'eip') : [];
     const isCustom = KameletApi.getCustomKameletNames().includes(dsl.name);
     const isRemote =  dsl.remote;
     return (
         <Card key={dsl.dsl + index} isCompact isPlain isFlat isRounded className="dsl-card"
               onClick={event => selectDsl(event, dsl)}>
             <CardHeader className="header-labels">
-                <Badge isRead className="support-level labels">{dsl.supportLevel}</Badge>
+                <Badge className="navigation-label">{navigation}</Badge>
                 {['kamelet', 'component'].includes(dsl.navigation.toLowerCase()) &&
-                    <Badge isRead className="version labels">{dsl.version}</Badge>
+                    <Badge isRead className="support-level labels">{dsl.supportLevel}</Badge>
                 }
             </CardHeader>
             <CardHeader>

diff --git a/karavan-space/src/designer/selector/DslSelector.css b/karavan-space/src/designer/selector/DslSelector.css
@@ -129,6 +129,11 @@
     white-space: nowrap;
 }
 
+.dsl-modal .pf-m-unread {
+    --pf-v5-c-badge--BackgroundColor: var(--pf-v5-global--info-color--100);
+    font-weight: 200;
+}
+
 .dsl-modal .labels {
     opacity: 0.5;
     font-weight: 200;