@devops-flow/devops-flow-pipeline-detail 0.0.51 → 0.0.53

package/es/components/common/teambition/flow-job-btn/cardsMap.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["displayType", "type", "mode", "isAdmin"],
   _excluded2 = ["displayType", "type"];
-import React from 'react';
+import React, { useContext } from 'react';
 import ExecuteButton from "./execute-button";
 import LogButton from "./log-btn";
 import AuiTestSummaryButton from "./aui-test-summary";
@@ -24,6 +24,7 @@ import DebugButton from "./debug-button";
 import ReleaseOrderButton from "./release-order";
 import ChangeInfoButton from "./change-info-btn";
 import { getFeature } from "../../../../utils";
+import ConfigContext from "../../../../contexts/config";
 export var ExecuteableButtons = ['EXECUTE'];
 export var buildButtonComponentWrapper = function buildButtonComponentWrapper(_ref) {
   var displayType = _ref.displayType,
@@ -32,13 +33,21 @@ export var buildButtonComponentWrapper = function buildButtonComponentWrapper(_r
     _ref$isAdmin = _ref.isAdmin,
     isAdmin = _ref$isAdmin === void 0 ? false : _ref$isAdmin,
     props = _objectWithoutPropertiesLoose(_ref, _excluded);
+  var globalConfig = useContext(ConfigContext);
+  var _globalConfig$replace = globalConfig.replaceLinks,
+    reportLinkHost = _globalConfig$replace.report,
+    scanLinkHost = _globalConfig$replace.scan,
+    appStackHost = _globalConfig$replace.appstack;
+
   // 独立组件的后端返回数据格式，和 Flow 不一致，需要要type类型判断，返回结果一样
   if (type === 'LINK') {
     return function (restProps) {
       var Button = LinkButton[mode];
       return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
         text: true,
-        id: restProps.key
+        id: restProps.key,
+        reportLinkHost: reportLinkHost,
+        appStackHost: appStackHost
       })) : null;
     };
   }
@@ -47,7 +56,8 @@ export var buildButtonComponentWrapper = function buildButtonComponentWrapper(_r
       var button = StateInfoButton[mode];
       // 这个 Button 返回数组，不能当成 react 组件用
       return button ? button(_extends({}, props, restProps, {
-        id: restProps.key
+        id: restProps.key,
+        scanLinkHost: scanLinkHost
       })) : null;
     };
   }
@@ -61,6 +71,7 @@ export var buildButtonComponentWrapper = function buildButtonComponentWrapper(_r
       return function (restProps) {
         var Button = ExecuteButton[mode];
         return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          type: type,
           id: restProps.key
         })) : null;
       };
@@ -98,7 +109,8 @@ export var buildButtonComponentWrapper = function buildButtonComponentWrapper(_r
         var button = StateInfoButton[mode];
         // 这个 Button 返回数组，不能当成 react 组件用
         return button ? button(_extends({}, props, restProps, {
-          id: restProps.key
+          id: restProps.key,
+          scanLinkHost: scanLinkHost
         })) : null;
       };
     case 'STAT_INFO_WITH_REDLINES':

package/es/components/common/teambition/flow-job-btn/link/index.js

@@ -1,14 +1,16 @@
 import React from 'react';
 import { Button } from '@teamix/ui';
 import { BaiscIconFont as Icon } from "../../icon-font";
