@riil-frontend/component-topology 12.1.2 → 13.0.0-dev.10

package/es/networkTopo/services/topo/basic.js

@@ -1,7 +1,5 @@
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
-var _excluded = ["groups", "resources"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { request } from '@riil-frontend/component-topology-utils';
 import { rlog } from '@riil-frontend/component-topology-utils';
@@ -9,6 +7,7 @@ import blackList from "./blacklist";
 import { TOPO_API_ROOT } from "./constants";
 import { getBatchCi as _getBatchCi, getBatchCiMetric as _getBatchCiMetric } from "../model";
 import { processByConditionResult, processExitLink } from "../../utils/exitLinkUtil";
+import * as relateTopoDataUtil from "../../utils/relateTopoDataUtil";
 var API_ROOT = TOPO_API_ROOT;
 /**
  * 拓扑图（看做一个容器）的“父容器”ID
@@ -49,7 +48,7 @@ function prepareResourceParams(conditions, query) {
   return {
     dynamicCondition: dynamicCondition,
     fixedConditionIdList: (staticRes || []).filter(function (ciId) {
-      return !ciId.startsWith('ip:');
+      return !ciId.includes(':');
     }),
     linkIps: (staticRes || []).filter(function (ciId) {
       return ciId.startsWith('ip:');
@@ -98,7 +97,8 @@ function prepareGroupParams(modifiedGroups) {
     };
   }).filter(Boolean);
   return {
-    groups: groups
+    groups: groups,
+    relateTopoIdList: relateTopoDataUtil.getRelateTopoIdListFromConfig(modifiedGroups)
   };
 }
 
@@ -389,16 +389,20 @@ export default _extends({
 
           case 2:
             result = _context12.sent;
-            return _context12.abrupt("return", processExitLink(_extends({}, result, {
+            result = _extends({}, result, {
               nodes: (_result$nodes = result.nodes) !== null && _result$nodes !== void 0 ? _result$nodes : [],
               links: ((_result$links = result.links) !== null && _result$links !== void 0 ? _result$links : []).map(function (item) {
                 return _extends({}, item, {
                   ciType: 'network_link'
                 });
-              })
-            })));
+              }),
+              serialize: result.serialize ? JSON.parse(result.serialize) : undefined
+            });
+            result = relateTopoDataUtil.processBothTopoData(result);
+            result = processExitLink(result);
+            return _context12.abrupt("return", result);
 
-          case 4:
+          case 7:
           case "end":
             return _context12.stop();
         }
@@ -417,7 +421,7 @@ export default _extends({
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
       var _result$nodes2, _result$links2;
 
-      var data, obj, result;
+      var data, params, result;
       return _regeneratorRuntime.wrap(function _callee13$(_context13) {
         while (1) switch (_context13.prev = _context13.next) {
           case 0:
@@ -431,22 +435,28 @@ export default _extends({
               });
             }
 
-            obj = prepareGroupParams(data);
+            params = prepareGroupParams(data);
             _context13.next = 5;
-            return request.post(API_ROOT + "/structure/byCondition/" + id, _extends({}, obj));
+            return request.post(API_ROOT + "/structure/byCondition/" + id, params);
 
           case 5:
             result = _context13.sent;
-            return _context13.abrupt("return", processByConditionResult(_extends({}, result, {
+            result = _extends({}, result, {
               nodes: (_result$nodes2 = result.nodes) !== null && _result$nodes2 !== void 0 ? _result$nodes2 : [],
               links: ((_result$links2 = result.links) !== null && _result$links2 !== void 0 ? _result$links2 : []).map(function (item) {
                 return _extends({}, item, {
                   ciType: 'network_link'
                 });
               })
-            }), obj.groups));
+            });
+            result = relateTopoDataUtil.processByConditionTopoData({
+              data: result,
+              config: data
+            });
+            result = processByConditionResult(result, params.groups);
+            return _context13.abrupt("return", result);
 
-          case 7:
+          case 10:
           case "end":
             return _context13.stop();
         }
@@ -463,11 +473,11 @@ export default _extends({
   */
   bindResourceToTopo: function bindResourceToTopo(id, config) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14() {
-      var groups, resources, otherConfig, newGroups, obj;
+      var groups, resources, newGroups, obj;
       return _regeneratorRuntime.wrap(function _callee14$(_context14) {
         while (1) switch (_context14.prev = _context14.next) {
           case 0:
-            groups = config.groups, resources = config.resources, otherConfig = _objectWithoutPropertiesLoose(config, _excluded);
+            groups = config.groups, resources = config.resources;
             newGroups = Array.isArray(groups) ? groups : [];
 
             if (resources) {
@@ -481,7 +491,7 @@ export default _extends({
 
             obj = prepareGroupParams(newGroups);
             _context14.next = 6;
-            return request.post(API_ROOT + "/resource/" + id, _extends({}, otherConfig, obj));
+            return request.post(API_ROOT + "/resource/" + id, obj);
 
           case 6:
             return _context14.abrupt("return", _context14.sent);

package/es/networkTopo/utils/__tests__/relateTopoData.js

@@ -0,0 +1,205 @@
+// 二、子拓扑链路
+// - 资源-子拓扑资源
+// - 资源-子拓扑IP、Ping资源
+// - 子拓扑资源-IP、Ping资源
+// - 子拓扑资源-子拓扑资源
+// - 子拓扑资源-子拓扑IP、Ping资源
+export var topoLinks = [// 资源-子拓扑资源
+{
+  ciType: 'network_link',
+  "id": "00000000010decab",
+  "name": '资源、Ping资源-子拓扑资源',
+  "source": "00000000010de861",
+  'targetType': 'topo',
+  "target": "6",
+  "operation": "delete",
+  "interfaceSource": "00000000010de8da",
+  "interfaceTarget": "00000000010de973",
+  "attributes": {
+    "network_link.to_if_connect": "r926054146526674944",
+    "network_link.source_device_ipv4": "172.17.166.18",
+    "network_link.destination_ipv4": "172.17.166.20",
+    "network_link.work_mode": "single",
+    "support_templates": "m.ethernet_link",
+    "destination_id": "00000000010de973",
+    "rated_bandwidth": 1000,
+    "network_link.actual_bandwidth": 1000,
+    "source_type": "network.interface",
+    "network_link.connect_type": "phy",
+    "display_name": "资源-子拓扑资源",
+    "asset_status": "2",
+    "destination_type": "network.interface",
+    "network_link.network_category": "CAN",
+    "network_link.source_ipv4": "172.17.166.18",
+    "name": "资源-子拓扑资源",
+    "distance_outlet": 2147483647,
+    "network_link.is_crucial": false,
+    "source_id": "00000000010de8da",
+    "network_link.source_device_id": "00000000010de861",
+    "network_link.destination_device_id": "00000000010de864",
+    "network_link.destination_device_ipv4": "172.17.166.20"
+  },
+  "sourceCode": null,
+  "level": null,
+  "customType": null,
+  "manageStatus": 3
+}, // 资源-子拓扑IP、Ping资源
+{
+  ciType: 'network_link',
+  "id": "00000000019990f1",
+  "name": "资源-子拓扑IP",
+  "source": "00000000010de861",
+  'targetType': 'topo',
+  "target": "6",
+  "operation": "delete",
+  "interfaceSource": "00000000010de8b3",
+  "interfaceTarget": "",
+  "attributes": {
+    "network_link.source_device_ipv4": "172.17.166.18",
+    "network_link.destination_ipv4": "1.1.1.1",
+    "network_link.work_mode": "AandS",
+    "support_templates": "m.ethernet_link",
+    "rated_bandwidth": 100,
+    "network_link.actual_bandwidth": 100,
+    "source_type": "network.interface",
+    "network_link.connect_type": "phy",
+    "display_name": "资源-子拓扑IP",
+    "asset_status": "2",
+    "network_link_type": "2",
+    "destination_type": "ip",
+    "network_link.role": "master",
+    "network_link.network_category": "CAN",
+    "dcs": "331268969",
+    "network_link.source_ipv4": "172.17.166.18",
+    "name": "资源-子拓扑IP",
+    "distance_outlet": 2147483647,
+    "network_link.is_crucial": false,
+    "source_id": "00000000010de8b3",
+    "network_link.source_device_id": "00000000010de861",
+    "network_link.destination_device_ipv4": "1.1.1.1"
+  },
+  "sourceCode": null,
+  "level": null,
+  "customType": null,
+  "manageStatus": 3
+}, // 子拓扑资源-IP、Ping资源
+{
+  ciType: 'network_link',
+  "id": "0000000001999538",
+  "name": "IP-子拓扑资源",
+  'sourceType': 'topo',
+  "source": "6",
+  "target": "",
+  "operation": "delete",
+  "interfaceSource": "00000000010de95e",
+  "interfaceTarget": "",
+  "attributes": {
+    "network_link.source_device_ipv4": "172.17.166.20",
+    "network_link.destination_ipv4": "1.5.5.5",
+    "network_link.work_mode": "AandS",
+    "support_templates": "m.ethernet_link",
+    "rated_bandwidth": 1000,
+    "network_link.actual_bandwidth": 1000,
+    "source_type": "network.interface",
+    "network_link.connect_type": "phy",
+    "display_name": "IP-子拓扑资源",
+    "asset_status": "2",
+    "network_link_type": "2",
+    "destination_type": "ip",
+    "network_link.role": "master",
+    "network_link.network_category": "CAN",
+    "dcs": "331268969",
+    "network_link.source_ipv4": "172.17.166.20",
+    "name": "172.17.166.20(Gi 0/1) - 1.5.5.5",
+    "distance_outlet": 2147483647,
+    "network_link.is_crucial": false,
+    "source_id": "00000000010de95e",
+    "network_link.source_device_id": "00000000010de864",
+    "network_link.destination_device_ipv4": "1.5.5.5"
+  },
+  "sourceCode": null,
+  "level": null,
+  "customType": null,
+  "manageStatus": 3
+}, // 子拓扑资源-子拓扑资源
+{
+  ciType: 'network_link',
+  "id": "0000000001899476",
+  "name": '子拓扑资源-子拓扑资源',
+  'sourceType': 'topo',
+  "source": "3",
+  'targetType': 'topo',
+  "target": "6",
+  "operation": "delete",
+  "interfaceSource": "00000000010de90e",
+  "interfaceTarget": "00000000010de973",
+  "attributes": {
+    "network_link.to_if_connect": "r933757920628178944",
+    "network_link.source_device_ipv4": "172.17.166.19",
+    "network_link.destination_ipv4": "172.17.166.20",
+    "network_link.work_mode": "single",
+    "support_templates": "m.ethernet_link",
+    "destination_id": "00000000010de973",
+    "rated_bandwidth": 1000,
+    "network_link.actual_bandwidth": 1000,
+    "source_type": "network.interface",
+    "network_link.connect_type": "phy",
+    "display_name": "子拓扑资源-子拓扑资源",
+    "asset_status": "2",
+    "network_link_type": "2",
+    "destination_type": "network.interface",
+    "network_link.network_category": "CAN",
+    "network_link.source_ipv4": "172.17.166.19",
+    "name": "172.17.166.19(Gi 0/50) - 172.17.166.20(Gi 0/22)",
+    "distance_outlet": 2147483647,
+    "network_link.is_crucial": false,
+    "source_id": "00000000010de90e",
+    "network_link.source_device_id": "00000000010de862",
+    "network_link.destination_device_id": "00000000010de864",
+    "network_link.destination_device_ipv4": "172.17.166.20"
+  },
+  "sourceCode": null,
+  "level": null,
+  "customType": null,
+  "manageStatus": 3
+}, // 子拓扑资源-子拓扑IP、Ping资源
+{
+  ciType: 'network_link',
+  "id": "0000000001999c86",
+  "name": "子拓扑资源-子拓扑IP",
+  'sourceType': 'topo',
+  "source": "3",
+  'targetType': 'topo',
+  "target": "6",
+  "operation": "delete",
+  "interfaceSource": "00000000010de95e",
+  "interfaceTarget": "",
+  "attributes": {
+    "network_link.source_device_ipv4": "172.17.166.20",
+    "network_link.destination_ipv4": "2.2.2.2",
+    "network_link.work_mode": "AandS",
+    "support_templates": "m.ethernet_link",
+    "rated_bandwidth": 1000,
+    "network_link.actual_bandwidth": 1000,
+    "source_type": "network.interface",
+    "network_link.connect_type": "phy",
+    "display_name": "子拓扑资源-子拓扑IP",
+    "asset_status": "2",
+    "network_link_type": "2",
+    "destination_type": "ip",
+    "network_link.role": "master",
+    "network_link.network_category": "CAN",
+    "dcs": "331268969",
+    "network_link.source_ipv4": "172.17.166.20",
+    "name": "172.17.166.20(Gi 0/1) - 2.2.2.2",
+    "distance_outlet": 2147483647,
+    "network_link.is_crucial": false,
+    "source_id": "00000000010de95e",
+    "network_link.source_device_id": "00000000010de864",
+    "network_link.destination_device_ipv4": "2.2.2.2"
+  },
+  "sourceCode": null,
+  "level": null,
+  "customType": null,
+  "manageStatus": 3
+}];

package/es/networkTopo/utils/exitLinkUtil.js

@@ -36,11 +36,11 @@ export function buildIpNode(ip) {
 }
 
 function getHtSerialize(serialize) {
-  if (serialize) {
+  if (serialize && typeof serialize === 'string') {
     return JSON.parse(serialize);
   }
 
-  return null;
+  return serialize;
 }
 
 function isExitLink(link) {

package/es/networkTopo/utils/relateTopoDataUtil.js

@@ -0,0 +1,149 @@
+import _extends from "@babel/runtime/helpers/extends";
+// 关联拓扑数据
+import { topoLinks } from "./__tests__/relateTopoData";
+/**
+ * 升级历史数据：子拓扑节点序列化数据
+ * 构造子拓扑节点
+ * 构造子拓扑链路
+ * @param {*} ctx 
+ */
+
+export function processBothTopoData(topoData) {
+  var nodes = topoData.nodes,
+      links = topoData.links;
+  var serialize = upgradeSerializeOldTopoNode(topoData.serialize);
+  return _extends({}, topoData, {
+    nodes: [].concat(nodes, buildTopoNodeDatasFromSerialize(serialize)),
+    links: buildTopoLinks(links),
+    serialize: serialize
+  });
+}
+/**
+ * 构造子拓扑节点
+ * 构造子拓扑链路
+ * @param {*} ctx 
+ */
+
+export function processByConditionTopoData(ctx) {
+  var data = ctx.data,
+      config = ctx.config;
+  var nodes = data.nodes,
+      links = data.links;
+  return _extends({}, data, {
+    nodes: [].concat(nodes, buildTopoNodeDatas(config)),
+    links: buildTopoLinks(links)
+  });
+}
+export function getRelateTopoIdListFromConfig(groups) {
+  var relateTopoIdList = [];
+  groups.forEach(function (g) {
+    g.resources["static"].filter(function (ciId) {
+      return ciId.startsWith('topo:');
+    }).map(function (ciId) {
+      return ciId.replace('topo:', '');
+    }).map(function (topoId) {
+      if (!relateTopoIdList.includes(topoId)) {
+        relateTopoIdList.push(topoId);
+      }
+    });
+  });
+  return relateTopoIdList;
+}
+export function buildTopoNode(topoId) {
+  return {
+    id: "topo:" + topoId,
+    //   name: ,
+    bindType: "topo",
+    // 绑定资源类型。关联资源 值为空，关联IP ip
+    bindIp: topoId,
+    // TODO 所属区域，从序列化拿
+    // 'groupId': null,
+    // 'groupTag': null,
+    // 'attributes': [],
+    // 'metrics': [],
+    type: "node",
+    isbinding: true,
+    // 'dtype': 'device'
+    operation: "delete"
+  };
+}
+
+function buildTopoLinks(links) {
+  if (process.env.NODE_ENV !== 'production') {
+    links.push.apply(links, topoLinks);
+  }
+
+  return links.map(function (link) {
+    return _extends({}, link, {
+      "source": link.sourceType ? link.sourceType + ':' + link.source : link.source,
+      "target": link.targetType ? link.targetType + ':' + link.target : link.target
+    });
+  });
+}
+/**
+ * 升级历史数据：子拓扑节点序列化数据
+ * @param {*} serialize 
+ */
+
+
+function upgradeSerializeOldTopoNode(serialize) {
+  if (serialize) {
+    var isOldTopoNode = function isOldTopoNode(ele) {
+      return isTopoNode(ele) && !ele.p.tag;
+    };
+
+    var oldTopoNodes = serialize.d.filter(isOldTopoNode);
+    oldTopoNodes.forEach(function (node) {
+      var _node$a;
+
+      var topoId = (_node$a = node.a) === null || _node$a === void 0 ? void 0 : _node$a.bindTopo;
+      node.a = _extends({}, node.a, buildTopoNode(topoId));
+      node.p.tag = "topo:" + topoId;
+    });
+  }
+
+  return serialize;
+}
+
+function isTopoNode(ele) {
+  var _ele$a;
+
+  return !!((_ele$a = ele.a) !== null && _ele$a !== void 0 && _ele$a.bindTopo);
+}
+
+function buildTopoNodeDatasFromSerialize(serialize) {
+  if (!serialize) {
+    return [];
+  }
+
+  var topoNodes = serialize.d.filter(isTopoNode);
+  var topoNodeDatas = topoNodes.map(function (node) {
+    var _node$a2;
+
+    var topoId = (_node$a2 = node.a) === null || _node$a2 === void 0 ? void 0 : _node$a2.bindTopo;
+    return buildTopoNode(topoId);
+  });
+  return topoNodeDatas;
+}
+
+function buildTopoNodeDatas(config) {
+  var topoNodeDatas = [];
+  config.forEach(function (g) {
+    g.resources["static"].filter(function (ciId) {
+      return ciId.startsWith('topo:');
+    }).map(function (ciId) {
+      return ciId.replace('topo:', '');
+    }).map(function (topoId) {
+      topoNodeDatas.push(_extends({}, buildTopoNode(topoId), {
+        // 添加资源拓扑节点消失的问题
+        'groupId': g.id,
+        'groupTag': g.tag
+      }));
+    });
+  });
+  return topoNodeDatas;
+}
+
+function getRelateTopoIdsFromSerialize(serialize) {
+  return serialize;
+}

package/es/utils/ResourceConfigUtil.js

@@ -41,23 +41,8 @@ function getResourceConfigFromHt(topo) {
   return {
     layers: sortBy(layers, 'order'),
     groups: groups,
-    resources: resources,
-    relateTopoIdList: getRelateTopoIdList(dataModel)
+    resources: resources
   };
-} // 查询关联拓扑id列表
-
-
-function getRelateTopoIdList(dataModel) {
-  return getNodes(dataModel).reduce(function (topoIds, node) {
-    var bindType = node.a('bindType');
-    var bindTopo = node.a('bindTopo');
-
-    if (bindType === 'topo' && bindTopo && !topoIds.includes(bindTopo)) {
-      return [].concat(topoIds, [bindTopo]);
-    }
-
-    return topoIds;
-  }, []);
 }
 
 function getLayerDatas(dataModel) {