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

package/lib/networkTopo/store/topoTreeMod.js

@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
+var _services = _interopRequireDefault(require("../services"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
@@ -59,7 +59,7 @@ function _default(topoApp) {
                   case 0:
                     id = payload.id;
                     _context.next = 3;
-                    return _topo["default"].getTopoTree();
+                    return _this.getTopoTree();
 
                   case 3:
                     resTreeData = _context.sent;
@@ -85,24 +85,65 @@ function _default(topoApp) {
             }, _callee);
           }))();
         },
+        getTopoTree: function getTopoTree(payload, rootState) {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+            var showAllTree, resTreeData;
+            return _regenerator["default"].wrap(function _callee2$(_context2) {
+              while (1) {
+                switch (_context2.prev = _context2.next) {
+                  case 0:
+                    // 拓扑中心 如果有管理导航树权限，展示完整拓扑树
+                    showAllTree = topoApp.options.full && rootState.functionAuth.permissions.manageNavTree;
+
+                    if (!showAllTree) {
+                      _context2.next = 7;
+                      break;
+                    }
+
+                    _context2.next = 4;
+                    return _services["default"].getTopoTree();
+
+                  case 4:
+                    resTreeData = _context2.sent;
+                    _context2.next = 10;
+                    break;
+
+                  case 7:
+                    _context2.next = 9;
+                    return _services["default"].getTopoTreeByLoginUser();
+
+                  case 9:
+                    resTreeData = _context2.sent;
+
+                  case 10:
+                    return _context2.abrupt("return", resTreeData);
+
+                  case 11:
+                  case "end":
+                    return _context2.stop();
+                }
+              }
+            }, _callee2);
+          }))();
+        },
         getSelectedTopoId: function getSelectedTopoId(payload, rootState) {
           return rootState.topoTreeMod.selectedNode[0];
         },
         refreshTree: function refreshTree(payload, rootState) {
           var _this2 = this;
 
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
             var resTreeData, _formatTree2, treeData, defId;
 
-            return _regenerator["default"].wrap(function _callee2$(_context2) {
+            return _regenerator["default"].wrap(function _callee3$(_context3) {
               while (1) {
-                switch (_context2.prev = _context2.next) {
+                switch (_context3.prev = _context3.next) {
                   case 0:
-                    _context2.next = 2;
-                    return _topo["default"].getTopoTree();
+                    _context3.next = 2;
+                    return _this2.getTopoTree();
 
                   case 2:
-                    resTreeData = _context2.sent;
+                    resTreeData = _context3.sent;
                     // 格式化tree数据
                     _formatTree2 = (0, _tree.formatTree)(resTreeData, rootState.functionAuth.permissions), treeData = _formatTree2[0], defId = _formatTree2[1];
 
@@ -114,20 +155,20 @@ function _default(topoApp) {
 
                   case 5:
                   case "end":
-                    return _context2.stop();
+                    return _context3.stop();
                 }
               }
-            }, _callee2);
+            }, _callee3);
           }))();
         },
         editTopoOnTree: function editTopoOnTree(conditions, state) {
           var _this3 = this;
 
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
             var resTreeData, treeData;
-            return _regenerator["default"].wrap(function _callee3$(_context3) {
+            return _regenerator["default"].wrap(function _callee4$(_context4) {
               while (1) {
-                switch (_context3.prev = _context3.next) {
+                switch (_context4.prev = _context4.next) {
                   case 0:
                     if (conditions === void 0) {
                       conditions = {};
@@ -135,11 +176,11 @@ function _default(topoApp) {
 
                     _rlog["default"].debug('editTopoOnTree', conditions);
 
-                    _context3.next = 4;
-                    return _topo["default"].editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
+                    _context4.next = 4;
+                    return _services["default"].editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
 
                   case 4:
-                    resTreeData = _context3.sent;
+                    resTreeData = _context4.sent;
                     treeData = clone(state.topoTreeMod.treeData);
 
                     if (resTreeData) {
@@ -161,10 +202,10 @@ function _default(topoApp) {
 
                   case 7:
                   case "end":
-                    return _context3.stop();
+                    return _context4.stop();
                 }
               }
-            }, _callee3);
+            }, _callee4);
           }))();
         },
 
@@ -196,36 +237,36 @@ function _default(topoApp) {
          * @param {*} state
          */
         deleteTopoOnTree: function deleteTopoOnTree(conditions, state) {
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
             var currentTopoId, isDeleteCurrentP;
-            return _regenerator["default"].wrap(function _callee4$(_context4) {
+            return _regenerator["default"].wrap(function _callee5$(_context5) {
               while (1) {
-                switch (_context4.prev = _context4.next) {
+                switch (_context5.prev = _context5.next) {
                   case 0:
                     _rlog["default"].debug('deleteTopoOnTree', conditions, state, dispatch.topoMod);
 
                     currentTopoId = state.topoMod.topoId;
 
                     if (!("" + conditions === "" + currentTopoId)) {
-                      _context4.next = 13;
+                      _context5.next = 13;
                       break;
                     }
 
                     _rlog["default"].debug('deleteTopo-currentTopo', conditions);
 
-                    _context4.next = 6;
+                    _context5.next = 6;
                     return dispatch.topoMod.updateDelId("" + conditions);
 
                   case 6:
-                    _context4.next = 8;
+                    _context5.next = 8;
                     return topoApp.alarm.close();
 
                   case 8:
-                    _context4.next = 10;
-                    return _topo["default"].deleteTopoonTree(parseInt(conditions, 10));
+                    _context5.next = 10;
+                    return _services["default"].deleteTopoonTree(parseInt(conditions, 10));
 
                   case 10:
-                    return _context4.abrupt("return", _context4.sent);
+                    return _context5.abrupt("return", _context5.sent);
 
                   case 13:
                     // 判断删除的拓扑或文件，是否包含当前拓扑，如果包含就先关闭告警
@@ -237,36 +278,36 @@ function _default(topoApp) {
                     });
 
                     if (!isDeleteCurrentP) {
-                      _context4.next = 18;
+                      _context5.next = 18;
                       break;
                     }
 
-                    _context4.next = 18;
+                    _context5.next = 18;
                     return topoApp.alarm.close();
 
                   case 18:
-                    _context4.next = 20;
-                    return _topo["default"].deleteTopoonTree(parseInt(conditions, 10));
+                    _context5.next = 20;
+                    return _services["default"].deleteTopoonTree(parseInt(conditions, 10));
 
                   case 20:
-                    return _context4.abrupt("return", _context4.sent);
+                    return _context5.abrupt("return", _context5.sent);
 
                   case 21:
                   case "end":
-                    return _context4.stop();
+                    return _context5.stop();
                 }
               }
-            }, _callee4);
+            }, _callee5);
           }))();
         },
         setDefTopoOnTree: function setDefTopoOnTree(conditions, state) {
           var _this4 = this;
 
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
             var resTreeData;
-            return _regenerator["default"].wrap(function _callee5$(_context5) {
+            return _regenerator["default"].wrap(function _callee6$(_context6) {
               while (1) {
-                switch (_context5.prev = _context5.next) {
+                switch (_context6.prev = _context6.next) {
                   case 0:
                     if (conditions === void 0) {
                       conditions = {};
@@ -274,12 +315,12 @@ function _default(topoApp) {
 
                     _rlog["default"].debug('setDefTopoOnTree', conditions);
 
-                    _context5.next = 4;
-                    return _topo["default"].setDefTopo(parseInt(conditions, 10));
+                    _context6.next = 4;
+                    return _services["default"].setDefTopo(parseInt(conditions, 10));
 
                   case 4:
-                    resTreeData = _context5.sent;
-                    _context5.next = 7;
+                    resTreeData = _context6.sent;
+                    _context6.next = 7;
                     return _this4.refreshTree();
 
                   case 7:
@@ -287,10 +328,10 @@ function _default(topoApp) {
 
                   case 8:
                   case "end":
-                    return _context5.stop();
+                    return _context6.stop();
                 }
               }
-            }, _callee5);
+            }, _callee6);
           }))();
         },
         setDefaultTopoId: function setDefaultTopoId(defaultTopoId) {

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

@@ -0,0 +1,137 @@
+"use strict";
+
+var _resourcePermissionUtil = require("../resourcePermissionUtil");
+
+function test(data) {
+  var message = data.message,
+      expected = data.expected,
+      link = data.link,
+      source = data.source,
+      target = data.target;
+  var result = (0, _resourcePermissionUtil.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/lib/networkTopo/utils/resourcePermissionUtil.js

@@ -11,6 +11,8 @@ exports.parseBasicPermission = parseBasicPermission;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _linkUtils = require("../../core/models/utils/linkUtils");
+
 function getNodePermission(node) {
   return parseBasicPermission(node === null || node === void 0 ? void 0 : node.operation);
 }
@@ -33,22 +35,25 @@ function parseBasicPermission(operation) {
 
 
 function getLinkPermission(link, source, target) {
-  var linkType = link.attributes['network_link.connect_type']; // 出口链路使用权限中心配置
-
-  if (linkType === 'exit') {
+  // 关键链路使用权限中心配置
+  if ((0, _linkUtils.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/lib/style.js

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

package/lib/utils/ResourceConfigUtil.js

@@ -9,6 +9,8 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _sortBy = _interopRequireDefault(require("lodash/sortBy"));
 
+var _linkUtils = require("../core/models/utils/linkUtils");
+
 var _clusterUtil = require("./clusterUtil");
 
 var _htElementDataUtil = require("./htElementDataUtil");
@@ -25,34 +27,19 @@ function getResourceConfigFromHt(topo) {
   var htTopo = topo.getHtTopo();
   var dataModel = topo.getDataModel(); // 获得分层
 
-  var layerElements = (0, _htElementUtils.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": (0, _htElementDataUtil.getLayerChildrenResourceElements)(layerElement).map(function (node) {
-          return node.getTag();
-        })
-      }
-    };
-  }); // 获得容器
+  var layers = getLayerDatas(dataModel); // 获得容器
 
   var groupElements = (0, _htElementUtils.getGroups)(dataModel); // 获得视图上的区域配置
 
-  var groups = groupElements.filter(function (node) {
-    return !node.getParent();
-  }).filter(function (groupElement) {
-    return !(0, _clusterUtil.isClusterHtElement)(groupElement);
-  }).map(getGroupConfigByElement);
-  groups = (0, _sortBy["default"])([].concat(layers, groups), "order"); // 获得视图上的资源列表
+  var groups = getGroupDatas({
+    groupElements: groupElements,
+    layers: layers
+  }); // 获得视图上的资源列表
 
   var viewNodes = (0, _htElementUtils.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();
   });
@@ -63,15 +50,44 @@ function getResourceConfigFromHt(topo) {
     "static": [].concat(viewNodes, viewClusters).map(function (node) {
       return node.getTag();
     })
-  }; // console.error('getResourceConfigFromHt', {
-  //   viewNodes,
-  // });
-  // 查询出口链路列表
+  };
+  return {
+    layers: (0, _sortBy["default"])(layers, 'order'),
+    groups: groups,
+    resources: resources,
+    exportLinkIdList: getExportLinkIdList({
+      topo: topo,
+      htTopo: htTopo,
+      dataModel: dataModel
+    }),
+    // 出口链路id列表
+    relateTopoIdList: getRelateTopoIdList(dataModel)
+  };
+} // 查询关联拓扑id列表
+
+
+function getRelateTopoIdList(dataModel) {
+  return (0, _htElementUtils.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 = (0, _htElementUtils.getEdges)(dataModel);
 
-  _rlog["default"].debug(" 查询出口链路列表-edges", edges, dataModel);
+  _rlog["default"].debug(' 查询出口链路列表-edges', edges, dataModel);
 
   edges.forEach(function (edge) {
     var edgeData = htTopo.getEdgeData(edge); // 有组无子连线返回null
@@ -82,29 +98,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 ((0, _linkUtils.isExitLink)(linkData) && !exportLinkIdList.includes(id)) {
           exportLinkIdList.push(id);
         }
       }
     }
   });
-  return {
-    layers: (0, _sortBy["default"])(layers, "order"),
-    groups: groups,
-    resources: resources,
-    exportLinkIdList: exportLinkIdList // 出口链路id列表
+  return exportLinkIdList;
+}
 
-  };
+function getLayerDatas(dataModel) {
+  // 获得分层
+  var layerElements = (0, _htElementUtils.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": (0, _htElementDataUtil.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 !(0, _clusterUtil.isClusterHtElement)(groupElement);
+  }).map(getGroupConfigByElement);
+  groups = (0, _sortBy["default"])([].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": (0, _htElementDataUtil.getGroupChildrenResourceElements)(groupElement).filter(function (node) {
         return !!node.getTag();

package/lib/utils/clusterUtil.js

@@ -145,7 +145,7 @@ function upgradeV103GraphClusterNode(topo, topoData) {
       return;
     }
 
-    _rlog["default"].error('集群1.0.2升级', unExistedList);
+    _rlog["default"].info('集群1.0.2升级', unExistedList);
 
     var groups = unExistedList.filter(function (item) {
       return item.type === 'group';

package/lib/utils/htElementUtils.js

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