Skip to content

Commit

Permalink
fixes issue with kn resources if trigger goes to ksvc and IMC from sa…
Browse files Browse the repository at this point in the history
…me broker
  • Loading branch information
invincibleJai authored and openshift-cherrypick-robot committed Dec 15, 2020
1 parent 8eb625c commit 726844f
Showing 1 changed file with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -618,8 +618,9 @@ export const createPubSubDataItems = (
kind: trigger?.spec?.subscriber?.ref?.kind,
});
const knServiceAdded =
tData.ksservices.filter((ksvc) => ksvc.metadata.name === knService.metadata.name).length >
0;
knService &&
tData.ksservices?.filter((ksvc) => ksvc.metadata.name === knService.metadata.name)
.length > 0;
if (name === brokerName) {
tData.triggers = [...tData.triggers, trigger];
tData.ksservices =
Expand Down Expand Up @@ -796,7 +797,7 @@ export const getTriggerTopologyEdgeItems = (broker: K8sResourceKind, resources):
_.forEach(triggers?.data, (trigger) => {
const brokerName = trigger?.spec?.broker;
const connectedService = trigger.spec?.subscriber?.ref?.name;
if (name === brokerName && ksservices) {
if (name === brokerName && ksservices?.data.length > 0) {
const knativeService = _.find(ksservices.data as K8sResourceKind[], {
metadata: { name: connectedService },
});
Expand Down Expand Up @@ -837,10 +838,10 @@ export const getSubscriptionTopologyEdgeItems = (
const edges = [];
_.forEach(eventingsubscription?.data, (subRes) => {
const channelData = subRes?.spec?.channel;
if (name === channelData?.name && kind === channelData?.kind && ksservices) {
if (name === channelData?.name && kind === channelData?.kind && ksservices?.data.length > 0) {
const svcData = subRes?.spec?.subscriber?.ref;
svcData &&
_.forEach(ksservices?.data, (res) => {
_.forEach(ksservices.data, (res) => {
const {
metadata: { uid: resUid, name: resName },
} = res;
Expand Down

0 comments on commit 726844f

Please sign in to comment.