@riil-frontend/component-topology 9.0.0-a.5 → 9.0.0-a.7

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js

@@ -35,7 +35,7 @@ var useMetricModels = function useMetricModels(props) {
 
   function _fetchData() {
     _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var monitorMetrics, ciMonitorMetricModels, checkMenus, isOpen, displayMetricModels, _metricCodes;
+      var monitorMetrics, ciMonitorMetricModels, checkMenus, displayMetricModels, _metricCodes;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -57,61 +57,28 @@ var useMetricModels = function useMetricModels(props) {
             case 6:
               checkMenus = _context.sent;
 
-              if (!(checkMenus[0].passed == 'PASS' && resourceData.attributes.display_name && resourceData.attributes['network_link.is_crucial'])) {
-                _context.next = 12;
-                break;
-              }
-
-              _context.next = 10;
-              return isOpenFlow({
-                'name': resourceData.attributes.display_name
-              });
-
-            case 10:
-              isOpen = _context.sent;
-
-              //
-              if (isOpen) {
-                ciMonitorMetricModels.push({
+              if (checkMenus[0].passed == 'PASS' && resourceData.attributes.display_name && resourceData.attributes['network_link.is_crucial']) {
+                ciMonitorMetricModels.unshift({
                   changeValue: null,
-                  code: "downNetDelayRatio",
-                  id: "downNetDelayRatio",
+                  code: "netDelayRatio",
+                  id: "netDelayRatio",
                   isGoldMetric: true,
                   key: null,
-                  name: "下行RTT时延",
+                  name: "RTT时延",
                   unit: "ms"
                 });
-                ciMonitorMetricModels.push({
+                ciMonitorMetricModels.unshift({
                   changeValue: null,
-                  code: "downRetansRatio",
-                  id: "downRetansRatio",
+                  code: "retansRatio",
+                  id: "retansRatio",
                   isGoldMetric: true,
                   key: null,
-                  name: "下行重传率",
+                  name: "重传率",
                   unit: "%"
                 });
-                ciMonitorMetricModels.push({
-                  changeValue: null,
-                  code: "upNetDelayRatio",
-                  id: "upNetDelayRatio",
-                  isGoldMetric: true,
-                  key: null,
-                  name: "上行RTT时延",
-                  unit: "ms"
-                });
-                ciMonitorMetricModels.push({
-                  changeValue: null,
-                  code: "upRetransRatio",
-                  id: "upRetransRatio",
-                  isGoldMetric: true,
-                  key: null,
-                  name: "上行重传率",
-                  unit: "%"
-                });
-              }
+              } // 未监控不显示指标，临时在这里处理
+
 
-            case 12:
-              // 未监控不显示指标，临时在这里处理
               if (!isMonite) {
                 ciMonitorMetricModels = [];
               }
@@ -143,7 +110,7 @@ var useMetricModels = function useMetricModels(props) {
 
               return _context.abrupt("return", displayMetricModels);
 
-            case 17:
+            case 13:
             case "end":
               return _context.stop();
           }

package/lib/core/event/topoEventListener.js

@@ -0,0 +1,27 @@
+"use strict";
+
+exports.__esModule = true;
+exports.createTopoEventListener = createTopoEventListener;
+var n = 0;
+
+function createTopoEventListener(type, onMessage) {
+  var eventListenerName = "topo_" + n++;
+  var EE = window.EE;
+
+  if (EE) {
+    EE.on('topo', eventListenerName, function (data) {
+      if (data.type === type) {
+        onMessage(data.data);
+      }
+    });
+  }
+
+  return {
+    eventListenerName: eventListenerName,
+    close: function close() {
+      if (EE) {
+        window.EE.removeListener('topo', eventListenerName);
+      }
+    }
+  };
+}

package/lib/core/hooks/useAlarm.js

@@ -11,10 +11,10 @@ var _react = require("react");
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _componentRiilEventEmitter = require("@riil-frontend/component-riil-event-emitter");
-
 var _useGraphAlarmDisplay = _interopRequireDefault(require("./useGraphAlarmDisplay"));
 
+var _useTopoEventListener = _interopRequireDefault(require("./useTopoEventListener"));
+
 /**
  * 
  * 
@@ -117,20 +117,27 @@ function useAlarm(options) {
       received: data,
       all: relateTopoAlarm
     });
-  };
+  }; // 订阅消息
 
-  (0, _componentRiilEventEmitter.useCbbEventListener)("topo", {
-    name: "topo",
+
+  (0, _useTopoEventListener["default"])({
+    type: 'alarm',
     onMessage: function onMessage(data) {
       _rlog["default"].debug("Topoget--AlertMesage------------", topo, data);
 
-      if (data.type === "alarm") {
-        topo.alarm.handleAlarmEvent(data.data);
-      } else if (data.type === "risk") {
-        handleRiskData(data.data);
-      } else if (data.type === "relateTopoAlarm") {
-        handleRelateTopoAlarm(data.data);
-      }
+      topo.alarm.handleAlarmEvent(data);
+    }
+  });
+  (0, _useTopoEventListener["default"])({
+    type: 'risk',
+    onMessage: function onMessage(data) {
+      handleRiskData(data);
+    }
+  });
+  (0, _useTopoEventListener["default"])({
+    type: 'relateTopoAlarm',
+    onMessage: function onMessage(data) {
+      handleRelateTopoAlarm(data);
     }
   });
 }

package/lib/core/hooks/useTopoEventListener.js

@@ -5,29 +5,15 @@ exports["default"] = useTopoEventListener;
 
 var _react = require("react");
 
-var n = 0;
+var _topoEventListener = require("../event/topoEventListener");
 
 function useTopoEventListener(props) {
   var type = props.type,
       onMessage = props.onMessage;
-  var eventListenerName = (0, _react.useMemo)(function () {
-    return "topo_" + n++;
-  }, []);
   (0, _react.useEffect)(function () {
-    var EE = window.EE;
-
-    if (EE) {
-      window.EE.on('topo', eventListenerName, function (data) {
-        if (data.type === type) {
-          onMessage(data.data);
-        }
-      });
-    }
-
+    var listener = (0, _topoEventListener.createTopoEventListener)(type, onMessage);
     return function () {
-      if (EE) {
-        window.EE.removeListener('topo', eventListenerName);
-      }
+      listener.close();
     };
   }, [type, onMessage]);
 }

package/lib/core/models/Alarm.js

@@ -19,8 +19,8 @@ var _componentRiilEventEmitter = require("@riil-frontend/component-riil-event-em
 
 var _utils = require("@riil-frontend/utils");
 
-// import moment from "moment";
-// import { alarmListDemo } from "./mocks";
+var _topoEventListener = require("../event/topoEventListener");
+
 var Alarm = /*#__PURE__*/function () {
   function Alarm() {
     this.topo = void 0;
@@ -394,8 +394,6 @@ var Alarm = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _openTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
-      var _this2 = this;
-
       var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
 
       return _regenerator["default"].wrap(function _callee6$(_context6) {
@@ -427,20 +425,13 @@ var Alarm = /*#__PURE__*/function () {
 
             case 10:
               this.secretKey = _context6.sent;
-
               // rlog.debug("openTopoAlarm 获取初始化告警-------------------开始");
-              _componentRiilEventEmitter.EE.on("topo", "topo", function (data, other) {
-                _rlog["default"].debug("openTopoAlarm 获取初始化告警------收到信息", data);
-
-                _this2.handleAlarmEvent(data);
-              });
-
               this.updateState({
                 alarmOpening: false,
                 alarmIsOpened: true
               });
 
-            case 13:
+            case 12:
             case "end":
               return _context6.stop();
           }
@@ -486,17 +477,15 @@ var Alarm = /*#__PURE__*/function () {
 
               _rlog["default"].debug("useAlarm.useEffect 告警WebSocket 结束");
 
-              _componentRiilEventEmitter.EE.removeListener("topo", "topo");
-
               this.updateState({
                 topoAlarmIsOpen: false,
                 alarmOpening: false,
                 alarmPanelIsOpen: false
               });
-              _context7.next = 9;
+              _context7.next = 8;
               return this.topo.serverApi.closeTopoAlarm(id, this.secretKey);
 
-            case 9:
+            case 8:
             case "end":
               return _context7.stop();
           }

package/lib/core/models/TopoApp.js

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