FIx

apache · Oct 5, 2023 · 75c46e4 · 75c46e4
1 parent 083466d
commit 75c46e4
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 260 deletions.
diff --git a/karavan-designer/src/designer/rest/rest.css b/karavan-designer/src/designer/rest/rest.css
@@ -185,6 +185,7 @@
     margin-left: 6px;
     cursor: pointer;
     justify-content: space-between;
+    position: relative;
 }
 
 .karavan .rest-designer .rest-config-card,
@@ -238,8 +239,8 @@
 .karavan .rest-designer .rest-card .delete-button,
 .karavan .rest-designer .method-card .delete-button {
     position: absolute;
-    top: 3px;
-    right: 3px;
+    top: -7px;
+    right: -7px;
     line-height: 1;
     border: 0;
     padding: 0;

diff --git a/karavan-web/docker/Dockerfile.devmode b/karavan-web/docker/Dockerfile.devmode
@@ -24,7 +24,7 @@ LABEL "org.opencontainers.image.version"="4.0.1"
 RUN apt-get update && apt-get install git && apt-get clean
 
 ENV JBANG_VERSION=0.110.0
-ENV CAMEL_VERSION=4.0.1
+ENV CAMEL_VERSION=4.0.0
 ENV KARAVAN="/karavan"
 ENV JBANG_DIR="$KARAVAN/.jbang"
 ENV MAVEN_CONFIG="$KARAVAN/.m2"

diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/KaravanStore.ts b/karavan-web/karavan-app/src/main/webui/src/designer/KaravanStore.ts
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/rest/rest.css b/karavan-web/karavan-app/src/main/webui/src/designer/rest/rest.css
@@ -185,6 +185,7 @@
     margin-left: 6px;
     cursor: pointer;
     justify-content: space-between;
+    position: relative;
 }
 
 .karavan .rest-designer .rest-config-card,
@@ -238,8 +239,8 @@
 .karavan .rest-designer .rest-card .delete-button,
 .karavan .rest-designer .method-card .delete-button {
     position: absolute;
-    top: 3px;
-    right: 3px;
+    top: -7px;
+    right: -7px;
     line-height: 1;
     border: 0;
     padding: 0;

diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/route/DslProperties.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/route/DslProperties.tsx
@@ -127,6 +127,7 @@ export function DslProperties(props: Props) {
         : getProperties().filter(p => !dataFormats.includes(p.name));
     const propertiesMain = properties.filter(p => !p.label.includes("advanced"));
     const propertiesAdvanced = properties.filter(p => p.label.includes("advanced"));
+    console.log(selectedStep)
     return (
         <div key={selectedStep ? selectedStep.uuid : 'integration'}
              className='properties'>

diff --git a/karavan-web/karavan-app/src/main/webui/src/project/files/UploadFileModal.tsx b/karavan-web/karavan-app/src/main/webui/src/project/files/UploadFileModal.tsx
@@ -56,7 +56,6 @@ export function UploadFileModal(props: Props) {
 
     function saveAndCloseModal () {
         const file = new ProjectFile(filename, props.projectId, data, Date.now());
-        console.log(file);
         if (type === "openapi"){
             KaravanApi.postOpenApi(file, generateRest, generateRoutes, integrationName, res => {
                 if (res.status === 200) {

diff --git a/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyTab.tsx b/karavan-web/karavan-app/src/main/webui/src/project/topology/TopologyTab.tsx
@@ -34,8 +34,8 @@ import {useFilesStore} from "../../api/ProjectStore";
 import {shallow} from "zustand/shallow";
 import {useTopologyStore} from "./TopologyStore";
 import {TopologyPropertiesPanel} from "./TopologyPropertiesPanel";
-import {useDesignerStore} from "../../designer/KaravanStore";
 import {TopologyToolbar} from "./TopologyToolbar";
+import {useDesignerStore} from "../../designer/DesignerStore";
 
 export const TopologyTab: React.FC = () => {
 

diff --git a/karavan-web/karavan-app/src/main/webui/src/project/topology/topology.css b/karavan-web/karavan-app/src/main/webui/src/project/topology/topology.css
@@ -23,6 +23,11 @@
     width: 100%
 }
 
+.karavan .topology-panel .properties {
+    padding: 16px;
+    overflow: auto;
+}
+
 .karavan .topology-panel .properties-header {
     padding: 10px;
 }
@@ -41,7 +46,6 @@
 }
 
 .karavan .topology-sidebar {
-    overflow: hidden;
 }
 
 .karavan .topology-sidebar .pf-topology-side-bar__dismiss {