chore(kamelets): Update kamelet boundaries definition and icons

relates to: KaotoIO#110
igarashitm · Nov 29, 2023 · 2e3485d · 2e3485d
1 parent 5b722a7
commit 2e3485d
Show file tree

Hide file tree

Showing 10 changed files with 605 additions and 583 deletions.
diff --git a/packages/camel-catalog/assembly/src/main/resources/kamelets/boundaries/sink.json b/packages/camel-catalog/assembly/src/main/resources/kamelets/boundaries/sink.json
diff --git a/packages/camel-catalog/assembly/src/main/resources/kamelets/boundaries/source.json b/packages/camel-catalog/assembly/src/main/resources/kamelets/boundaries/source.json
diff --git a/packages/ui-tests/stories/Canvas.stories.tsx b/packages/ui-tests/stories/Canvas.stories.tsx
@@ -10,6 +10,7 @@ import {
  SourceCodeProvider,
  VisibleFLowsContextResult,
  VisibleFlowsContext,
+ kameletJson,
  pipeJson,
 } from '@kaoto-next/ui/testing';
 import { Meta, StoryFn } from '@storybook/react';
@@ -40,6 +41,7 @@ const emptyCamelRouteJson = {
 const camelRouteEntity = new CamelRouteVisualEntity(complexRouteMock.route);
 const emptyCamelRouteEntity = new CamelRouteVisualEntity(emptyCamelRouteJson.route);
 const pipeEntity = new PipeVisualEntity(pipeJson.spec!);
+const kameletEntity = new CamelRouteVisualEntity(kameletJson.spec.template);
 const emptyPipeEntity = new PipeVisualEntity(emptyPipeJson.spec!);
 
 const ContextDecorator = (Story: StoryFn) => (
@@ -85,6 +87,11 @@ PipeVisualization.args = {
  entities: [pipeEntity],
 };
 
+export const KameletVisualization = Template.bind({});
+KameletVisualization.args = {
+ entities: [kameletEntity],
+};
+
 export const EmptyPipeVisualization = Template.bind({});
 EmptyPipeVisualization.args = {
  entities: [emptyPipeEntity],

diff --git a/packages/ui/src/components/IconResolver/IconResolver.tsx b/packages/ui/src/components/IconResolver/IconResolver.tsx
@@ -11,6 +11,7 @@ interface IconResolverProps {
 export const IconResolver: FunctionComponent<PropsWithChildren<IconResolverProps>> = (props) => {
  switch (props.tile.type) {
  case CatalogKind.Kamelet:
+ case CatalogKind.KameletBoundary:
  return (
  <img
  className={props.className}

diff --git a/packages/ui/src/models/camel-catalog-index.ts b/packages/ui/src/models/camel-catalog-index.ts
@@ -16,7 +16,7 @@ export interface Catalogs {
  languages: CatalogEntry;
  dataformats: CatalogEntry;
  kamelets: CatalogEntry;
- 'kamelets-boundaries': CatalogEntry;
+ kameletBoundaries: CatalogEntry;
  patterns: CatalogEntry;
 }
 

diff --git a/packages/ui/src/models/visualization/flows/camel-catalog.service.ts b/packages/ui/src/models/visualization/flows/camel-catalog.service.ts
@@ -28,6 +28,7 @@ export class CamelCatalogService {
  dataformatName?: string,
  ): ICamelDataformatDefinition | undefined;
  static getComponent(catalogKey: CatalogKind.Kamelet, componentName?: string): IKameletDefinition | undefined;
+ static getComponent(catalogKey: CatalogKind.KameletBoundary, componentName?: string): IKameletDefinition | undefined;
  static getComponent(catalogKey: CatalogKind, componentName?: string): ComponentsCatalogTypes | undefined;
  static getComponent(catalogKey: CatalogKind, componentName?: string): ComponentsCatalogTypes | undefined {
  if (componentName === undefined) return undefined;

diff --git a/packages/ui/src/models/visualization/flows/support/camel-component-schema.service.ts b/packages/ui/src/models/visualization/flows/support/camel-component-schema.service.ts
@@ -114,10 +114,18 @@ export class CamelComponentSchemaService {
  if (isDefined(camelElementLookup.componentName)) {
  let catalogKind: CatalogKind = CatalogKind.Component;
  let lookupName: string = camelElementLookup.componentName;
- if (camelElementLookup.componentName.startsWith('kamelet:')) {
+
+ if (
+ camelElementLookup.componentName === 'kamelet:source' ||
+ camelElementLookup.componentName === 'kamelet:sink'
+ ) {
+ catalogKind = CatalogKind.KameletBoundary;
+ lookupName = camelElementLookup.componentName.replace('kamelet:', '');
+ } else if (camelElementLookup.componentName.startsWith('kamelet:')) {
  catalogKind = CatalogKind.Kamelet;
  lookupName = camelElementLookup.componentName.replace('kamelet:', '');
  }
+
  if (isDefined(CamelCatalogService.getComponent(catalogKind, lookupName))) {
  return camelElementLookup.componentName;
  }

diff --git a/packages/ui/src/providers/catalog.provider.tsx b/packages/ui/src/providers/catalog.provider.tsx
@@ -43,7 +43,7 @@ export const CatalogLoaderProvider: FunctionComponent<PropsWithChildren<{ catalo
  );
  /** Camel Kamelets boundaries definitions list (CRDs) */
  const kameletBoundariesFiles = CatalogSchemaLoader.fetchFile<ComponentsCatalog[CatalogKind.KameletBoundary]>(
- `${props.catalogUrl}/${catalogIndex.catalogs['kamelets-boundaries'].file}`,
+ `${props.catalogUrl}/${catalogIndex.catalogs.kameletBoundaries.file}`,
  );
 
  const [

diff --git a/packages/ui/src/stubs/index.ts b/packages/ui/src/stubs/index.ts
@@ -1,3 +1,4 @@
 export * from './camel-route';
 export * from './kamelet-binding-route';
+export * from './kamelet-route';
 export * from './pipe';