Custom kamelets (#117)

* Load custom Kamelets

* Fixed #114

karavan-app/src/main/docker/Dockerfile.distroless

@@ -14,7 +14,7 @@
 #  limitations under the License.
 FROM gcr.io/distroless/java:11
 COPY target/*-runner.jar /deployments/karavan.jar
-COPY src/main/resources/kamelets/* /deployments/kamelets/
+COPY src/main/resources/kamelets/* /deployments/kamelets-buildin/
 COPY src/main/resources/components/* /deployments/components/
 WORKDIR /deployments
 CMD ["karavan.jar"]

karavan-app/src/main/docker/Dockerfile.legacy-jar

@@ -33,7 +33,8 @@ RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \
 
 # Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
 ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
-COPY src/main/resources/kamelets/* /deployments/kamelets/
+COPY src/main/resources/kamelets/* /deployments/kamelets-buildin/
+COPY src/main/resources/components/* /deployments/components/
 COPY target/*-runner.jar /deployments/app.jar
 
 EXPOSE 8080

karavan-app/src/main/docker/Dockerfile.multistage

@@ -37,7 +37,7 @@ RUN ./mvnw clean package -Pnative -f karavan-app
 ## Stage 2 : create the docker final image
 FROM quay.io/quarkus/quarkus-distroless-image:1.0
 COPY --chown=nonroot --from=build /code/karavan-app/target/*-runner /deployments/application
-COPY --chown=nonroot --from=build /code/karavan-app/src/main/resources/kamelets/* /deployments/kamelets/
+COPY --chown=nonroot --from=build /code/karavan-app/src/main/resources/kamelets/* /deployments/kamelets-buildin/
 COPY --chown=nonroot --from=build /code/karavan-app/src/main/resources/components/* /deployments/components/
 
 EXPOSE 8080

karavan-app/src/main/java/org/apache/camel/karavan/api/KameletResources.java

@@ -25,23 +25,36 @@
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
+import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Path("/kamelet")
 public class KameletResources {
 
-    @ConfigProperty(name = "karavan.folder.kamelets")
-    String kamelets;
+    @ConfigProperty(name = "karavan.folder.kamelets-buildin")
+    String kameletsBuildin;
+
+    @ConfigProperty(name = "karavan.folder.kamelets-custom")
+    String kameletsCustom;
 
     @Inject
     Vertx vertx;
 
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     public List<String> getList() {
-        return vertx.fileSystem().readDirBlocking(Paths.get(kamelets).toString())
+        List<String> kameletList = getList(kameletsBuildin);
+        if (Files.exists(Paths.get(kameletsCustom))) {
+            List<String> customKameletList = getList(kameletsCustom);
+            kameletList.addAll(customKameletList);
+        }
+        return kameletList;
+    }
+
+    public List<String> getList(String folder) {
+        return vertx.fileSystem().readDirBlocking(Paths.get(folder).toString())
                 .stream()
                 .filter(s -> s.endsWith(".yaml"))
                 .map(s -> {
@@ -54,6 +67,10 @@ public List<String> getList() {
     @Produces(MediaType.TEXT_PLAIN)
     @Path("/{name}")
     public String getYaml(@PathParam("name") String name) {
-        return vertx.fileSystem().readFileBlocking(Paths.get(kamelets, name).toString()).toString();
+        if (Files.exists(Paths.get(kameletsBuildin, name))) {
+            return vertx.fileSystem().readFileBlocking(Paths.get(kameletsBuildin, name).toString()).toString();
+        } else {
+            return vertx.fileSystem().readFileBlocking(Paths.get(kameletsCustom, name).toString()).toString();
+        }
     }
 }

karavan-app/src/main/java/org/apache/camel/karavan/service/FileSystemService.java

@@ -51,7 +51,7 @@ private void createFolder(String name) throws IOException {
         LOGGER.info("Creating folder " + name);
         if (!Files.exists(Paths.get(name))) {
             Path path = Files.createDirectory(Path.of(name));
-            LOGGER.info("Folder " + path + " created");
+            LOGGER.info("Folder " + path.toAbsolutePath() + " created");
         } else {
             getIntegrationList().forEach(s -> LOGGER.info("Integration found: " + s));
         }
@@ -80,6 +80,7 @@ public String getFile(String folder, String name) throws GitAPIException {
     }
 
     public void saveIntegrationsFile(String name, String yaml) throws GitAPIException, IOException {
+        System.out.println(integrations);
         vertx.fileSystem().writeFileBlocking(Paths.get(integrations, name).toString(), Buffer.buffer(yaml));
     }
 

karavan-app/src/main/resources/application.properties

@@ -1,7 +1,8 @@
 karavan.version=0.0.7
 
-karavan.folder.kamelets=kamelets
 karavan.folder.components=components
+karavan.folder.kamelets-buildin=kamelets-buildin
+karavan.folder.kamelets-custom=kamelets
 
 karavan.mode=local
 karavan.folder.integrations=integrations

karavan-app/src/main/webapp/src/Main.tsx

@@ -110,7 +110,6 @@ export class Main extends React.Component<Props, State> {
             this.onGetIntegrations();
         }
         this.setState({
-            isNavOpen: result.itemId !== 'designer',
             pageId: result.itemId,
         });
     };

karavan-designer/src/designer/api/KameletApi.tsx

@@ -47,7 +47,12 @@ export const KameletApi = {
     },
 
     getKamelets: (): KameletModel[] => {
-        return Kamelets;
+        return Kamelets.sort((a, b) => {
+            if (a.title().toLowerCase() < b.title().toLowerCase()) {
+                return -1;
+            }
+            return a.title().toLowerCase() > b.title().toLowerCase() ? 1 : 0;
+        });
     },
 
     jsonToKamelet: (json: string) => {
@@ -73,10 +78,10 @@ export const KameletApi = {
     saveKamelets: (kameletYamls: string[]) => {
         const kamelets:KameletModel[] = kameletYamls.map(text => KameletApi.yamlToKamelet(text));
         Kamelets.push(...kamelets.sort((a, b) => {
-                if (a.spec.definition.title < b.spec.definition.title) {
+                if (a.spec.definition.title.toLowerCase() < b.spec.definition.title.toLowerCase()) {
                     return -1;
                 }
-                return a.spec.definition.title > b.spec.definition.title ? 1 : 0;
+                return a.spec.definition.title.toLowerCase() > b.spec.definition.title.toLowerCase() ? 1 : 0;
             })
         );
     },

karavan-vscode/package.json

@@ -71,6 +71,11 @@
           "type": "boolean",
           "default": "true",
           "description": "Reload routes on change"
+        },
+        "Karavan.kameletsPath": {
+          "type": "string",
+          "default": "",
+          "description": "Custom Kamelets Path"
         }
       }
     },

karavan-vscode/src/extension.ts

@@ -21,6 +21,7 @@ import { CamelYaml } from "../designer/api/CamelYaml";
 import { CamelUi } from "../designer/api/CamelUi";
 import * as jsyaml from 'js-yaml';
 import { Integration } from "../designer/model/CamelModel";
+import { homedir } from "os";
 
 const KARAVAN_LOADED = "karavan:loaded";
 const KARAVAN_PANELS: Map<any, string> = new Map<string, string>();
@@ -131,7 +132,6 @@ function openKaravanWebView(context: vscode.ExtensionContext, webviewContent: st
     // Handle messages from the webview
     panel.webview.onDidReceiveMessage(
         message => {
-            console.log(message);
             switch (message.command) {
                 case 'save':
                     if (vscode.workspace.workspaceFolders) {
@@ -179,6 +179,14 @@ function createIntegration(context: vscode.ExtensionContext, webviewContent: str
 function readKamelets(context: vscode.ExtensionContext): string[] {
     const dir = path.join(context.extensionPath, 'kamelets');
     const yamls: string[] = fs.readdirSync(dir).filter(file => file.endsWith("yaml")).map(file => fs.readFileSync(dir + "/" + file, 'utf-8'));
+    try {
+        const kameletsPath:string = vscode.workspace.getConfiguration().get("Karavan.kameletsPath") || '';
+        const kameletsDir = path.isAbsolute(kameletsPath) ? kameletsPath : path.resolve(kameletsPath);
+        const customKamelets: string[] = fs.readdirSync(kameletsDir).filter(file => file.endsWith("yaml")).map(file => fs.readFileSync(kameletsDir + "/" + file, 'utf-8'));
+        if (customKamelets && customKamelets.length > 0) yamls.push(...customKamelets);
+    } catch(e) {
+
+    }
     return yamls;
 }