[camel-karavan] 05/07: Standalone Designer

[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 28dca82316983e60a8000e3597b53396e5af2279
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Sun Nov 13 14:57:51 2022 -0500

    Standalone Designer
---
 karavan-app/src/main/webui/src/projects/ProjectPage.tsx               | 1 +
 karavan-core/src/core/model/IntegrationDefinition.ts                  | 4 ++--
 .../org/apache/camel/karavan/generator/CamelComponentsGenerator.java  | 2 +-
 .../java/org/apache/camel/karavan/generator/KameletGenerator.java     | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/karavan-app/src/main/webui/src/projects/ProjectPage.tsx b/karavan-app/src/main/webui/src/projects/ProjectPage.tsx
index 0b12716..ed3dbb4 100644
--- a/karavan-app/src/main/webui/src/projects/ProjectPage.tsx
+++ b/karavan-app/src/main/webui/src/projects/ProjectPage.tsx
@@ -196,6 +196,7 @@ export class ProjectPage extends React.Component<Props, State> {
             const type = ProjectFileTypes.filter(p => p.extension === extension).map(p => p.title)[0];
             if (type) {
                 return type
+                return type
             } else {
                 return "Unknown"
             }
diff --git a/karavan-core/src/core/model/IntegrationDefinition.ts b/karavan-core/src/core/model/IntegrationDefinition.ts
index 055cc55..433d97d 100644
--- a/karavan-core/src/core/model/IntegrationDefinition.ts
+++ b/karavan-core/src/core/model/IntegrationDefinition.ts
@@ -45,8 +45,8 @@ export class Integration {
         Object.assign(this, init);
     }
 
-    static createNew(name?: string): Integration {
-        return new Integration({metadata: new Metadata({name: name}), spec: new Spec({flows: []})})
+    static createNew(name?: string, type: 'crd' | 'plain' | 'kamelet' = 'crd'): Integration {
+        return new Integration({type: type, metadata: new Metadata({name: name}), spec: new Spec({flows: []})})
     }
 }
 
diff --git a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelComponentsGenerator.java b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelComponentsGenerator.java
index 865e7f5..bada006 100644
--- a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelComponentsGenerator.java
+++ b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelComponentsGenerator.java
@@ -41,8 +41,8 @@ public final class CamelComponentsGenerator extends AbstractGenerator {
 
     public static void generate() throws Exception {
         CamelComponentsGenerator g = new CamelComponentsGenerator();
+        g.createCreateComponents("karavan-designer/public/components", true);
         g.createCreateComponents("karavan-app/src/main/resources/components", true);
-        g.createCreateComponents("karavan-designer/public/components", false);
         g.createCreateComponents("karavan-vscode/components", true);
     }
 
diff --git a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/KameletGenerator.java b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/KameletGenerator.java
index 5c9a408..db17062 100644
--- a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/KameletGenerator.java
+++ b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/KameletGenerator.java
@@ -45,8 +45,8 @@ public class KameletGenerator extends AbstractGenerator {
 
     public static void generate() throws Exception {
         KameletGenerator g = new KameletGenerator();
+        g.createKamelets("karavan-designer/public/kamelets", true);
         g.createKamelets("karavan-app/src/main/resources/kamelets", true);
-        g.createKamelets("karavan-designer/public/kamelets", false);
         g.createKamelets("karavan-vscode/kamelets", true);
     }