Skip to content

Commit 87d6805

Browse files
committed
Fix #1442
1 parent c427e69 commit 87d6805

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

karavan-app/src/main/webui/src/designer/utils/CamelUi.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,10 @@ export class CamelUi {
212212

213213
static checkFilter = (dsl: DslMetaModel, filter: string | undefined = undefined): boolean => {
214214
if (filter !== undefined && filter !== "") {
215-
return dsl.name.toLowerCase().includes(filter.toLowerCase())
216-
|| dsl.description.toLowerCase().includes(filter.toLowerCase())
217-
|| dsl.title.toLowerCase().includes(filter.toLowerCase())
218-
|| dsl.labels.toLowerCase().includes(filter.toLowerCase());
215+
return dsl?.name?.toLowerCase().includes(filter.toLowerCase())
216+
|| dsl?.description?.toLowerCase().includes(filter.toLowerCase())
217+
|| dsl?.title?.toLowerCase().includes(filter.toLowerCase())
218+
|| dsl?.labels?.toLowerCase().includes(filter.toLowerCase());
219219
} else {
220220
return true;
221221
}

karavan-app/src/main/webui/src/knowledgebase/KnowledgebasePage.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ export const KnowledgebasePage = (props: Props) => {
9393
if (customOnly) kameletList = kameletList.filter(k => KameletApi.getCustomKameletNames().includes(k.metadata.name));
9494

9595
const components = ComponentApi.getComponents().filter(c => {
96-
return c.component.name.toLowerCase().includes(filter.toLowerCase())
97-
|| c.component.title.toLowerCase().includes(filter.toLowerCase())
98-
|| c.component.description.toLowerCase().includes(filter.toLowerCase())
96+
return c.component?.name?.toLowerCase().includes(filter.toLowerCase())
97+
|| c.component?.title?.toLowerCase().includes(filter.toLowerCase())
98+
|| c.component?.description?.toLowerCase().includes(filter.toLowerCase())
9999
}).sort((a, b) => (a.component.title?.toLowerCase() > b.component.title?.toLowerCase() ? 1 : -1)) ;
100100

101101
const elements= CamelModelMetadata

karavan-designer/src/designer/utils/CamelUi.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,10 @@ export class CamelUi {
212212

213213
static checkFilter = (dsl: DslMetaModel, filter: string | undefined = undefined): boolean => {
214214
if (filter !== undefined && filter !== "") {
215-
return dsl.name.toLowerCase().includes(filter.toLowerCase())
216-
|| dsl.description.toLowerCase().includes(filter.toLowerCase())
217-
|| dsl.title.toLowerCase().includes(filter.toLowerCase())
218-
|| dsl.labels.toLowerCase().includes(filter.toLowerCase());
215+
return dsl?.name?.toLowerCase().includes(filter.toLowerCase())
216+
|| dsl?.description?.toLowerCase().includes(filter.toLowerCase())
217+
|| dsl?.title?.toLowerCase().includes(filter.toLowerCase())
218+
|| dsl?.labels?.toLowerCase().includes(filter.toLowerCase());
219219
} else {
220220
return true;
221221
}

karavan-designer/src/knowledgebase/KnowledgebasePage.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ export const KnowledgebasePage = (props: Props) => {
9393
if (customOnly) kameletList = kameletList.filter(k => KameletApi.getCustomKameletNames().includes(k.metadata.name));
9494

9595
const components = ComponentApi.getComponents().filter(c => {
96-
return c.component.name.toLowerCase().includes(filter.toLowerCase())
97-
|| c.component.title.toLowerCase().includes(filter.toLowerCase())
98-
|| c.component.description.toLowerCase().includes(filter.toLowerCase())
96+
return c.component?.name?.toLowerCase().includes(filter.toLowerCase())
97+
|| c.component?.title?.toLowerCase().includes(filter.toLowerCase())
98+
|| c.component?.description?.toLowerCase().includes(filter.toLowerCase())
9999
}).sort((a, b) => (a.component.title?.toLowerCase() > b.component.title?.toLowerCase() ? 1 : -1)) ;
100100

101101
const elements= CamelModelMetadata

karavan-space/src/designer/utils/CamelUi.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,10 @@ export class CamelUi {
212212

213213
static checkFilter = (dsl: DslMetaModel, filter: string | undefined = undefined): boolean => {
214214
if (filter !== undefined && filter !== "") {
215-
return dsl.name.toLowerCase().includes(filter.toLowerCase())
216-
|| dsl.description.toLowerCase().includes(filter.toLowerCase())
217-
|| dsl.title.toLowerCase().includes(filter.toLowerCase())
218-
|| dsl.labels.toLowerCase().includes(filter.toLowerCase());
215+
return dsl?.name?.toLowerCase().includes(filter.toLowerCase())
216+
|| dsl?.description?.toLowerCase().includes(filter.toLowerCase())
217+
|| dsl?.title?.toLowerCase().includes(filter.toLowerCase())
218+
|| dsl?.labels?.toLowerCase().includes(filter.toLowerCase());
219219
} else {
220220
return true;
221221
}

karavan-space/src/knowledgebase/KnowledgebasePage.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ export const KnowledgebasePage = (props: Props) => {
9393
if (customOnly) kameletList = kameletList.filter(k => KameletApi.getCustomKameletNames().includes(k.metadata.name));
9494

9595
const components = ComponentApi.getComponents().filter(c => {
96-
return c.component.name.toLowerCase().includes(filter.toLowerCase())
97-
|| c.component.title.toLowerCase().includes(filter.toLowerCase())
98-
|| c.component.description.toLowerCase().includes(filter.toLowerCase())
96+
return c.component?.name?.toLowerCase().includes(filter.toLowerCase())
97+
|| c.component?.title?.toLowerCase().includes(filter.toLowerCase())
98+
|| c.component?.description?.toLowerCase().includes(filter.toLowerCase())
9999
}).sort((a, b) => (a.component.title?.toLowerCase() > b.component.title?.toLowerCase() ? 1 : -1)) ;
100100

101101
const elements= CamelModelMetadata

0 commit comments

Comments
 (0)