-import { replaceHostWithBase } from "../replaceHost";
+import { replaceAppstack, replaceHostWithBase } from "../replaceHost";
 
 /**
  * 按钮实现模板
  */
 var LinkButton = function LinkButton(props) {
   var url = props.params.url;
-  if (props.reportLinkHost) {
+  if (props.name === '部署单详情') {
+    url = replaceAppstack(props.params.url, props.appStackHost);
+  } else if (props.reportLinkHost) {
     url = replaceHostWithBase(props.params.url, props.reportLinkHost);
   }
   return /*#__PURE__*/React.createElement(Button, {

package/es/components/common/teambition/flow-job-btn/replaceHost.d.ts

@@ -1,2 +1,3 @@
 export declare const replaceHost: (url: any) => any;
 export declare const replaceHostWithBase: (url: string, newHost: string) => string;
+export declare const replaceAppstack: (url: string, newHost: string) => string;

package/es/components/common/teambition/flow-job-btn/replaceHost.js

@@ -6,6 +6,19 @@ export var replaceHost = function replaceHost(url) {
   return getUrlWithContextPath(path);
 };
 export var replaceHostWithBase = function replaceHostWithBase(url, newHost) {
+  var replaceUrls = ['testing.rdc.aliyun.com', 'flow.aliyun.com'];
   var urlObj = new URL(url);
-  return newHost + urlObj.pathname;
+  if (newHost && replaceUrls.some(function (item) {
+    return urlObj.host.includes(item);
+  })) {
+    return newHost + '/devops/getReport?reportPath=' + urlObj.pathname;
+  }
+  return url;
+};
+export var replaceAppstack = function replaceAppstack(url, newHost) {
+  var urlObj = new URL(url);
+  if (newHost) {
+    return newHost + urlObj.pathname;
+  }
+  return url;
 };

package/es/components/common/teambition/flow-job-btn/state-info/index.js

@@ -7,7 +7,7 @@ import Avatar from "../../avatar";
 import { BaiscIconFont } from "../../icon-font";
 import intl from "../../../../../locale";
 import "./index.scss";
-import { replaceHost } from "../replaceHost";
+import { replaceHost, replaceHostWithBase } from "../replaceHost";
 import { CommonButton, StatInfoItem } from "../stat-info-s-common/common";
 import confirmOpenReportDialog, { getTrustPipelineReportConfig } from "../stat-info-s-common/RememberConfirm";
 var skippedOrOthers = function skippedOrOthers(stat) {
@@ -416,7 +416,8 @@ var StateInfoButton = function StateInfoButton(args) {
   var data = args.data,
     id = args.id,
     name = args.name,
-    hasMore = args.hasMore;
+    hasMore = args.hasMore,
+    scanLinkHost = args.scanLinkHost;
   var statistic = JSON.parse(data);
   if (statistic.QIXI) {
     var url = statistic.QIXI.url;
@@ -439,7 +440,7 @@ var StateInfoButton = function StateInfoButton(args) {
   }
   var link = {
     component: 'a',
-    href: replaceHost(statistic._REPORT.url),
+    href: replaceHostWithBase(statistic._REPORT.url, scanLinkHost),
     target: '_blank'
   };
   var prefix = hasMore ? name + " - " : '';

package/es/components/common/teambition/pipeline-instance-new/StatusBar.js

@@ -263,10 +263,10 @@ export var StatusBar = /*#__PURE__*/React.memo(function (props) {
     className: "right"
   }, /*#__PURE__*/React.createElement("ul", {
     className: "info-list"
-  }, /*#__PURE__*/React.createElement("li", null, /*#__PURE__*/React.createElement(CommitsHistory, {
+  }, displayConfig.codeChange && /*#__PURE__*/React.createElement("li", null, /*#__PURE__*/React.createElement(CommitsHistory, {
     sources: sources,
     instance: instance
-  })), /*#__PURE__*/React.createElement("li", null, enablePackages && /*#__PURE__*/React.createElement(Packages, {
+  })), displayConfig.runningProduct && /*#__PURE__*/React.createElement("li", null, enablePackages && /*#__PURE__*/React.createElement(Packages, {
     packages: packages
   })), /*#__PURE__*/React.createElement("li", null, /*#__PURE__*/React.createElement(PipelineParams, {
     dataSource: globalParams

package/es/components/detailMain/current/index.js

@@ -1,13 +1,14 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["loading", "onBuildNumberChange"];
-import React, { useEffect, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { Loading } from '@teamix/ui';
-import exceed from "../../../utils/apimap";
 import Loadable from "../../../utils/loadable";
 import permissionUtil from "../../../utils/permissionUtil";
 import intl from "../../../locale";
 import "./index.scss";
+import { GetLatestPipelineRun } from "../../../utils/api";
+import ConfigContext from "../../../contexts/config";
 var PipelineInstance = Loadable({
   loader: function loader() {
     return import("../../common/teambition/pipeline-instance-new");
@@ -43,19 +44,16 @@ var Current = function Current(_ref) {
   var _useState4 = useState(false),
     canEditPipeline = _useState4[0],
     setCanEditPipeline = _useState4[1];
+  var globalConfig = useContext(ConfigContext);
+  var apiHost = globalConfig.replaceLinks.api;
   var checkPipelinePermission = function checkPipelinePermission() {
     permissionUtil.checkPermissionList([PERMISSION_PIPELINE_EXECUTE, PERMISSION_PIPELINE_EDIT], props.pipelineId, 'pipeline', window.AK_GLOBAL.currentUser.workid).then(function (data) {
       setCanExecutePipeline(data[PERMISSION_PIPELINE_EXECUTE]);
       setCanEditPipeline(data[PERMISSION_PIPELINE_EDIT]);
     });
   };
-  var getLatestPiepline = function getLatestPiepline() {
-    exceed.fetch({
-      api: 'Pipeline.get.instance.latest',
-      params: {
-        pipelineId: pipelineId
-      }
-    }).then(function (res) {
+  var getLatestPipeline = function getLatestPipeline() {
+    GetLatestPipelineRun(pipelineId, apiHost).then(function (res) {
       setLoading(false);
       if (res.successful) {
         var _res$object;
@@ -74,7 +72,6 @@ var Current = function Current(_ref) {
   }, []);
   useEffect(function () {
     checkPipelinePermission();
-    getLatestPiepline();
   }, [pipelineId]);
   var flowInstVo = instance.flowInstVo;
   if (parentLoading || loading) {
@@ -108,7 +105,7 @@ var Current = function Current(_ref) {
         disabled: !canExecutePipeline || type,
         notJump: true,
         onRunPost: function onRunPost() {
-          return getLatestPiepline();
+          return getLatestPipeline();
         },
         onRunPipeline: props.onRunPipeline
       }))
@@ -121,7 +118,7 @@ var Current = function Current(_ref) {
     disabled: !canExecutePipeline,
     isAdmin: canEditPipeline,
     onRefresh: function onRefresh() {
-      return getLatestPiepline();
+      return getLatestPipeline();
     },
     isSystemPipeline: !!type
   });

package/es/components/detailMain/recent/index.js

@@ -110,7 +110,7 @@ var Current = function Current(_ref) {
         }),
         disabled: !canExecutePipeline,
         onRunPost: function onRunPost() {
-          return getLatestPiepline();
+          return getLatestPipeline();
         },
         onRunPipeline: props.onRunPipeline,
         notJump: true
@@ -125,7 +125,7 @@ var Current = function Current(_ref) {
     disabled: !canExecutePipeline,
     isAdmin: canEditPipeline,
     onRefresh: function onRefresh() {
-      return getLatestPiepline();
+      return getLatestPipeline();
     },
     displayConfig: props.displayConfig,
     onPipelineStatusChanged: onPipelineStatusChanged,

package/es/contexts/config.d.ts

@@ -4,6 +4,7 @@ declare const ConfigContext: import("react").Context<{
         api: string;
         report: string;
         scan: string;
+        appstack: string;
     };
 }>;
 export default ConfigContext;

package/es/contexts/config.js

@@ -5,7 +5,9 @@ var ConfigContext = /*#__PURE__*/createContext({
     // api接口
     report: '',
     // 报告链接
-    scan: '' // 扫描报告
+    scan: '',
+    // 扫描报告
+    appstack: '' // 部署单链接
   }
 });
 export default ConfigContext;

package/es/index.js

@@ -74,7 +74,7 @@ var enterFlowTrack = function enterFlowTrack() {
 var lang = locale || window.FORCE && window.FORCE.locale || 'zh_CN';
 var isEn = lang === 'en_US';
 var setConfigDefault = function setConfigDefault(config) {
-  var keys = ['number', 'triggerMsg']; // 编号，触发信息
+  var keys = ['number', 'triggerMsg', 'codeChange', 'runningProduct']; // 编号，触发信息
   return keys.reduce(function (pre, cur) {
     pre[cur] = config && typeof config[cur] === 'boolean' ? config[cur] : true;
     return pre;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devops-flow/devops-flow-pipeline-detail",
-  "version": "0.0.51",
+  "version": "0.0.53",
   "description": "flow 流水线详情",
   "medusaName": "rdc-tb-cd-assets",
   "main": "dist/PipelineFlowDetail.js",