(camel-karavan) branch main updated: Fix #976

[marat]

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


The following commit(s) were added to refs/heads/main by this push:
     new 00ec245f Fix #976
00ec245f is described below

commit 00ec245f0890f80757fc3adf6953a423b8e71c13
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Fri Nov 10 15:15:43 2023 -0500

    Fix #976
---
 karavan-core/src/core/api/CamelDefinitionYaml.ts                | 2 +-
 karavan-core/test/integration.spec.ts                           | 1 -
 karavan-core/test/plain.spec.ts                                 | 9 +++++++++
 karavan-core/test/plain3.yaml                                   | 5 +++++
 karavan-core/test/plain4.yaml                                   | 5 +++++
 karavan-web/karavan-app/src/main/webui/src/api/ProjectModels.ts | 1 +
 6 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/karavan-core/src/core/api/CamelDefinitionYaml.ts 
b/karavan-core/src/core/api/CamelDefinitionYaml.ts
index adc0cd3b..bf336b7d 100644
--- a/karavan-core/src/core/api/CamelDefinitionYaml.ts
+++ b/karavan-core/src/core/api/CamelDefinitionYaml.ts
@@ -69,7 +69,7 @@ export class CamelDefinitionYaml {
     };
 
     static isEmpty = (value?: string): boolean => {
-        return !value || (value.trim && value.trim().length === 0);
+        return value === undefined || (value.trim && value.trim().length === 
0);
     };
 
     static cleanupElement = (element: CamelElement, inArray?: boolean, 
inSteps?: boolean): CamelElement => {
diff --git a/karavan-core/test/integration.spec.ts 
b/karavan-core/test/integration.spec.ts
index ae83d539..3369a717 100644
--- a/karavan-core/test/integration.spec.ts
+++ b/karavan-core/test/integration.spec.ts
@@ -20,7 +20,6 @@ import 'mocha';
 import {CamelDefinitionYaml} from "../src/core/api/CamelDefinitionYaml";
 import {FilterDefinition, ToDefinition} from 
"../src/core/model/CamelDefinition";
 import { RouteDefinition} from "../src/core/model/CamelDefinition";
-import {Integration} from "../src/core/model/IntegrationDefinition";
 
 describe('CRD YAML to Integration', () => {
 
diff --git a/karavan-core/test/plain.spec.ts b/karavan-core/test/plain.spec.ts
index 8e10daef..26936164 100644
--- a/karavan-core/test/plain.spec.ts
+++ b/karavan-core/test/plain.spec.ts
@@ -51,6 +51,15 @@ describe('Plain YAML to integration', () => {
         }
     });
 
+    it('Boolean Properties', () => {
+        const yaml1 = fs.readFileSync('test/plain3.yaml',{encoding:'utf8', 
flag:'r'});
+        const yaml2 = fs.readFileSync('test/plain4.yaml',{encoding:'utf8', 
flag:'r'});
+        const i = CamelDefinitionYaml.yamlToIntegration("test1.yaml", yaml1);
+        (i.spec.flows?.at(0)).autoStartup = false;
+        const y = CamelDefinitionYaml.integrationToYaml(i);
+        expect(y).to.equal(yaml2);
+    });
+
     it('YAML <-> Integration', () => {
         const yaml = 
fs.readFileSync('test/plain-try-catch.yaml',{encoding:'utf8', flag:'r'});
         const i = CamelDefinitionYaml.yamlToIntegration("try-catch.yaml", 
yaml);
diff --git a/karavan-core/test/plain3.yaml b/karavan-core/test/plain3.yaml
new file mode 100644
index 00000000..10b578a9
--- /dev/null
+++ b/karavan-core/test/plain3.yaml
@@ -0,0 +1,5 @@
+- route:
+    autoStartup: true
+    id: route-1
+    from:
+      id: from-f6d9
\ No newline at end of file
diff --git a/karavan-core/test/plain4.yaml b/karavan-core/test/plain4.yaml
new file mode 100644
index 00000000..feec7cc5
--- /dev/null
+++ b/karavan-core/test/plain4.yaml
@@ -0,0 +1,5 @@
+- route:
+    autoStartup: false
+    id: route-1
+    from:
+      id: from-f6d9
diff --git a/karavan-web/karavan-app/src/main/webui/src/api/ProjectModels.ts 
b/karavan-web/karavan-app/src/main/webui/src/api/ProjectModels.ts
index b2ffbd01..70423595 100644
--- a/karavan-web/karavan-app/src/main/webui/src/api/ProjectModels.ts
+++ b/karavan-web/karavan-app/src/main/webui/src/api/ProjectModels.ts
@@ -96,6 +96,7 @@ export class ContainerStatus {
     ports: [] = [];
     commands: string [] = [];
     inTransit: boolean = false;
+    camelRuntime: string = ''
 
     public constructor(init?: Partial<ContainerStatus>) {
         Object.assign(this, init);