Skip to content

Commit c577c88

Browse files
mgubaidullinmgubaidullin
committed
Fix #1443 
1 parent 87d6805 commit c577c88

File tree

3 files changed

+48
-30
lines changed

3 files changed

+48
-30
lines changed

‎karavan-app/src/main/webui/src/designer/selector/DslSelector.tsx‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import TimesIcon from "@patternfly/react-icons/dist/esm/icons/times-icon";
4040
import {addPreferredElement, deletePreferredElement, getPreferredElements} from "./DslPreferences";
4141
import {DslFastCard} from "./DslFastCard";
4242
import {DslCard} from "./DslCard";
43-
import {useDebounceCallback, useDebounceValue} from 'usehooks-ts';
43+
import {useDebounceValue} from 'usehooks-ts';
4444

4545
interface Props {
4646
tabIndex?: string | number
@@ -152,7 +152,7 @@ export function DslSelector(props: Props) {
152152
{parentDsl !== undefined && <ToggleGroupItem
153153
text={
154154
<div style={{display: 'flex', flexDirection: 'row'}}>
155-
<div style={{marginRight: '6px'}}>EIP</div>
155+
<div style={{marginRight: '6px'}}>Processors</div>
156156
{ready && <Badge isRead={!isEIP} className={isEIP ? "label-eip" : ""}>{eCount}</Badge>}
157157
</div>
158158
}
@@ -231,7 +231,13 @@ export function DslSelector(props: Props) {
231231
.filter(d => {
232232
if (selectedToggles.includes('eip') && d.navigation === 'eip') return true
233233
else if (selectedToggles.includes('components') && d.navigation === 'component') return true
234-
else if (selectedToggles.includes('kamelets') && d.navigation === 'kamelet') return true
234+
else if (selectedToggles.includes('kamelets') && d.navigation === 'kamelet') {
235+
if (customOnly) {
236+
return KameletApi.getCustomKameletNames().includes(d.name);
237+
} else {
238+
return true;
239+
}
240+
}
235241
else return false;
236242
})
237243
.filter(d => CamelUi.checkFilter(d, filter));
@@ -242,13 +248,13 @@ export function DslSelector(props: Props) {
242248

243249
const fastElements: DslMetaModel[] = elements
244250
.filter((d: DslMetaModel) => {
245-
if (selectedToggles.includes('eip') && d.navigation === 'eip') {
246-
return preferredElements.includes(d.dsl);
247-
} else if (d.navigation === 'component' && d.navigation === 'component') {
248-
return d.uri && preferredElements.includes(d.uri)
249-
} else {
250-
return preferredElements.includes(d.name)
251-
}
251+
if (selectedToggles.includes('eip') && d.navigation === 'eip') {
252+
return preferredElements.includes(d.dsl);
253+
} else if (d.navigation === 'component' && d.navigation === 'component') {
254+
return d.uri && preferredElements.includes(d.uri)
255+
} else {
256+
return preferredElements.includes(d.name)
257+
}
252258
})
253259
.filter(d => CamelUi.checkFilter(d, filter))
254260
.filter((_, i) => i < 7)

‎karavan-designer/src/designer/selector/DslSelector.tsx‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import TimesIcon from "@patternfly/react-icons/dist/esm/icons/times-icon";
4040
import {addPreferredElement, deletePreferredElement, getPreferredElements} from "./DslPreferences";
4141
import {DslFastCard} from "./DslFastCard";
4242
import {DslCard} from "./DslCard";
43-
import {useDebounceCallback, useDebounceValue} from 'usehooks-ts';
43+
import {useDebounceValue} from 'usehooks-ts';
4444

4545
interface Props {
4646
tabIndex?: string | number
@@ -152,7 +152,7 @@ export function DslSelector(props: Props) {
152152
{parentDsl !== undefined && <ToggleGroupItem
153153
text={
154154
<div style={{display: 'flex', flexDirection: 'row'}}>
155-
<div style={{marginRight: '6px'}}>EIP</div>
155+
<div style={{marginRight: '6px'}}>Processors</div>
156156
{ready && <Badge isRead={!isEIP} className={isEIP ? "label-eip" : ""}>{eCount}</Badge>}
157157
</div>
158158
}
@@ -231,7 +231,13 @@ export function DslSelector(props: Props) {
231231
.filter(d => {
232232
if (selectedToggles.includes('eip') && d.navigation === 'eip') return true
233233
else if (selectedToggles.includes('components') && d.navigation === 'component') return true
234-
else if (selectedToggles.includes('kamelets') && d.navigation === 'kamelet') return true
234+
else if (selectedToggles.includes('kamelets') && d.navigation === 'kamelet') {
235+
if (customOnly) {
236+
return KameletApi.getCustomKameletNames().includes(d.name);
237+
} else {
238+
return true;
239+
}
240+
}
235241
else return false;
236242
})
237243
.filter(d => CamelUi.checkFilter(d, filter));
@@ -242,13 +248,13 @@ export function DslSelector(props: Props) {
242248

243249
const fastElements: DslMetaModel[] = elements
244250
.filter((d: DslMetaModel) => {
245-
if (selectedToggles.includes('eip') && d.navigation === 'eip') {
246-
return preferredElements.includes(d.dsl);
247-
} else if (d.navigation === 'component' && d.navigation === 'component') {
248-
return d.uri && preferredElements.includes(d.uri)
249-
} else {
250-
return preferredElements.includes(d.name)
251-
}
251+
if (selectedToggles.includes('eip') && d.navigation === 'eip') {
252+
return preferredElements.includes(d.dsl);
253+
} else if (d.navigation === 'component' && d.navigation === 'component') {
254+
return d.uri && preferredElements.includes(d.uri)
255+
} else {
256+
return preferredElements.includes(d.name)
257+
}
252258
})
253259
.filter(d => CamelUi.checkFilter(d, filter))
254260
.filter((_, i) => i < 7)

‎karavan-space/src/designer/selector/DslSelector.tsx‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import TimesIcon from "@patternfly/react-icons/dist/esm/icons/times-icon";
4040
import {addPreferredElement, deletePreferredElement, getPreferredElements} from "./DslPreferences";
4141
import {DslFastCard} from "./DslFastCard";
4242
import {DslCard} from "./DslCard";
43-
import {useDebounceCallback, useDebounceValue} from 'usehooks-ts';
43+
import {useDebounceValue} from 'usehooks-ts';
4444

4545
interface Props {
4646
tabIndex?: string | number
@@ -152,7 +152,7 @@ export function DslSelector(props: Props) {
152152
{parentDsl !== undefined && <ToggleGroupItem
153153
text={
154154
<div style={{display: 'flex', flexDirection: 'row'}}>
155-
<div style={{marginRight: '6px'}}>EIP</div>
155+
<div style={{marginRight: '6px'}}>Processors</div>
156156
{ready && <Badge isRead={!isEIP} className={isEIP ? "label-eip" : ""}>{eCount}</Badge>}
157157
</div>
158158
}
@@ -231,7 +231,13 @@ export function DslSelector(props: Props) {
231231
.filter(d => {
232232
if (selectedToggles.includes('eip') && d.navigation === 'eip') return true
233233
else if (selectedToggles.includes('components') && d.navigation === 'component') return true
234-
else if (selectedToggles.includes('kamelets') && d.navigation === 'kamelet') return true
234+
else if (selectedToggles.includes('kamelets') && d.navigation === 'kamelet') {
235+
if (customOnly) {
236+
return KameletApi.getCustomKameletNames().includes(d.name);
237+
} else {
238+
return true;
239+
}
240+
}
235241
else return false;
236242
})
237243
.filter(d => CamelUi.checkFilter(d, filter));
@@ -242,13 +248,13 @@ export function DslSelector(props: Props) {
242248

243249
const fastElements: DslMetaModel[] = elements
244250
.filter((d: DslMetaModel) => {
245-
if (selectedToggles.includes('eip') && d.navigation === 'eip') {
246-
return preferredElements.includes(d.dsl);
247-
} else if (d.navigation === 'component' && d.navigation === 'component') {
248-
return d.uri && preferredElements.includes(d.uri)
249-
} else {
250-
return preferredElements.includes(d.name)
251-
}
251+
if (selectedToggles.includes('eip') && d.navigation === 'eip') {
252+
return preferredElements.includes(d.dsl);
253+
} else if (d.navigation === 'component' && d.navigation === 'component') {
254+
return d.uri && preferredElements.includes(d.uri)
255+
} else {
256+
return preferredElements.includes(d.name)
257+
}
252258
})
253259
.filter(d => CamelUi.checkFilter(d, filter))
254260
.filter((_, i) => i < 7)

0 commit comments

Comments
 (0)