@riil-frontend/component-topology 12.1.4 → 12.1.7

package/lib/core/hooks/useLinkAlarmDisplay.js

@@ -0,0 +1,173 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = useLinkAlarmDisplay;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _react = require("react");
+
+var _ahooks = require("ahooks");
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
+var _DictCache = _interopRequireDefault(require("../models/cache/DictCache"));
+
+function getLinkDev(datas) {
+  // console.log("datas------------------", datas);
+  var linkDevDoc = {};
+  var linkIds = datas.filter(function (item) {
+    return item.ciType === "network_link";
+  }).map(function (item) {
+    linkDevDoc[item.id] = [item.source, item.target];
+    return item.id;
+  });
+  return {
+    linkIds: linkIds,
+    linkDevDoc: linkDevDoc
+  };
+}
+
+function getlinkAlarmLevels(alarmList, resources) {
+  var _getLinkDev = getLinkDev(resources),
+      linkDevDoc = _getLinkDev.linkDevDoc; // console.log("linkAlarmLevels-----------1", linkDevDoc, alarmList);
+
+
+  if (!alarmList) {
+    return [];
+  }
+
+  var alarms = alarmList.filter(function (alarm) {
+    return alarm.obj.alertTypeCode === "availAlert";
+  }).map(function (item) {
+    return item.id;
+  });
+  return Object.keys(linkDevDoc).filter(function (item) {
+    return _lodash["default"].intersection(linkDevDoc[item], alarms).length > 0;
+  }).map(function (item) {
+    return {
+      id: item,
+      level: 1
+    };
+  });
+  ;
+}
+/**
+ * 处理链路显示
+ * @param {*} props
+ * @returns
+ */
+
+
+function useLinkAlarmDisplay(props) {
+  var topo = props.topo,
+      resources = props.resources,
+      graphLoaded = props.graphLoaded,
+      alarmList = props.alarmList;
+
+  var _useState = (0, _react.useState)(getLinkDev(resources).linkIds),
+      linkIds = _useState[0],
+      setLinkIds = _useState[1];
+
+  var _useState2 = (0, _react.useState)([]),
+      linkRunStatus = _useState2[0],
+      setLinkRunStatus = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(getLinkDev(resources).linkDevDoc),
+      linkDev = _useState3[0],
+      setLinkDev = _useState3[1]; // console.log("alarmList----------sssss", alarmList);
+
+
+  (0, _react.useEffect)(function () {
+    var ids = getLinkDev(resources).linkIds;
+
+    if (linkIds.join(",") !== ids.join(",")) {
+      setLinkIds(ids);
+    }
+  }, [resources]);
+
+  function getLinkRunStatus(_x) {
+    return _getLinkRunStatus.apply(this, arguments);
+  } // 轮询hooks
+
+
+  function _getLinkRunStatus() {
+    _getLinkRunStatus = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ids) {
+      var _yield$Promise$all, ciMetricsResult;
+
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (ids.length) {
+              _context.next = 2;
+              break;
+            }
+
+            return _context.abrupt("return", []);
+
+          case 2:
+            _context.t0 = Promise;
+            _context.t1 = // 查询指标值
+            topo.serverApi.ciInfo.batchQueryCiInfo({
+              ciId: [],
+              codes: ["run_status", "remote_ping_status"],
+              relationId: ids.map(function (id) {
+                return {
+                  ciId: id,
+                  operation: "delete"
+                };
+              })
+            });
+            _context.next = 6;
+            return _DictCache["default"].init();
+
+          case 6:
+            _context.t2 = _context.sent;
+            _context.t3 = [_context.t1, _context.t2];
+            _context.next = 10;
+            return _context.t0.all.call(_context.t0, _context.t3);
+
+          case 10:
+            _yield$Promise$all = _context.sent;
+            ciMetricsResult = _yield$Promise$all[0];
+            return _context.abrupt("return", ciMetricsResult);
+
+          case 13:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return _getLinkRunStatus.apply(this, arguments);
+  }
+
+  var _useRequest = (0, _ahooks.useRequest)(getLinkRunStatus, {
+    pollingInterval: 60 * 1000,
+    pollingWhenHidden: false,
+    // debounceInterval: 200,
+    manual: true,
+    onSuccess: function onSuccess(result) {
+      setLinkRunStatus(result.map(function (item) {
+        return {
+          id: item.id,
+          runStatus: item.metrics.run_status
+        };
+      }));
+    }
+  }),
+      run = _useRequest.run;
+
+  (0, _react.useEffect)(function () {
+    if (graphLoaded) {
+      run(linkIds);
+    }
+  }, [graphLoaded, linkIds]);
+  return {
+    linkRunStatus: linkRunStatus,
+    getlinkAlarmLevels: getlinkAlarmLevels
+  };
+}

package/lib/core/models/Alarm.js

@@ -11,12 +11,12 @@ var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
-
-var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
+var _loglevel = _interopRequireDefault(require("loglevel"));
 
 var _utils = require("@riil-frontend/utils");
 
+var rlog = _loglevel["default"].getLogger('topo');
+
 var Alarm = /*#__PURE__*/function () {
   function Alarm() {
     this.topo = void 0;
@@ -94,8 +94,7 @@ var Alarm = /*#__PURE__*/function () {
       return;
     }
 
-    _componentTopologyUtils.rlog.info('Alarm.open 打开告警通道', id);
-
+    rlog.info('Alarm.open 打开告警通道', id);
     this.openTopoAlarm(id);
     this.hmGetTopoAlarmByDoc(id);
   }
@@ -115,10 +114,9 @@ var Alarm = /*#__PURE__*/function () {
       return;
     }
 
-    _componentTopologyUtils.rlog.info('关闭告警通道', currentTopoId); // 取消订阅告警推送
+    rlog.info('关闭告警通道', currentTopoId); // 取消订阅告警推送
     // 关闭告警推送通道
 
-
     this.closeTopoAlarm(currentTopoId);
   };
 
@@ -197,9 +195,7 @@ var Alarm = /*#__PURE__*/function () {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             result = this.getAlarms();
-
-            _componentTopologyUtils.rlog.debug('hmGetTopoAlarmByDoc', result);
-
+            rlog.debug('hmGetTopoAlarmByDoc', result);
             alarms = result.map(function (item) {
               return item.obj;
             });
@@ -333,9 +329,7 @@ var Alarm = /*#__PURE__*/function () {
 
           case 11:
             this.secretKey = _context5.sent;
-
-            _componentTopologyUtils.rlog.info('openTopoAlarm 打开拓扑告警推送-------------------开始');
-
+            rlog.info('openTopoAlarm 打开拓扑告警推送-------------------开始');
             this.updateState({
               alarmOpening: false,
               alarmIsOpened: true
@@ -346,9 +340,7 @@ var Alarm = /*#__PURE__*/function () {
           case 16:
             _context5.prev = 16;
             _context5.t0 = _context5["catch"](8);
-
-            _componentTopologyUtils.rlog.error('打开拓扑告警推送 失败');
-
+            rlog.error('打开拓扑告警推送 失败');
             this.updateState({
               alarmOpening: false
             });
@@ -394,9 +386,7 @@ var Alarm = /*#__PURE__*/function () {
 
           case 3:
             this.currentTopoId = null;
-
-            _componentTopologyUtils.rlog.debug('useAlarm.useEffect 告警WebSocket 结束');
-
+            rlog.debug('useAlarm.useEffect 告警WebSocket 结束');
             this.updateState({
               topoAlarmIsOpen: false,
               alarmOpening: false,
@@ -478,7 +468,7 @@ var Alarm = /*#__PURE__*/function () {
             resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
             alarmDispatchers = this.topo.store.getModelDispatchers('topoAlarm'); // 添加事件
 
-            console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
+            rlog.debug("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
             if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
               _context8.next = 25;
@@ -521,8 +511,7 @@ var Alarm = /*#__PURE__*/function () {
               break;
             }
 
-            _componentTopologyUtils.rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
-
+            rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
             _context8.prev = 13;
             _context8.next = 16;
             return alarmDispatchers.combAlarmData({
@@ -556,8 +545,7 @@ var Alarm = /*#__PURE__*/function () {
           case 22:
             _context8.prev = 22;
             _context8.t0 = _context8["catch"](13);
-
-            _componentTopologyUtils.rlog.error('告警发送异常', _context8.t0);
+            rlog.error('告警发送异常', _context8.t0);
 
           case 25:
           case "end":

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "12.1.4" === 'string' ? "12.1.4" : null;
+var version = typeof "12.1.7" === 'string' ? "12.1.7" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/store/models/topoAlarm.js

@@ -11,14 +11,17 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _loglevel = _interopRequireDefault(require("loglevel"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
 /**
  * 告警
  */
-var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
+var rlog = _loglevel["default"].getLogger('topo'); // 在活告警状态
+
+
+var aliveAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
 
 var sortList = function sortList(a, b) {
   if (a.level === b.level) {
@@ -122,7 +125,7 @@ function _default(topo) {
 
                           if ((resIdsList || []).indexOf(rid) >= 0) {
                             if (record.indexOf(item.alertId) < 0) {
-                              if (showAlarmStatus.indexOf(item.status) >= 0) {
+                              if (aliveAlarmStatus.indexOf(item.status) >= 0) {
                                 // rlog.debug("这是一条新告警", item);
                                 record.push(item.alertId);
 
@@ -138,7 +141,7 @@ function _default(topo) {
                                   doc[rid] = [item];
                                 }
                               } else {
-                                _rlog["default"].warn("接收到异常或已关闭的告警", item);
+                                rlog.warn("接收到异常或已关闭的告警", item);
                               }
                             } else {
                               sliceTag = doc[rid].findIndex(function (x) {
@@ -152,7 +155,7 @@ function _default(topo) {
                               //   item
                               // );
 
-                              if (showAlarmStatus.indexOf(item.status) >= 0) {
+                              if (aliveAlarmStatus.indexOf(item.status) >= 0) {
                                 if (item.status === "change") {
                                   old = doc[rid][sliceTag];
 
@@ -164,10 +167,9 @@ function _default(topo) {
                                     }));
 
                                     doc[rid] = _newArr.sort(sortList);
-
-                                    _rlog["default"].debug("告警级别变更", doc[rid], item);
+                                    rlog.debug("告警级别变更", doc[rid], item);
                                   } else {
-                                    _rlog["default"].debug("接收到异常的重复告警", item);
+                                    rlog.debug("接收到异常的重复告警", item);
                                   }
                                 } else {// rlog.debug("重复告警", item);
                                 }
@@ -180,7 +182,7 @@ function _default(topo) {
                                   doc[rid] = _newArr2;
                                 }
 
-                                _rlog["default"].debug("该告警移除状态-status", item.status, doc[rid], doc);
+                                rlog.debug("该告警移除状态-status", item.status, doc[rid], doc);
 
                                 if (doc[rid].length === 0) {
                                   delete doc[rid];
@@ -221,14 +223,13 @@ function _default(topo) {
                       }); // 传递给HT时，链路要用r开头的id
                       // rlog.debug('xxxxxxxxxxxxxxxxxxxx', doc[id][0], alarmObj.status);
 
-                      return showAlarmStatus.indexOf(alarmObj.status) >= 0 ? alarmObj : null;
+                      return aliveAlarmStatus.indexOf(alarmObj.status) >= 0 ? alarmObj : null;
                     } else {
                       return null;
                     }
                   }));
                   eqFlag = _lodash["default"].isEqual(_lodash["default"].sortBy(alarmlist), _lodash["default"].sortBy(currentAlarmList));
-
-                  _rlog["default"].debug("告警归档结束", eqFlag, currentAlarmList, alarmlist, doc, record);
+                  rlog.debug("告警归档结束", eqFlag, currentAlarmList, alarmlist, doc, record);
 
                   _this2.update({
                     alarmDoc: doc,

package/lib/core/utils/alarmUtil.js

@@ -0,0 +1,17 @@
+"use strict";
+
+exports.__esModule = true;
+exports.isAlarmAlive = void 0;
+// 告警在活状态
+var Alarm_alive_Status = ["toDeal", "dealing", "change", "woDealing"];
+/**
+ * 告警是否在活
+ * @param {*} alarm 
+ * @returns 
+ */
+
+var isAlarmAlive = function isAlarmAlive(alarm) {
+  return Alarm_alive_Status.includes(alarm.status);
+};
+
+exports.isAlarmAlive = isAlarmAlive;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "12.1.4",
+  "version": "12.1.7",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -123,6 +123,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.1.4/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.1.7/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }