Skip to content

feat(topology filter): added filter for knative event sources #3774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jan 11, 2020
Merged

feat(topology filter): added filter for knative event sources #3774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 38 additions & 5 deletions frontend/packages/dev-console/src/components/topology/__tests__/topology-utils.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import {
getTopologyResourceObject,
createTopologyResourceConnection,
} from '../topology-utils';
import { DEFAULT_TOPOLOGY_FILTERS } from '../redux/const';
import { TopologyFilters } from '../filters/filter-utils';
import {
resources,
topologyData,
Expand All @@ -30,12 +32,16 @@ export function getTranformedTopologyData(
mockData: TopologyDataResources,
transformByProp: string[],
mockCheURL?: string,
filters?: TopologyFilters,
) {
const result = transformTopologyData(mockData, transformByProp, undefined, mockCheURL, [
getKnativeServingRevisions,
getKnativeServingConfigurations,
getKnativeServingRoutes,
]);
const result = transformTopologyData(
mockData,
transformByProp,
undefined,
mockCheURL,
[getKnativeServingRevisions, getKnativeServingConfigurations, getKnativeServingRoutes],
filters,
);
const topologyTransformedData = result.topology;
const graphData = result.graph;
return { topologyTransformedData, graphData, keys: Object.keys(topologyTransformedData) };
Expand Down Expand Up @@ -266,6 +272,33 @@ describe('TopologyUtils ', () => {
]);
expect((topologyTransformedData[keys[2]].data as WorkloadData).builderImage).toBe(csvIcon);
});

it('should not render event sources if corresponding filter returns false', () => {
const eventFilter: TopologyFilters = _.set(
_.cloneDeep(DEFAULT_TOPOLOGY_FILTERS),
'display.eventSources',
false,
);
const { topologyTransformedData } = getTranformedTopologyData(
MockKnativeResources,
[],
'',
eventFilter,
);
expect(topologyTransformedData['1317f615-9636-11e9-b134-06a61d886b689']).toBe(undefined);
});
it('should render event sources if corresponding filter returns true', () => {
const eventFilter: TopologyFilters = _.cloneDeep(DEFAULT_TOPOLOGY_FILTERS);
const { topologyTransformedData } = getTranformedTopologyData(
MockKnativeResources,
[],
'',
eventFilter,
);
expect(topologyTransformedData['1317f615-9636-11e9-b134-06a61d886b689'].type).toBe(
'event-source',
);
});
});

describe('Topology Utils', () => {
Expand Down
3 changes: 2 additions & 1 deletion frontend/packages/dev-console/src/components/topology/topology-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,8 @@ export const transformTopologyData = (

const knSvcResources: K8sResourceKind[] = _.get(resources, ['ksservices', 'data'], []);
knSvcResources.length && getKnativeTopologyData(knSvcResources, NodeType.KnService);
const knEventSources: K8sResourceKind[] = getKnativeEventSources();
const knEventSources: K8sResourceKind[] =
filters && filters.display.eventSources ? getKnativeEventSources() : [];
knEventSources.length && getKnativeTopologyData(knEventSources, NodeType.EventSource);
const knRevResources: K8sResourceKind[] = _.get(resources, ['revisions', 'data'], []);
knRevResources.length && getKnativeTopologyData(knRevResources, NodeType.Revision);
Expand Down