@riil-frontend/component-topology 5.0.0-alpha.9 → 5.0.2

package/es/networkTopo/utils/__tests__/resourcePermissionUtil.test.js

@@ -0,0 +1,135 @@
+import { getLinkPermission } from "../resourcePermissionUtil";
+
+function test(data) {
+  var message = data.message,
+      expected = data.expected,
+      link = data.link,
+      source = data.source,
+      target = data.target;
+  var result = getLinkPermission(link, source, target);
+
+  if (JSON.stringify(result) !== JSON.stringify(expected)) {
+    console.error(message, '失败', {
+      result: result,
+      expected: expected,
+      data: {
+        link: link,
+        source: source,
+        target: target
+      }
+    });
+  } else {
+    console.debug(message, '通过');
+  }
+}
+
+var exitLink = {
+  attributes: {
+    'network_link.is_crucial': false
+  }
+};
+var commonLink = {
+  attributes: {
+    'network_link.is_crucial': false,
+    'network_link.destination_device_id': 'xxx'
+  }
+};
+var data = [{
+  message: '[链路权限]出口链路源设备有write权限',
+  link: exitLink,
+  source: {
+    operation: 'write'
+  },
+  target: null,
+  expected: {
+    readable: true,
+    writeable: true,
+    deleteable: true
+  }
+}, {
+  message: '[链路权限]出口链路源设备无权限',
+  link: exitLink,
+  source: {
+    operation: null
+  },
+  target: null,
+  expected: {
+    readable: false,
+    writeable: false,
+    deleteable: false
+  }
+}, {
+  message: '[链路权限]普通链路源设备无权限',
+  link: commonLink,
+  source: {
+    operation: null
+  },
+  target: {
+    operation: null
+  },
+  expected: {
+    readable: false,
+    writeable: false,
+    deleteable: false
+  }
+}, {
+  message: '[链路权限]普通链路源设备一端write权限',
+  link: commonLink,
+  source: {
+    operation: 'write'
+  },
+  target: {
+    operation: null
+  },
+  expected: {
+    readable: true,
+    writeable: false,
+    deleteable: true
+  }
+}, {
+  message: '[链路权限]普通链路源设备一端delete权限',
+  link: commonLink,
+  source: {
+    operation: 'delete'
+  },
+  target: {
+    operation: null
+  },
+  expected: {
+    readable: true,
+    writeable: false,
+    deleteable: true
+  }
+}, {
+  message: '[链路权限]普通链路源设备2端write权限',
+  link: commonLink,
+  source: {
+    operation: 'write'
+  },
+  target: {
+    operation: 'write'
+  },
+  expected: {
+    readable: true,
+    writeable: true,
+    deleteable: true
+  }
+}, {
+  message: '[链路权限]关键链路权限',
+  link: {
+    attributes: {
+      'network_link.is_crucial': true
+    },
+    operation: 'write'
+  },
+  source: {},
+  target: {},
+  expected: {
+    readable: true,
+    writeable: true,
+    deleteable: false
+  }
+}];
+data.forEach(function (item) {
+  test(item);
+});

package/es/networkTopo/utils/resourcePermissionUtil.js

@@ -1,4 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
+import { isCrucialLink } from "../../core/models/utils/linkUtils";
 export function getNodePermission(node) {
   return parseBasicPermission(node === null || node === void 0 ? void 0 : node.operation);
 }
@@ -19,22 +20,25 @@ export function parseBasicPermission(operation) {
  */
 
 export function getLinkPermission(link, source, target) {
-  var linkType = link.attributes['network_link.connect_type']; // 出口链路使用权限中心配置
-
-  if (linkType === 'exit') {
+  // 关键链路使用权限中心配置
+  if (isCrucialLink(link)) {
     return parseBasicPermission(link === null || link === void 0 ? void 0 : link.operation);
   }
 
+  var deviceNodes = target ? [source, target] : [source];
+
   var isWriteable = function isWriteable() {
-    return [source, target].filter(function (node) {
+    return deviceNodes.filter(function (node) {
       return ['write', 'delete'].indexOf(node === null || node === void 0 ? void 0 : node.operation) !== -1;
-    }).length === 2;
+    }).length === deviceNodes.length;
   };
 
   return {
     readable: !!(source !== null && source !== void 0 && source.operation) || !!(target !== null && target !== void 0 && target.operation),
+    // 一端设备有权限可查看
     writeable: isWriteable(),
-    deleteable: [source, target].filter(function (node) {
+    // 两端设备都有编辑权限可编辑（出口链路仅验证一端）
+    deleteable: deviceNodes.filter(function (node) {
       return ['write', 'delete'].includes(node === null || node === void 0 ? void 0 : node.operation);
     }).length >= 1
   };

package/es/style.js

@@ -1,6 +1,7 @@
 import '@riil-frontend/component-topology-graph/es/style';
 import '@alifd/next/es/message/style';
 import '@alifd/next/es/dialog/style';
+import '@riil-frontend/component-topology-utils/es/style';
 import '@riil-frontend/utils/es/style';
 import '@alifd/next/es/upload/style';
 import '@alifd/next/es/icon/style';
@@ -11,7 +12,6 @@ import '@alifd/next/es/form/style';
 import '@alifd/next/es/loading/style';
 import '@alifd/next/es/drawer/style';
 import '@alifd/next/es/button/style';
-import '@riil-frontend/component-topology-utils/es/style';
 import '@riil-frontend/component-common-res-list/es/style';
 import '@riil-frontend/component-no-data-page/es/style';
 import '@alifd/next/es/tab/style';
@@ -24,6 +24,7 @@ import '@alifd/next/es/divider/style';
 
 import '@alifd/next/es/overlay/style';
 import '@alifd/next/es/checkbox/style';
+import '@riil-frontend/component-crucial-link-topo/es/style';
 import '@alifd/next/es/box/style';
 import '@alifd/next/es/list/style';
 import '@alifd/next/es/card/style';

package/es/utils/ResourceConfigUtil.js

@@ -1,5 +1,6 @@
-import rlog from "@riil-frontend/component-topology-utils/es/rlog";
-import sortBy from "lodash/sortBy";
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import sortBy from 'lodash/sortBy';
+import { isExitLink } from "../core/models/utils/linkUtils";
 import { isClusterHtElement } from "./clusterUtil";
 import { getGroupChildrenResourceElements, getLayerChildrenResourceElements } from "./htElementDataUtil";
 import { getEdges, getGroups, getLayers, getNodes } from "./htElementUtils";
@@ -14,34 +15,19 @@ function getResourceConfigFromHt(topo) {
   var htTopo = topo.getHtTopo();
   var dataModel = topo.getDataModel(); // 获得分层
 
-  var layerElements = getLayers(dataModel);
-  var layers = layerElements.map(function (layerElement) {
-    return {
-      id: layerElement.getTag(),
-      tag: layerElement.a("tag"),
-      name: layerElement.s("label"),
-      order: layerElement.a("order"),
-      resources: {
-        "static": getLayerChildrenResourceElements(layerElement).map(function (node) {
-          return node.getTag();
-        })
-      }
-    };
-  }); // 获得容器
+  var layers = getLayerDatas(dataModel); // 获得容器
 
   var groupElements = getGroups(dataModel); // 获得视图上的区域配置
 
-  var groups = groupElements.filter(function (node) {
-    return !node.getParent();
-  }).filter(function (groupElement) {
-    return !isClusterHtElement(groupElement);
-  }).map(getGroupConfigByElement);
-  groups = sortBy([].concat(layers, groups), "order"); // 获得视图上的资源列表
+  var groups = getGroupDatas({
+    groupElements: groupElements,
+    layers: layers
+  }); // 获得视图上的资源列表
 
   var viewNodes = getNodes(dataModel).filter(function (node) {
     return !node.getParent();
   }).filter(function (node) {
-    return node.a("type") === "node";
+    return node.a('type') === 'node';
   }).filter(function (node) {
     return !!node.getTag();
   });
@@ -52,14 +38,43 @@ function getResourceConfigFromHt(topo) {
     "static": [].concat(viewNodes, viewClusters).map(function (node) {
       return node.getTag();
     })
-  }; // console.error('getResourceConfigFromHt', {
-  //   viewNodes,
-  // });
-  // 查询出口链路列表
+  };
+  return {
+    layers: sortBy(layers, 'order'),
+    groups: groups,
+    resources: resources,
+    exportLinkIdList: getExportLinkIdList({
+      topo: topo,
+      htTopo: htTopo,
+      dataModel: dataModel
+    }),
+    // 出口链路id列表
+    relateTopoIdList: getRelateTopoIdList(dataModel)
+  };
+} // 查询关联拓扑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 getExportLinkIdList(_ref) {
+  var topo = _ref.topo,
+      htTopo = _ref.htTopo,
+      dataModel = _ref.dataModel;
   var exportLinkIdList = [];
   var edges = getEdges(dataModel);
-  rlog.debug(" 查询出口链路列表-edges", edges, dataModel);
+  rlog.debug(' 查询出口链路列表-edges', edges, dataModel);
   edges.forEach(function (edge) {
     var edgeData = htTopo.getEdgeData(edge); // 有组无子连线返回null
 
@@ -69,29 +84,54 @@ function getResourceConfigFromHt(topo) {
 
       if (id) {
         var linkData = topo.dataModel.getDataById(id);
-        var connectType = linkData !== null && linkData !== void 0 && linkData.attributes ? linkData === null || linkData === void 0 ? void 0 : linkData.attributes["network_link.connect_type"] : undefined;
 
-        if (connectType === "exit" && !exportLinkIdList.includes(id)) {
+        if (isExitLink(linkData) && !exportLinkIdList.includes(id)) {
           exportLinkIdList.push(id);
         }
       }
     }
   });
-  return {
-    layers: sortBy(layers, "order"),
-    groups: groups,
-    resources: resources,
-    exportLinkIdList: exportLinkIdList // 出口链路id列表
+  return exportLinkIdList;
+}
 
-  };
+function getLayerDatas(dataModel) {
+  // 获得分层
+  var layerElements = getLayers(dataModel);
+  var layers = layerElements.map(function (layerElement) {
+    return {
+      id: layerElement.getTag(),
+      tag: layerElement.a('tag'),
+      name: layerElement.s('label'),
+      order: layerElement.a('order'),
+      resources: {
+        "static": getLayerChildrenResourceElements(layerElement).map(function (node) {
+          return node.getTag();
+        })
+      }
+    };
+  });
+  return layers;
+}
+
+function getGroupDatas(_ref2) {
+  var groupElements = _ref2.groupElements,
+      layers = _ref2.layers;
+  // 获得视图上的区域配置
+  var groups = groupElements.filter(function (node) {
+    return !node.getParent();
+  }).filter(function (groupElement) {
+    return !isClusterHtElement(groupElement);
+  }).map(getGroupConfigByElement);
+  groups = sortBy([].concat(layers, groups), 'order');
+  return groups;
 }
 
 function getGroupConfigByElement(groupElement) {
   return {
     id: groupElement.getTag(),
-    tag: groupElement.a("tag"),
-    name: groupElement.a("name"),
-    order: groupElement.a("order"),
+    tag: groupElement.a('tag'),
+    name: groupElement.a('name'),
+    order: groupElement.a('order'),
     resources: {
       "static": getGroupChildrenResourceElements(groupElement).filter(function (node) {
         return !!node.getTag();

package/es/utils/clusterUtil.js

@@ -116,7 +116,7 @@ export function upgradeV103GraphClusterNode(topo, topoData) {
       return;
     }
 
-    rlog.error('集群1.0.2升级', unExistedList);
+    rlog.info('集群1.0.2升级', unExistedList);
     var groups = unExistedList.filter(function (item) {
       return item.type === 'group';
     });

package/es/utils/htElementUtils.js

@@ -343,6 +343,5 @@ export function isExistedElement(htTopo, dataModel, data) {
     }
   }
 
-  console.error(111, data);
   return false;
 }

package/es/utils/topoData.js

@@ -138,20 +138,25 @@ export function getCiTypes(topoData) {
   var allCi = [].concat(topoData.nodes, topoData.links, topoData.linkGroups);
   return getCiTypesFromCiElements(allCi);
 }
-export function getAlarmSwitch(topoData) {
-  var _topoData$global;
-
-  var alarmSwitch = true;
+/**
+ * 获得监控模板code列表
+ * @param {*} cis 
+ * @returns 
+ */
 
-  if (topoData !== null && topoData !== void 0 && topoData.global) {
-    alarmSwitch = topoData.global.alarmSwitch;
-  }
+export function getMonitorTemplateCodes(cis) {
+  var codes = [];
+  cis.forEach(function (element) {
+    var _element$attributes;
 
-  if (topoData !== null && topoData !== void 0 && (_topoData$global = topoData.global) !== null && _topoData$global !== void 0 && _topoData$global.topoDisplayConfig) {
-    alarmSwitch = topoData.global.topoDisplayConfig.alarmSwitch;
-  }
+    // eslint-disable-next-line camelcase
+    var code = (_element$attributes = element.attributes) === null || _element$attributes === void 0 ? void 0 : _element$attributes.support_templates;
 
-  return alarmSwitch;
+    if (code && codes.indexOf(code) < 0) {
+      codes.push(code);
+    }
+  });
+  return codes;
 }
 /**
  * 过滤ci元数据中的属性和指标，用于属性和指标显示设置
@@ -470,21 +475,13 @@ export function getCiModSet(params) {
       globalConfig = params.globalConfig; // 当前拓扑资源字典
 
   var ciDoc = {};
-  var ciTypesDoc = {}; //
-
-  var bindingCiSet = {};
+  var ciTypesDoc = {};
   var allCiModSet = getNodeModSet();
-  var allLinkModSet = getLinkModSet();
 
   function getNodeModSet() {
     var ciTypes = getCiTypesFromCiElements(data.nodes);
     return getModSet(ciTypes);
   }
-
-  function getLinkModSet() {
-    var ciTypes = getCiTypesFromCiElements([].concat(data.links, data.linkGroups));
-    return getModSet(ciTypes);
-  }
   /**
    *
    * @param {array} ciTypeCodes
@@ -498,43 +495,12 @@ export function getCiModSet(params) {
       return ciTypeCodes.includes(item);
     }).forEach(function (key) {
       var ciTypeObj = ciTypeMap[key];
-
-      if (key === "network_link") {
-        var linkKeyArr = [{
-          code: "phy",
-          key: "phy",
-          name: "物理链路"
-        }, {
-          code: "agg",
-          key: "agg",
-          name: "聚合链路"
-        }, {
-          code: "exit",
-          key: "exit",
-          name: "出口链路"
-        }];
-        linkKeyArr.map(function (link, index) {
-          ciTypeObj = engine.ciTyeCache.getNetworkLinkCiType(link.key);
-
-          if (ciTypeObj) {
-            modSet[link.code] = {
-              name: link.name,
-              code: link.code,
-              icon: ciTypeObj.icon,
-              list: ciModfilter(ciTypeObj, globalConfig, "link", link.code)
-            };
-          }
-
-          return link.code;
-        });
-      } else {
-        modSet[key] = {
-          name: ciTypeObj.displayName,
-          code: ciTypeObj.code,
-          icon: ciTypeObj.icon,
-          list: ciModfilter(ciTypeObj, globalConfig, "node", ciTypeObj.code)
-        };
-      }
+      modSet[key] = {
+        name: ciTypeObj.displayName,
+        code: ciTypeObj.code,
+        icon: ciTypeObj.icon,
+        list: ciModfilter(ciTypeObj, globalConfig, "node", ciTypeObj.code)
+      };
     });
     console.log("modSet--------------------", modSet);
     return modSet;
@@ -549,7 +515,6 @@ export function getCiModSet(params) {
         tag: [],
         tip: []
       };
-      bindingCiSet[ciType] = bindingCiSet[ciType] || {};
       ciTypesDoc[ciType] = ciTypesDoc[ciType] || [];
       ciTypesDoc[element.ciType].push({
         ciId: element.id
@@ -562,11 +527,7 @@ export function getCiModSet(params) {
     // ci信息集合
     ciTypesDoc: ciTypesDoc,
     // 每种ci含有的ci
-    bindingCiSet: bindingCiSet,
-    // 可能没用了
-    allCiModSet: allCiModSet,
-    // 资源类型含有属性和指标集合
-    allLinkModSet: allLinkModSet // 链路类型含有属性和指标集合
+    allCiModSet: allCiModSet // 资源类型含有属性和指标集合
 
   };
 }

package/es/utils/tree.js

@@ -40,9 +40,7 @@ export function formatTree(json, funcPermissions) {
         type: type,
         name: name,
         showDefault: showDefault,
-        // permission: node.operation,
-        // FIXME 拓扑数据权限临时方案，待移除
-        permission: funcPermissions.createTopo ? 'delete' : 'read',
+        permission: node.operation,
         children: node !== null && node !== void 0 && node.children ? loop(node.children) : []
       };
     });

package/lib/common/components/ColorPicker/ColorPicker.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -53,7 +55,8 @@ var ColorPicker = /*#__PURE__*/function (_Component) {
   _proto.render = function render() {
     var _this$props2 = this.props,
         value = _this$props2.value,
-        align = _this$props2.align;
+        align = _this$props2.align,
+        balloonProps = _this$props2.balloonProps;
 
     var defaultTrigger = /*#__PURE__*/_react["default"].createElement("div", {
       className: _ColorPickerModule["default"].swatch,
@@ -64,7 +67,7 @@ var ColorPicker = /*#__PURE__*/function (_Component) {
 
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "topo-color-picker"
-    }, /*#__PURE__*/_react["default"].createElement(_balloon["default"], {
+    }, /*#__PURE__*/_react["default"].createElement(_balloon["default"], (0, _extends2["default"])({
       trigger: defaultTrigger,
       closable: false,
       triggerType: "click",
@@ -75,7 +78,7 @@ var ColorPicker = /*#__PURE__*/function (_Component) {
       style: {
         paddingBottom: 0
       }
-    }, /*#__PURE__*/_react["default"].createElement(_reactColor.SketchPicker, {
+    }, balloonProps), /*#__PURE__*/_react["default"].createElement(_reactColor.SketchPicker, {
       color: value // width={230}
       ,
       disableAlpha: true,

package/lib/components/BatchAttrMetric/setting.js

@@ -35,7 +35,7 @@ var utils = _interopRequireWildcard(require("./utils"));
 
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
-var _excluded = ["defaultSet", "showType"];
+var _excluded = ["defaultSet", "allCiSet", "showType"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -43,6 +43,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var Setting = function Setting(_ref) {
   var defaultSet = _ref.defaultSet,
+      allCiSet = _ref.allCiSet,
       showType = _ref.showType,
       props = (0, _objectWithoutPropertiesLoose2["default"])(_ref, _excluded);
   // const allCiSet = utils.dsTransform(props.allCiSet);
@@ -56,12 +57,8 @@ var Setting = function Setting(_ref) {
       topoDispatchers = _topo$store$useModel[1];
 
   var resAndMetrics = topoState.resAndMetrics;
-  var allCiModSet = resAndMetrics.allCiModSet,
-      allLinkModSet = resAndMetrics.allLinkModSet;
 
-  _rlog["default"].debug("Setting-resAndMetrics-allCiSet-elementType", showType, props, resAndMetrics, elementType);
-
-  var allCiSet = elementType === "node" ? allCiModSet : allLinkModSet;
+  _rlog["default"].debug("Setting-resAndMetrics-allCiSet-elementType", showType, props, elementType);
 
   _rlog["default"].debug("Setting----allCiSet", allCiSet);
 

package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -13,6 +13,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
+
 var _Drawer = _interopRequireDefault(require("../Drawer"));
 
 var _ResourceSelectList = _interopRequireDefault(require("./ResourceSelectList"));
@@ -81,7 +83,8 @@ function ResourceSelectDrawer(props) {
               _context.prev = 9;
               _context.t0 = _context["catch"](1);
               setLoading(false);
-              console.error('ResourceSelectDrawer.handleOk', _context.t0);
+
+              _rlog["default"].error('ResourceSelectDrawer.handleOk', _context.t0);
 
             case 13:
             case "end":

package/lib/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js

@@ -15,6 +15,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
+
 var _Drawer = _interopRequireDefault(require("../../../components/Drawer"));
 
 var _DisplaySetting = _interopRequireDefault(require("./DisplaySetting"));
@@ -64,7 +66,8 @@ function DisplaySettingDrawer(props) {
               _context.prev = 9;
               _context.t0 = _context["catch"](1);
               setLoading(false);
-              console.error('DisplaySettingDrawer.handleOk', _context.t0);
+
+              _rlog["default"].error('DisplaySettingDrawer.handleOk', _context.t0);
 
               _message["default"].warn('保存失败');
 

package/lib/core/components/DisplaySettingDrawer/LinkTip.js

@@ -11,6 +11,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _ResourceInfoDisplay = require("../../../constants/ResourceInfoDisplay");
 
+var _LinkAttrCustomSettingDrawer = _interopRequireDefault(require("../../../networkTopo/components/viewer/displaySetting/LinkAttrCustomSettingDrawer"));
+
 var _BasicConfig = _interopRequireDefault(require("./ResourceDisplay/BasicConfig"));
 
 // 源端口、目的端口、总流量、带宽利用率
@@ -41,7 +43,10 @@ function LinkTip(props, ref) {
     elementType: "link",
     showType: "tip",
     commonOptions: CommonOptions,
-    defaultCommonConfig: _ResourceInfoDisplay.DEFAULT_TIP_COMMON_CONFIG
+    defaultCommonConfig: _ResourceInfoDisplay.DEFAULT_TIP_COMMON_CONFIG,
+    customSettingDrawer: function customSettingDrawer(params) {
+      return /*#__PURE__*/_react["default"].createElement(_LinkAttrCustomSettingDrawer["default"], params);
+    }
   }));
 }