Add more Spring Integration component extensions to Canvas

si-schema-translator/schemaConfig.yaml

@@ -1,16 +1,13 @@
-# Some minor errors were present in some spring-integration schemas.
-# The XMLs were corrected and served on a local http server.
-# The errors for each schema (if present) are commented below
-
 schemas:
   - alias: "integration"
     namespace: "http://www.springframework.org/schema/integration"
     location: "https://www.springframework.org/schema/integration/spring-integration-5.2.xsd"
     excludedElements:
+      - "application-event-multicaster"
+      - "chain"
+      - "converter"
       - "selector-chain"
       - "spel-property-accessors"
-      - "converter"
-      - "chain"
 
   - alias: "jms"
     namespace: "http://www.springframework.org/schema/integration/jms"
@@ -43,17 +40,17 @@ schemas:
     namespace: "http://www.springframework.org/schema/integration/sftp"
     location: "https://www.springframework.org/schema/integration/sftp/spring-integration-sftp-5.2.xsd"
 
-  - alias: "tcp/udp"
+  - alias: "tcp-udp"
     namespace: "http://www.springframework.org/schema/integration/ip"
     location: "https://www.springframework.org/schema/integration/ip/spring-integration-ip-5.2.xsd"
 
   - alias: "web-services"
     namespace: "http://www.springframework.org/schema/integration/ws"
     location: "https://www.springframework.org/schema/integration/ws/spring-integration-ws-5.2.xsd"
 
-#  - alias: "xml"
-#    namespace: "http://www.springframework.org/schema/integration/xml"
-#    location: "https://www.springframework.org/schema/integration/xml/spring-integration-xml-5.2.xsd"
+  - alias: "xml"
+    namespace: "http://www.springframework.org/schema/integration/xml"
+    location: "https://www.springframework.org/schema/integration/xml/spring-integration-xml-5.2.xsd"
 
 # schemaLocations provided here will override any schemaLocations provided in <xsd:import> elements
 # for the listed namespaces

ui/src/assets/eip/info.txt

@@ -1 +1 @@
-Images are taken from https://github.com/plantuml-stdlib/EIP-PlantUML and converted to SVGs
+Some images were taken from https://github.com/plantuml-stdlib/EIP-PlantUML and converted to SVGs

ui/src/singletons/eipIconCatalog.ts

@@ -5,6 +5,7 @@ import barrierImg from "../assets/eip/barrier.svg"
 import bridgeImg from "../assets/eip/bridge.svg"
 import channelImg from "../assets/eip/channel.svg"
 import claimCheckImg from "../assets/eip/claim_check.svg"
+import connectionFactoryImg from "../assets/eip/connection--factory.svg"
 import controlBusImg from "../assets/eip/control_bus.svg"
 import delayerImg from "../assets/eip/delayer.svg"
 import enricherImg from "../assets/eip/enricher.svg"
@@ -39,13 +40,15 @@ const findIcon = (name: string) => {
     case name.endsWith("gateway"):
       return gatewayImg
     case name === "message-driven-channel-adapter":
-    case name.includes("inbound-channel-adapter"):
+    case name.includes("inbound") && name.includes("channel-adapter"):
       return inboundAdapterImg
     case name === "logging-channel-adapter":
-    case name.includes("outbound-channel-adapter"):
+    case name.includes("outbound") && name.includes("channel-adapter"):
       return outboundAdapterImg
     case name.endsWith("router"):
       return routerImg
+    case name.includes("splitter"):
+      return splitterImg
     case name.includes("transformer"):
       return transformerImg
     default:
@@ -96,13 +99,16 @@ const findIcon = (name: string) => {
       return serviceActivatorImg
     case "spel-function":
       return spelFunctionImg
-    case "splitter":
-      return splitterImg
+    case "tcp-connection-factory":
+      return connectionFactoryImg
     case "transaction-synchronization-factory":
       return processManagerImg
     case "wire-tap":
       return wireTapImg
+    case "xpath-expression":
+      return scriptImg
     default:
+      console.log(`No icon found for ${name}`)
       return undefined
   }
 }

ui/src/styles.scss

@@ -26,18 +26,14 @@
   background-color: themes.$background-inverse;
 
   .header-main-text {
-    color: themes.$text-inverse !important;
-    font-size: type.type-scale(3) !important;
+    color: themes.$text-inverse;
+    font-size: type.type-scale(3);
   }
 
   .header-action-bar {
     padding-right: layout.$spacing-05;
   }
 
-  svg.header-icon {
-    fill: themes.$icon-inverse !important;
-  }
-
   .options-menu:hover {
     background-color: themes.$background-inverse-hover;
   }
@@ -141,6 +137,7 @@
 
   .eip-item-image {
     width: 2rem;
+    min-width: 2rem;
     height: 2rem;
   }