@riil-frontend/component-topology 8.0.10 → 9.0.0-a.10

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

@@ -15,6 +15,7 @@ var useMetricModels = function useMetricModels(props) {
       ciType = _props$data.ciType,
       isMonite = props.isMonite,
       ciTypeMeta = props.ciTypeMeta,
+      resourceData = props.resourceData,
       topo = props.topo,
       resourceOverviewProps = props.resourceOverviewProps;
 
@@ -48,7 +49,29 @@ var useMetricModels = function useMetricModels(props) {
                 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 (!isMonite) {
                 ciMonitorMetricModels = [];
@@ -81,7 +104,7 @@ var useMetricModels = function useMetricModels(props) {
 
               return _context.abrupt("return", displayMetricModels);
 
-            case 9:
+            case 10:
             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 "8.0.10" === 'string' ? "8.0.10" : null;
+var version = typeof "9.0.0-a.10" === 'string' ? "9.0.0-a.10" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/store/models/viewer/resourceDetail.js

@@ -29,6 +29,13 @@ var _default = {
         visible: false,
         id: null // 资源id
 
+      };
+    },
+    close: function close() {
+      return {
+        visible: false,
+        id: null // 资源id
+
       };
     }
   },

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

@@ -98,9 +98,7 @@ function ResourceDetailDrawer(props) {
   }, []); // 解决切换拓扑图隐藏概览
 
   (0, _react.useEffect)(function () {
-    resourceDetailDispatchers.update({
-      visible: false
-    }); // TODO 其他数据重置
+    close(); // TODO 其他数据重置
   }, [topoId]);
 
   function getUser() {
@@ -176,6 +174,12 @@ function ResourceDetailDrawer(props) {
     }
   }
 
+  function close() {
+    resourceDetailDispatchers.update({
+      visible: false
+    });
+  }
+
   function init(data, targetType) {
     // console.log('初始化基本信息', data, targetType);
     var id = data.id,
@@ -236,7 +240,8 @@ function ResourceDetailDrawer(props) {
       topo: topo,
       userId: userId,
       activeData: activeData,
-      resourceData: resourceData
+      resourceData: resourceData,
+      onClose: close
     }));
   };
 
@@ -250,11 +255,7 @@ function ResourceDetailDrawer(props) {
     })),
     width: 580,
     hasMask: false,
-    onClose: function onClose() {
-      return resourceDetailDispatchers.update({
-        visible: false
-      });
-    }
+    onClose: close
   }, visible && resourceData && renderContent()));
 }
 

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

@@ -53,6 +53,8 @@ var _LinkTopoCard = _interopRequireDefault(require("./components/LinkTopo/LinkTo
 
 var _EventsCard = _interopRequireDefault(require("./EventsCard"));
 
+var _services2 = require("./components/LinkTopo/services");
+
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -166,7 +168,8 @@ function ResourceOverview(props) {
     isMonite: data.manageStatus !== 0,
     ciTypeMeta: ciTypeMeta,
     topo: topo,
-    resourceOverviewProps: resourceOverviewProps
+    resourceOverviewProps: resourceOverviewProps,
+    resourceData: data
   }),
       monitorMetricModels = _useMetricModels.metricModels;
 
@@ -723,7 +726,7 @@ function ResourceOverview(props) {
     _metricColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(col) {
       var _col2, _col3;
 
-      var codes, endTime, params, _ref5, times, metricList;
+      var codes, endTime, params, _ref5, times, metricList, newMetricList, metricLists;
 
       return _regenerator["default"].wrap(function _callee8$(_context8) {
         while (1) {
@@ -771,8 +774,18 @@ function ResourceOverview(props) {
 
             case 11:
               metricList = _context8.sent;
+              _context8.next = 14;
+              return queryMetricList({
+                'name': data.attributes.display_name
+              }, {
+                'id': data.attributes.name
+              });
+
+            case 14:
+              newMetricList = _context8.sent;
+              metricLists = metricList.concat(getNewMetricList(newMetricList));
 
-              _rlog.rlog.debug('metricColChange', metricList, monitorMetricModels);
+              _rlog.rlog.debug('metricColChange', metricLists, monitorMetricModels);
 
               setMetric(col.map(function (item, key) {
                 return {
@@ -783,7 +796,7 @@ function ResourceOverview(props) {
                   metricItem: monitorMetricModels.find(function (m_item) {
                     return m_item.code === item.dataIndex;
                   }),
-                  list: metricList.filter(function (m_item) {
+                  list: metricLists.filter(function (m_item) {
                     return m_item.metricCode === item.dataIndex;
                   })
                 };
@@ -798,7 +811,7 @@ function ResourceOverview(props) {
                 }, 60000);
               }
 
-            case 16:
+            case 20:
             case "end":
               return _context8.stop();
           }
@@ -808,6 +821,87 @@ function ResourceOverview(props) {
     return _metricColChange.apply(this, arguments);
   }
 
+  function queryMetricList(_x9, _x10) {
+    return _queryMetricList.apply(this, arguments);
+  }
+
+  function _queryMetricList() {
+    _queryMetricList = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(data, param) {
+      var checkMenus, isOpen, list;
+      return _regenerator["default"].wrap(function _callee9$(_context9) {
+        while (1) {
+          switch (_context9.prev = _context9.next) {
+            case 0:
+              if (!(ciType !== 'network_link')) {
+                _context9.next = 2;
+                break;
+              }
+
+              return _context9.abrupt("return", []);
+
+            case 2:
+              _context9.next = 4;
+              return (0, _services2.checkMenu)();
+
+            case 4:
+              checkMenus = _context9.sent;
+
+              if (!(checkMenus[0].passed == 'PASS')) {
+                _context9.next = 14;
+                break;
+              }
+
+              _context9.next = 8;
+              return (0, _services2.isOpenFlow)(data);
+
+            case 8:
+              isOpen = _context9.sent;
+
+              if (!isOpen) {
+                _context9.next = 14;
+                break;
+              }
+
+              _context9.next = 12;
+              return (0, _services2.queryLastestValue)(param);
+
+            case 12:
+              list = _context9.sent;
+              return _context9.abrupt("return", list);
+
+            case 14:
+              return _context9.abrupt("return", []);
+
+            case 15:
+            case "end":
+              return _context9.stop();
+          }
+        }
+      }, _callee9);
+    }));
+    return _queryMetricList.apply(this, arguments);
+  }
+
+  var getNewMetricList = function getNewMetricList(data) {
+    return [{
+      errorMsg: null,
+      mainCiId: "netDelayRatio",
+      metricCode: "netDelayRatio",
+      metricValue: data.upNetDelayRatio + ' ms' + '|' + data.downNetDelayRatio + ' ms',
+      subCiId: '',
+      subCiType: null,
+      mainCiType: null
+    }, {
+      errorMsg: null,
+      mainCiId: "retansRatio",
+      metricCode: "retansRatio",
+      metricValue: data.upRetransRatio + ' %' + '|' + data.downRetansRatio + ' %',
+      subCiId: '',
+      subCiType: null,
+      mainCiType: null
+    }];
+  };
+
   var defaultCols = (0, _react.useMemo)(function () {
     var baseInfo = [];
     var keyIndicators = [];

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopo.js

@@ -19,7 +19,8 @@ var _LinkTopoModule = _interopRequireDefault(require("./LinkTopo.module.scss"));
 
 function LinkTopo(props) {
   var data = props.data,
-      linkMetricCodes = props.linkMetricCodes;
+      linkMetricCodes = props.linkMetricCodes,
+      openFlow = props.openFlow;
   var metricData = (0, _useMetricPolling["default"])({
     linkCi: data,
     linkMetricCodes: linkMetricCodes
@@ -32,5 +33,7 @@ function LinkTopo(props) {
     ,
     isNarrow: true,
     jumpto: (0, _componentTopologyUtils.getHistory)().push
-  }, metricData)));
+  }, metricData, {
+    openFlow: openFlow
+  })));
 }

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js

@@ -5,7 +5,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = LinkTopoCard;
 
-var _react = _interopRequireDefault(require("react"));
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _react = _interopRequireWildcard(require("react"));
 
 var _BlockBox = _interopRequireDefault(require("../../BlockBox"));
 
@@ -13,6 +17,12 @@ var _Configurator = _interopRequireDefault(require("../Configurator"));
 
 var _LinkTopo = _interopRequireDefault(require("./LinkTopo"));
 
+var _services = require("./services");
+
+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); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function LinkTopoCard(props) {
   var _data$attributes;
 
@@ -25,7 +35,76 @@ function LinkTopoCard(props) {
 
   var supportTemplates = (data === null || data === void 0 ? void 0 : (_data$attributes = data.attributes) === null || _data$attributes === void 0 ? void 0 : _data$attributes.support_templates) || ''; // 该资源监控模板
 
-  var isCrucial = data === null || data === void 0 ? void 0 : data.attributes['network_link.is_crucial'];
+  var isCrucial = data === null || data === void 0 ? void 0 : data.attributes['network_link.is_crucial']; //是不是关键链路
+
+  var _useState = (0, _react.useState)(null),
+      openFlow = _useState[0],
+      setOpenFlow = _useState[1];
+
+  var analysisUrl = "../../default/trafficControl/linkConfigure?id=" + data.attributes.name + "&num=0";
+  var linkDetailsUrl = "/default/pagecenter/linkDetail/view/" + data.id + "?resId=" + data.id + "&domainCode=network&title=" + data.attributes.name + "&ciCode=network_link&tabByComType=uicbb-res-crucial-link-flow";
+
+  var isOpenFlows = /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var checkMenus, isOpen;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return (0, _services.checkMenu)();
+
+            case 2:
+              checkMenus = _context.sent;
+
+              if (!(checkMenus[0].passed == 'PASS' && isCrucial)) {
+                _context.next = 10;
+                break;
+              }
+
+              _context.next = 6;
+              return (0, _services.isOpenFlow)({
+                'name': data.attributes.display_name
+              });
+
+            case 6:
+              isOpen = _context.sent;
+
+              //判断是不是有流量分析
+              if (isOpen) {
+                setOpenFlow({
+                  name: '查看流量构成',
+                  url: linkDetailsUrl
+                });
+              } else {
+                setOpenFlow({
+                  name: '配置流量分析',
+                  url: analysisUrl
+                });
+              }
+
+              _context.next = 11;
+              break;
+
+            case 10:
+              setOpenFlow(null);
+
+            case 11:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function isOpenFlows() {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  (0, _react.useEffect)(function () {
+    isOpenFlows();
+  }, [data]);
   return /*#__PURE__*/_react["default"].createElement(_BlockBox["default"], {
     headerTitle: "\u8FD0\u884C\u60C5\u51B5",
     headerExtra: /*#__PURE__*/_react["default"].createElement(_Configurator["default"], {
@@ -40,6 +119,9 @@ function LinkTopoCard(props) {
     })
   }, /*#__PURE__*/_react["default"].createElement(_LinkTopo["default"], {
     data: data,
-    linkMetricCodes: metricCodes
+    linkMetricCodes: openFlow && openFlow.name == '查看流量构成' ? metricCodes : metricCodes.filter(function (i) {
+      return i != 'netDelayRatio' && i != 'retansRatio';
+    }),
+    openFlow: openFlow
   }));
 }

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

@@ -24,17 +24,55 @@ function useMetricPolling(_ref) {
   var linkCi = _ref.linkCi,
       linkMetricCodes = _ref.linkMetricCodes;
   var linkId = linkCi.id;
+  var arr = ['netDelayRatio', 'retansRatio'];
+  var oldCodes = [];
+  var newCodes = [];
+  linkMetricCodes.map(function (item) {
+    arr.indexOf(item) > -1 ? newCodes.push(item) : oldCodes.push(item);
+  });
 
   var _useState = (0, _react.useState)({
     sourceMetrics: null,
     destinationMetrics: null,
     // 链路指标列表
     linkMetrics: [],
-    linkMetricsTs: null
+    linkMetricsTs: null,
+    linkOther: []
   }),
       data = _useState[0],
-      setData = _useState[1]; // 轮询hooks
+      setData = _useState[1];
 
+  var queryLastestValues = (0, _ahooks.useRequest)(_services.queryLastestValue, {
+    pollingInterval: 1000 * 15,
+    pollingWhenHidden: false,
+    debounceInterval: 200,
+    manual: true,
+    onSuccess: function onSuccess(result) {
+      var datas = {
+        linkOther: []
+      };
+
+      if (newCodes.includes('netDelayRatio')) {
+        datas.linkOther.push({
+          'code': 'netDelayRatio',
+          'name': '下行RTT时延',
+          'ts': result.time,
+          'value': result.upNetDelayRatio + ' ms' + '|' + result.downNetDelayRatio + ' ms'
+        });
+      }
+
+      if (newCodes.includes('retansRatio')) {
+        datas.linkOther.push({
+          'code': 'retansRatio',
+          'name': '重传率',
+          'ts': result.time,
+          'value': result.upRetransRatio + ' %' + '|' + result.downRetansRatio + ' %'
+        });
+      }
+
+      setData((0, _extends2["default"])({}, data, datas));
+    }
+  }); // 轮询hooks
 
   var queryLinkMetricsRequest = (0, _ahooks.useRequest)(_services.queryLinkLatestMetrics, {
     pollingInterval: 60 * 1000,
@@ -58,17 +96,23 @@ function useMetricPolling(_ref) {
       _rlog["default"].info('链路拓扑指标轮询 queryInterfaceMetricsRequest 结果', result);
     }
   });
-  var linkMetricCodesStr = linkMetricCodes.map(function (item) {
+  var linkMetricCodesStr = oldCodes.map(function (item) {
     return item;
   }).sort().join(',');
   (0, _react.useEffect)(function () {
     if (linkId) {
       _rlog["default"].info('链路拓扑指标轮询 切换', {
         linkCi: linkCi,
-        linkMetricCodes: linkMetricCodes
+        oldCodes: oldCodes
       });
 
-      queryLinkMetricsRequest.run(linkCi, linkMetricCodes);
+      queryLinkMetricsRequest.run(linkCi, oldCodes);
+
+      if (newCodes.length > 0) {
+        queryLastestValues.run({
+          'id': linkCi.attributes.name
+        });
+      }
     }
 
     return function () {};