You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2025/12/08 16:18:21 UTC
(camel-karavan) 03/04: Fix #1574
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 01f9a9622ec40b08e3afcdee4389528088369746
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Mon Dec 8 11:10:35 2025 -0500
Fix #1574
---
.../features/integration/designer/property/DslProperties.tsx | 9 ++++-----
.../integration/designer/property/PropertiesHeader.tsx | 8 ++------
.../integration/designer/property/usePropertiesHook.tsx | 12 ++++++------
3 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/karavan-app/src/main/webui/src/karavan/features/integration/designer/property/DslProperties.tsx b/karavan-app/src/main/webui/src/karavan/features/integration/designer/property/DslProperties.tsx
index 6a5a630e..8c350f4b 100644
--- a/karavan-app/src/main/webui/src/karavan/features/integration/designer/property/DslProperties.tsx
+++ b/karavan-app/src/main/webui/src/karavan/features/integration/designer/property/DslProperties.tsx
@@ -48,7 +48,6 @@ import TimesIcon from "@patternfly/react-icons/dist/esm/icons/times-icon";
import {RouteTemplateDefinition} from "@karavan-core/model/CamelDefinition";
interface Props {
- designerType: 'routes' | 'rest' | 'beans',
expressionEditor: React.ComponentType<any>;
}
@@ -63,10 +62,10 @@ export function DslProperties(props: Props) {
onParametersChange,
onExpressionChange
} =
- usePropertiesHook(props.designerType);
+ usePropertiesHook();
- const [selectedStep, setParameterPlaceholders]
- = useDesignerStore((s) => [s.selectedStep, s.setParameterPlaceholders], shallow)
+ const [selectedStep, setParameterPlaceholders, tab]
+ = useDesignerStore((s) => [s.selectedStep, s.setParameterPlaceholders, s.tab], shallow)
const [propertyFilter, changedOnly, requiredOnly, setChangedOnly, sensitiveOnly, setSensitiveOnly, setPropertyFilter, setRequiredOnly]
= usePropertiesStore((s) => [s.propertyFilter, s.changedOnly, s.requiredOnly, s.setChangedOnly, s.sensitiveOnly, s.setSensitiveOnly, s.setPropertyFilter, s.setRequiredOnly], shallow)
@@ -110,7 +109,7 @@ export function DslProperties(props: Props) {
}
function getPropertiesHeader(): ReactElement {
- if (props.designerType === 'routes') return <PropertiesHeader designerType={props.designerType}/>
+ if (tab === 'routes') return <PropertiesHeader/>
else return getClonableElementHeader();
}
diff --git a/karavan-app/src/main/webui/src/karavan/features/integration/designer/property/PropertiesHeader.tsx b/karavan-app/src/main/webui/src/karavan/features/integration/designer/property/PropertiesHeader.tsx
index edd40ec2..d5b5ed35 100644
--- a/karavan-app/src/main/webui/src/karavan/features/integration/designer/property/PropertiesHeader.tsx
+++ b/karavan-app/src/main/webui/src/karavan/features/integration/designer/property/PropertiesHeader.tsx
@@ -47,13 +47,9 @@ import {ComponentApi} from "@karavan-core/api/ComponentApi";
import {CamelMetadataApi} from "@karavan-core/model/CamelMetadata";
import {useRouteDesignerHook} from "../route/useRouteDesignerHook";
-interface Props {
- designerType: 'routes' | 'rest' | 'beans'
-}
-
-export function PropertiesHeader(props: Props) {
+export function PropertiesHeader() {
- const {saveAsRoute, convertStep, onPropertyChange} = usePropertiesHook(props.designerType);
+ const {saveAsRoute, convertStep, onPropertyChange} = usePropertiesHook();
const {openSelectorToReplaceFrom} = useRouteDesignerHook();
const [selectedStep] = useDesignerStore((s) => [s.selectedStep], shallow)
diff --git a/karavan-app/src/main/webui/src/karavan/features/integration/designer/property/usePropertiesHook.tsx b/karavan-app/src/main/webui/src/karavan/features/integration/designer/property/usePropertiesHook.tsx
index 0a5f1953..615ba410 100644
--- a/karavan-app/src/main/webui/src/karavan/features/integration/designer/property/usePropertiesHook.tsx
+++ b/karavan-app/src/main/webui/src/karavan/features/integration/designer/property/usePropertiesHook.tsx
@@ -27,18 +27,18 @@ import {CamelMetadataApi} from "@karavan-core/model/CamelMetadata";
import {EventBus} from "../utils/EventBus";
import {INTERNAL_COMPONENTS} from "@karavan-core/api/ComponentApi";
-export function usePropertiesHook(designerType: 'routes' | 'rest' | 'beans' = 'routes') {
+export function usePropertiesHook() {
const [integration, setIntegration] = useIntegrationStore((state) => [state.integration, state.setIntegration], shallow)
- const [selectedStep, setSelectedStep, setSelectedUuids] = useDesignerStore((s) =>
- [s.selectedStep, s.setSelectedStep, s.setSelectedUuids], shallow)
+ const [selectedStep, setSelectedStep, setSelectedUuids, tab] = useDesignerStore((s) =>
+ [s.selectedStep, s.setSelectedStep, s.setSelectedUuids, s.tab], shallow)
function onPropertyUpdate(element: CamelElement, newRoute?: RouteToCreate) {
- if (designerType === 'routes') {
+ if (tab === 'routes') {
onRoutePropertyUpdate(element, newRoute);
- } else if (designerType === 'rest') {
+ } else if (tab === 'rest') {
onRestPropertyUpdate(element, newRoute);
- } else if (designerType === 'beans') {
+ } else if (tab === 'beans') {
onBeanPropertyUpdate(element, newRoute);
}
}