forked from openshift/console
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
moved bindableNode to topology package and used named exports for utils
- Loading branch information
1 parent
50523ea
commit 0e87444
Showing
9 changed files
with
123 additions
and
181 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
128 changes: 0 additions & 128 deletions
128
frontend/packages/dev-console/src/components/topology/dev-console-data-transformer.ts
This file was deleted.
Oops, something went wrong.
3 changes: 1 addition & 2 deletions
3
frontend/packages/dev-console/src/components/topology/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
129 changes: 112 additions & 17 deletions
129
frontend/packages/rhoas-plugin/src/topology/rhoas-data-transformer.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,129 @@ | ||
| import { Model } from '@patternfly/react-topology'; | ||
| import { EdgeModel, Model, NodeModel } from '@patternfly/react-topology'; | ||
| import { K8sResourceKind, apiVersionForModel } from '@console/internal/module/k8s'; | ||
| import { ClusterServiceVersionKind } from '@console/operator-lifecycle-manager/src/types'; | ||
| import { | ||
| getBindableServiceBindingEdges, | ||
| getTopologyBindableNode, | ||
| } from '@console/dev-console/src/components/topology/dev-console-data-transformer'; | ||
| import { K8sResourceKind } from '@console/internal/module/k8s'; | ||
| import { TopologyDataResources } from '@console/topology/src/topology-types'; | ||
| import { TYPE_MANAGED_KAFKA_CONNECTION } from './components/const'; | ||
|
|
||
| const getRhoasTopologyDataModel = ( | ||
| getDefaultOperatorIcon, | ||
| getImageForCSVIcon, | ||
| getOperatorBackedServiceKindMap, | ||
| OverviewItem, | ||
| } from '@console/shared/src'; | ||
| import { TYPE_SERVICE_BINDING } from '@console/topology/src/const'; | ||
| import { getTopologyNodeItem } from '@console/topology/src/data-transforms/transform-utils'; | ||
| import { edgesFromServiceBinding } from '@console/topology/src/operators/operators-data-transformer'; | ||
| import { TopologyDataObject, TopologyDataResources } from '@console/topology/src/topology-types'; | ||
| import { KafkaConnectionModel } from '../models'; | ||
| import { | ||
| KAFKA_WIDTH, | ||
| KAFKA_HEIGHT, | ||
| KAFKA_PADDING, | ||
| TYPE_MANAGED_KAFKA_CONNECTION, | ||
| } from './components/const'; | ||
|
|
||
| const KAFKA_PROPS = { | ||
| width: KAFKA_WIDTH, | ||
| height: KAFKA_HEIGHT, | ||
| group: false, | ||
| visible: true, | ||
| style: { | ||
| padding: KAFKA_PADDING, | ||
| }, | ||
| }; | ||
|
|
||
| export const createOverviewItem = (obj: K8sResourceKind): OverviewItem<K8sResourceKind> => { | ||
| if (!obj.apiVersion) { | ||
| obj.apiVersion = apiVersionForModel(KafkaConnectionModel); | ||
| } | ||
| if (!obj.kind) { | ||
| obj.kind = KafkaConnectionModel.kind; | ||
| } | ||
|
|
||
| return { | ||
| isOperatorBackedService: true, | ||
| obj, | ||
| }; | ||
| }; | ||
|
|
||
| export const getTopologyRhoasNodes = ( | ||
| kafkaConnections: K8sResourceKind[], | ||
| resources: TopologyDataResources, | ||
| ): NodeModel[] => { | ||
| const nodes = []; | ||
| for (const obj of kafkaConnections) { | ||
| const resKindMap = getOperatorBackedServiceKindMap( | ||
| resources?.clusterServiceVersions?.data as ClusterServiceVersionKind[], | ||
| ); | ||
| const csvData = resKindMap?.[obj.kind]; | ||
| const data: TopologyDataObject = { | ||
| id: obj.metadata.uid, | ||
| name: obj.metadata.name, | ||
| type: TYPE_MANAGED_KAFKA_CONNECTION, | ||
| resource: obj, | ||
| // resources is poorly named, should be overviewItem, eventually going away. | ||
| resources: createOverviewItem(obj), | ||
| data: { | ||
| resource: obj, | ||
| icon: getImageForCSVIcon(csvData?.spec?.icon?.[0]) || getDefaultOperatorIcon(), | ||
| }, | ||
| }; | ||
| nodes.push(getTopologyNodeItem(obj, TYPE_MANAGED_KAFKA_CONNECTION, data, KAFKA_PROPS)); | ||
| } | ||
|
|
||
| return nodes; | ||
| }; | ||
|
|
||
| export const getRhoasServiceBindingEdges = ( | ||
| dc: K8sResourceKind, | ||
| rhoasNodes: NodeModel[], | ||
| sbrs: K8sResourceKind[], | ||
| ): EdgeModel[] => { | ||
| const edges = []; | ||
| if (!sbrs?.length || !rhoasNodes?.length) { | ||
| return edges; | ||
| } | ||
|
|
||
| edgesFromServiceBinding(dc, sbrs).forEach((sbr) => { | ||
| sbr.spec.services?.forEach((bss) => { | ||
| if (bss) { | ||
| const targetNode = rhoasNodes.find( | ||
| (node) => | ||
| node.data.resource.kind === bss.kind && node.data.resource.metadata.name === bss.name, | ||
| ); | ||
| if (targetNode) { | ||
| const target = targetNode.data.resource.metadata.uid; | ||
| const source = dc.metadata.uid; | ||
| if (source && target) { | ||
| edges.push({ | ||
| id: `${source}_${target}`, | ||
| type: TYPE_SERVICE_BINDING, | ||
| source, | ||
| target, | ||
| resource: sbr, | ||
| data: { sbr }, | ||
| }); | ||
| } | ||
| } | ||
| } | ||
| }); | ||
| }); | ||
|
|
||
| return edges; | ||
| }; | ||
| export const getRhoasTopologyDataModel = ( | ||
| namespace: string, | ||
| resources: TopologyDataResources, | ||
| workloads: K8sResourceKind[], | ||
| ): Promise<Model> => { | ||
| const serviceBindingRequests = resources?.serviceBindingRequests?.data; | ||
| const rhoasDataModel: Model = { | ||
| nodes: getTopologyBindableNode( | ||
| resources.kafkaConnections.data, | ||
| TYPE_MANAGED_KAFKA_CONNECTION, | ||
| resources, | ||
| ), | ||
| nodes: getTopologyRhoasNodes(resources.kafkaConnections.data, resources), | ||
| edges: [], | ||
| }; | ||
| if (rhoasDataModel.nodes?.length) { | ||
| workloads.forEach((dc) => { | ||
| rhoasDataModel.edges.push( | ||
| ...getBindableServiceBindingEdges(dc, rhoasDataModel.nodes, serviceBindingRequests), | ||
| ...getRhoasServiceBindingEdges(dc, rhoasDataModel.nodes, serviceBindingRequests), | ||
| ); | ||
| }); | ||
| } | ||
| return Promise.resolve(rhoasDataModel); | ||
| }; | ||
|
|
||
| export default getRhoasTopologyDataModel; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters