@riil-frontend/component-topology 11.0.33 → 11.0.35

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useAlarmAndRiskData.js

@@ -22,6 +22,8 @@ var _overview = _interopRequireDefault(require("../../../../../../../services/ov
  * @param {*} props
  */
 var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
+  var _getAlarmRiskData;
+
   var id = props.id,
       isAppTopo = props.isAppTopo,
       resourceOverviewProps = props.resourceOverviewProps,
@@ -34,129 +36,122 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
 
 
   function getAlarmRiskData(_x) {
-    return _getAlarmRiskData.apply(this, arguments);
-  } // 轮询hooks
-
-
-  function _getAlarmRiskData() {
-    _getAlarmRiskData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
-      var _alarmList, _yield$resourceOvervi, alarmList, _yield$alarmService$g, _alarmList2, AllComponentsByCiId, _yield$service$getRis, riskList;
+    return (_getAlarmRiskData = _getAlarmRiskData || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
+      var _alarmList, _yield$resourceOvervi2, alarmList, _yield$alarmService$g2, _alarmList2, AllComponentsByCiId, _yield$service$getRis2, riskList;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (!isAppTopo) {
-                _context.next = 9;
-                break;
-              }
-
-              _context.next = 3;
-              return resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getData({
-                id: id // metrics: topModelMetrics,
-
-              });
-
-            case 3:
-              _yield$resourceOvervi = _context.sent;
-              alarmList = _yield$resourceOvervi.alarms;
-              alarmList = ((_alarmList = alarmList) === null || _alarmList === void 0 ? void 0 : _alarmList.map(function (item) {
-                return {
-                  type: 'alarm',
-                  icon: 'gaojing-3',
-                  className: "alarm-color-icon-lv" + item.alertLevel,
-                  title: "[" + item.alertObject + "] " + item.alertTitle,
-                  link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
-                  time: item.createTime,
-                  status: item.status,
-                  params: [{
-                    alertId: item.alertId,
-                    status: 'dealing',
-                    userId: userId,
-                    isBaseAlert: false
-                  }]
-                };
-              })) || [];
-              setAlarmRiskList(alarmList);
-              _context.next = 24;
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!isAppTopo) {
+              _context.next = 9;
               break;
-
-            case 9:
-              _context.next = 11;
-              return _alarm["default"].getAlarmByIds([id].concat(childrenIds), {
-                alertStatusList: ['toDeal', 'woDealing', 'dealing'],
-                // toDeal: 待处理, dealing：处理中
-                pageNum: 1,
-                pageSize: 10000,
-                sortField: 'alertLevel',
-                sortOrder: 'asc'
-              });
-
-            case 11:
-              _yield$alarmService$g = _context.sent;
-              _alarmList2 = _yield$alarmService$g.datas;
-              // 2022-07-16 后端不支持多列排序，暂通过前端实现,按创建时间倒序
-              _alarmList2 = _alarmList2.sort(function (a, b) {
-                return b.createTime - a.createTime;
-              });
-              _alarmList2 = _alarmList2.map(function (item) {
-                return {
-                  type: 'alarm',
-                  icon: 'gaojing-3',
-                  className: "alarm-color-icon-lv" + item.alertLevel,
-                  title: "" + item.alertObject + item.alertTitle,
-                  link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
-                  time: item.createTime,
-                  status: item.status,
-                  params: [{
-                    alertId: item.alertId,
-                    status: 'dealing',
-                    userId: userId,
-                    isBaseAlert: false
-                  }]
-                };
-              }); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
-
-              _context.next = 17;
-              return _overview["default"].queryAllComponentsByCiId(id);
-
-            case 17:
-              AllComponentsByCiId = _context.sent;
-              _context.next = 20;
-              return _overview["default"].getRiskByIds({
-                ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
-                  return item.id;
-                })),
-                statusList: ['toDeal', 'dealing'],
-                current: 1,
-                pageSize: 10000
-              });
-
-            case 20:
-              _yield$service$getRis = _context.sent;
-              riskList = _yield$service$getRis.content;
-              riskList = riskList.map(function (item) {
-                return {
-                  type: 'risk',
-                  icon: 'Overall_risk_full',
-                  className: 'risk-icon',
-                  title: "" + item.ciName + item.itemName,
-                  link: "/default/healthCheck/riskReport/" + item.id + "?title=\u68C0\u67E5\u62A5\u544A",
-                  time: item.firstFoundTime
-                };
-              }); // console.log('告警和风险', alarmList, riskList);
-
-              setAlarmRiskList([].concat(_alarmList2, riskList));
-
-            case 24:
-            case "end":
-              return _context.stop();
-          }
+            }
+
+            _context.next = 3;
+            return resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getData({
+              id: id // metrics: topModelMetrics,
+
+            });
+
+          case 3:
+            _yield$resourceOvervi2 = _context.sent;
+            alarmList = _yield$resourceOvervi2.alarms;
+            alarmList = ((_alarmList = alarmList) === null || _alarmList === void 0 ? void 0 : _alarmList.map(function (item) {
+              return {
+                type: 'alarm',
+                icon: 'gaojing-3',
+                className: "alarm-color-icon-lv" + item.alertLevel,
+                title: "[" + item.alertObject + "] " + item.alertTitle,
+                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
+                time: item.createTime,
+                status: item.status,
+                params: [{
+                  alertId: item.alertId,
+                  status: 'dealing',
+                  userId: userId,
+                  isBaseAlert: false
+                }]
+              };
+            })) || [];
+            setAlarmRiskList(alarmList);
+            _context.next = 24;
+            break;
+
+          case 9:
+            _context.next = 11;
+            return _alarm["default"].getAlarmByIds([id].concat(childrenIds), {
+              alertStatusList: ['toDeal', 'woDealing', 'dealing'],
+              // toDeal: 待处理, dealing：处理中
+              pageNum: 1,
+              pageSize: 10000,
+              sortField: 'alertLevel',
+              sortOrder: 'asc'
+            });
+
+          case 11:
+            _yield$alarmService$g2 = _context.sent;
+            _alarmList2 = _yield$alarmService$g2.datas;
+            // 2022-07-16 后端不支持多列排序，暂通过前端实现,按创建时间倒序
+            _alarmList2 = _alarmList2.sort(function (a, b) {
+              return b.createTime - a.createTime;
+            });
+            _alarmList2 = _alarmList2.map(function (item) {
+              return {
+                type: 'alarm',
+                icon: 'gaojing-3',
+                className: "alarm-color-icon-lv" + item.alertLevel,
+                title: "" + item.alertObject + item.alertTitle,
+                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
+                time: item.createTime,
+                status: item.status,
+                params: [{
+                  alertId: item.alertId,
+                  status: 'dealing',
+                  userId: userId,
+                  isBaseAlert: false
+                }]
+              };
+            }); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
+
+            _context.next = 17;
+            return _overview["default"].queryAllComponentsByCiId(id);
+
+          case 17:
+            AllComponentsByCiId = _context.sent;
+            _context.next = 20;
+            return _overview["default"].getRiskByIds({
+              ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
+                return item.id;
+              })),
+              statusList: ['toDeal', 'dealing'],
+              current: 1,
+              pageSize: 10000
+            });
+
+          case 20:
+            _yield$service$getRis2 = _context.sent;
+            riskList = _yield$service$getRis2.content;
+            riskList = riskList.map(function (item) {
+              return {
+                type: 'risk',
+                icon: 'Overall_risk_full',
+                className: 'risk-icon',
+                title: "" + item.ciName + item.itemName,
+                link: "/default/healthCheck/riskReport/" + item.id + "?title=\u68C0\u67E5\u62A5\u544A",
+                time: item.firstFoundTime
+              };
+            }); // console.log('告警和风险', alarmList, riskList);
+
+            setAlarmRiskList([].concat(_alarmList2, riskList));
+
+          case 24:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-    return _getAlarmRiskData.apply(this, arguments);
-  }
+    }))).apply(this, arguments);
+  } // 轮询hooks
+
 
   var request = (0, _ahooks.useRequest)(getAlarmRiskData, {
     pollingInterval: 1000 * 15,

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

@@ -20,6 +20,8 @@ var _getCiDisplayMetricModels = require("../../../getCiDisplayMetricModels");
  * @param {*} props
  */
 var useMetricModels = function useMetricModels(props) {
+  var _fetchData;
+
   var _props$data = props.data,
       type = _props$data.type,
       id = _props$data.id,
@@ -39,91 +41,84 @@ var useMetricModels = function useMetricModels(props) {
       setInitLoading = _useState2[1];
 
   function fetchData() {
-    return _fetchData.apply(this, arguments);
-  } // 轮询hooks
-
-
-  function _fetchData() {
-    _fetchData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    return (_fetchData = _fetchData || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var monitorMetrics, ciMonitorMetricModels, displayMetricModels, _metricCodes;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return ((resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.queryMonitorMetricCodes) || _getCiDisplayMetricModels.queryCiMonitorMetricCodes)(id);
-
-            case 2:
-              monitorMetrics = _context.sent;
-              ciMonitorMetricModels = ciTypeMeta.metrics.filter(function (m) {
-                return !!monitorMetrics.find(function (item) {
-                  return item === m.code;
-                });
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return ((resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.queryMonitorMetricCodes) || _getCiDisplayMetricModels.queryCiMonitorMetricCodes)(id);
+
+          case 2:
+            monitorMetrics = _context.sent;
+            ciMonitorMetricModels = ciTypeMeta.metrics.filter(function (m) {
+              return !!monitorMetrics.find(function (item) {
+                return item === m.code;
               });
-
-              if (resourceData.attributes['network_link.is_crucial']) {
-                ciMonitorMetricModels.unshift({
-                  changeValue: null,
-                  code: "netDelayRatio",
-                  id: "netDelayRatio",
-                  isGoldMetric: true,
-                  key: null,
-                  name: "RTT时延",
-                  unit: "ms"
-                });
-                ciMonitorMetricModels.unshift({
-                  changeValue: null,
-                  code: "retansRatio",
-                  id: "retansRatio",
-                  isGoldMetric: true,
-                  key: null,
-                  name: "重传率",
-                  unit: "%"
-                });
-              } // 未监控不显示指标，临时在这里处理
+            });
+
+            if (resourceData.attributes['network_link.is_crucial']) {
+              ciMonitorMetricModels.unshift({
+                changeValue: null,
+                code: "netDelayRatio",
+                id: "netDelayRatio",
+                isGoldMetric: true,
+                key: null,
+                name: "RTT时延",
+                unit: "ms"
+              });
+              ciMonitorMetricModels.unshift({
+                changeValue: null,
+                code: "retansRatio",
+                id: "retansRatio",
+                isGoldMetric: true,
+                key: null,
+                name: "重传率",
+                unit: "%"
+              });
+            } // 未监控不显示指标，临时在这里处理
 
 
-              if (!isMonite) {
-                ciMonitorMetricModels = [];
-              }
+            if (!isMonite) {
+              ciMonitorMetricModels = [];
+            }
 
-              displayMetricModels = null; // 支持自定义显示指标范围
+            displayMetricModels = null; // 支持自定义显示指标范围
 
-              if (resourceOverviewProps !== null && resourceOverviewProps !== void 0 && resourceOverviewProps.getMetricCodes) {
-                _metricCodes = resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getMetricCodes({
-                  type: type,
-                  id: id,
-                  ciType: ciType
-                });
+            if (resourceOverviewProps !== null && resourceOverviewProps !== void 0 && resourceOverviewProps.getMetricCodes) {
+              _metricCodes = resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getMetricCodes({
+                type: type,
+                id: id,
+                ciType: ciType
+              });
 
-                if (_metricCodes) {
-                  displayMetricModels = _metricCodes.map(function (code) {
-                    return ciMonitorMetricModels.find(function (item) {
-                      return item.code === code;
-                    });
-                  }).filter(function (item) {
-                    return !!item;
+              if (_metricCodes) {
+                displayMetricModels = _metricCodes.map(function (code) {
+                  return ciMonitorMetricModels.find(function (item) {
+                    return item.code === code;
                   });
-                }
+                }).filter(function (item) {
+                  return !!item;
+                });
               }
+            }
 
-              if (!displayMetricModels) {
-                displayMetricModels = ciMonitorMetricModels;
-              } // displayMetricModels = displayMetricModels.slice(0, 6);
+            if (!displayMetricModels) {
+              displayMetricModels = ciMonitorMetricModels;
+            } // displayMetricModels = displayMetricModels.slice(0, 6);
 
 
-              return _context.abrupt("return", displayMetricModels);
+            return _context.abrupt("return", displayMetricModels);
 
-            case 10:
-            case "end":
-              return _context.stop();
-          }
+          case 10:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-    return _fetchData.apply(this, arguments);
-  }
+    }))).apply(this, arguments);
+  } // 轮询hooks
+
 
   var request = (0, _ahooks.useRequest)(fetchData, {
     pollingInterval: 1000 * 60,

package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js

@@ -19,47 +19,44 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _react = require("react");
 
-function queryWebConsoleUrlById(_x) {
-  return _queryWebConsoleUrlById.apply(this, arguments);
-}
+var _queryWebConsoleUrlById;
 
-function _queryWebConsoleUrlById() {
-  _queryWebConsoleUrlById = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(id) {
+function queryWebConsoleUrlById(_x) {
+  return (_queryWebConsoleUrlById = _queryWebConsoleUrlById || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
     var _list, list;
 
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.prev = 0;
-            _context2.next = 3;
-            return _topo["default"].resourceWebUrl.list([id]);
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.prev = 0;
+          _context.next = 3;
+          return _topo["default"].resourceWebUrl.list([id]);
 
-          case 3:
-            list = _context2.sent;
-            ;
-            return _context2.abrupt("return", (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list.webUrl);
+        case 3:
+          list = _context.sent;
+          ;
+          return _context.abrupt("return", (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list.webUrl);
 
-          case 8:
-            _context2.prev = 8;
-            _context2.t0 = _context2["catch"](0);
+        case 8:
+          _context.prev = 8;
+          _context.t0 = _context["catch"](0);
 
-            _rlog["default"].error('资源web控制台.加载数据异常', _context2.t0);
+          _rlog["default"].error('资源web控制台.加载数据异常', _context.t0);
 
-          case 11:
-            return _context2.abrupt("return", null);
+        case 11:
+          return _context.abrupt("return", null);
 
-          case 12:
-          case "end":
-            return _context2.stop();
-        }
+        case 12:
+        case "end":
+          return _context.stop();
       }
-    }, _callee2, null, [[0, 8]]);
-  }));
-  return _queryWebConsoleUrlById.apply(this, arguments);
+    }, _callee, null, [[0, 8]]);
+  }))).apply(this, arguments);
 }
 
 function useWebConsole(props) {
+  var _save;
+
   var ciId = props.ciId;
   var ipv4Address = props.ipv4Address;
 
@@ -86,29 +83,22 @@ function useWebConsole(props) {
   }, [ciId]); // 保存Web控制台url
 
   function save(_x2) {
-    return _save.apply(this, arguments);
-  }
+    return (_save = _save || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(newWebConsoleUrl) {
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return _topo["default"].resourceWebUrl.save(ciId, newWebConsoleUrl || null);
+
+          case 2:
+            _message["default"].success('保存成功');
 
-  function _save() {
-    _save = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(newWebConsoleUrl) {
-      return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return _topo["default"].resourceWebUrl.save(ciId, newWebConsoleUrl || null);
-
-            case 2:
-              _message["default"].success('保存成功');
-
-            case 3:
-            case "end":
-              return _context.stop();
-          }
+          case 3:
+          case "end":
+            return _context2.stop();
         }
-      }, _callee);
-    }));
-    return _save.apply(this, arguments);
+      }, _callee2);
+    }))).apply(this, arguments);
   }
 
   return {

package/lib/core/viewer/components/plugins/ResourceDetail/getCiDisplayMetricModels.js

@@ -12,63 +12,51 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
-function queryCiMonitorMetricStrategys(_x) {
-  return _queryCiMonitorMetricStrategys.apply(this, arguments);
-}
+var _queryCiMonitorMetricStrategys, _queryCiMonitorMetricCodes;
 
-function _queryCiMonitorMetricStrategys() {
-  _queryCiMonitorMetricStrategys = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
+function queryCiMonitorMetricStrategys(_x) {
+  return (_queryCiMonitorMetricStrategys = _queryCiMonitorMetricStrategys || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
     var map, monitorMetrics;
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return _componentTopologyUtils.request.post('/mdc/v1/api/strategy/queryMonitorMetrics', [id]);
-
-          case 2:
-            map = _context.sent;
-            monitorMetrics = (map[id] || []).filter(function (item) {
-              return item.metricType !== 'info';
-            });
-            return _context.abrupt("return", monitorMetrics);
-
-          case 5:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return _componentTopologyUtils.request.post('/mdc/v1/api/strategy/queryMonitorMetrics', [id]);
+
+        case 2:
+          map = _context.sent;
+          monitorMetrics = (map[id] || []).filter(function (item) {
+            return item.metricType !== 'info';
+          });
+          return _context.abrupt("return", monitorMetrics);
+
+        case 5:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
-  }));
-  return _queryCiMonitorMetricStrategys.apply(this, arguments);
+  }))).apply(this, arguments);
 }
 
 function queryCiMonitorMetricCodes(_x2) {
-  return _queryCiMonitorMetricCodes.apply(this, arguments);
-}
-
-function _queryCiMonitorMetricCodes() {
-  _queryCiMonitorMetricCodes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(id) {
+  return (_queryCiMonitorMetricCodes = _queryCiMonitorMetricCodes || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(id) {
     var arr;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.next = 2;
-            return queryCiMonitorMetricStrategys(id);
-
-          case 2:
-            arr = _context2.sent;
-            return _context2.abrupt("return", arr.map(function (item) {
-              return item.code;
-            }));
-
-          case 4:
-          case "end":
-            return _context2.stop();
-        }
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.next = 2;
+          return queryCiMonitorMetricStrategys(id);
+
+        case 2:
+          arr = _context2.sent;
+          return _context2.abrupt("return", arr.map(function (item) {
+            return item.code;
+          }));
+
+        case 4:
+        case "end":
+          return _context2.stop();
       }
     }, _callee2);
-  }));
-  return _queryCiMonitorMetricCodes.apply(this, arguments);
+  }))).apply(this, arguments);
 }