@devops-flow/devops-flow-pipeline-detail 0.0.58 → 0.0.60

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

@@ -116,7 +116,8 @@ export var buildButtonComponentWrapper = function buildButtonComponentWrapper(_r
       return function (restProps) {
         var button = StateInfoWithRedline[mode];
         return button ? button(_extends({}, props, restProps, {
-          id: restProps.key
+          id: restProps.key,
+          reportLinkHost: reportLinkHost
         })) : null;
       };
     case 'DEPLOY_ORDER':

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, replaceHostWithBase } from "../replaceHost";
+import { replaceHostWithBase } from "../replaceHost";
 import { CommonButton, StatInfoItem } from "../stat-info-s-common/common";
 import confirmOpenReportDialog, { getTrustPipelineReportConfig } from "../stat-info-s-common/RememberConfirm";
 import ConfigContext from "../../../../../contexts/config";
@@ -450,7 +450,7 @@ var StateInfoButton = function StateInfoButton(args) {
   if (statistic.Total && statistic.PassedRate && statistic.LineCoverageRate) {
     var coverageLink = {
       component: 'a',
-      href: replaceHost(statistic._COVERAGE_REPORT.url),
+      href: replaceHostWithBase(statistic._COVERAGE_REPORT.url, reportLinkHost),
       target: '_blank'
     };
     var text = [intl.get({

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

@@ -5,7 +5,7 @@ import { Title, YunxiaoIcon } from '@alife/devops-ui';
 import { BaiscIconFont } from "../../icon-font";
 import intl from "../../../../../locale";
 import "./index.scss";
-import { replaceHost, replaceHostWithBase } from "../replaceHost";
+import { replaceHostWithBase } from "../replaceHost";
 import { CommonButton, StatInfoItem } from "../stat-info-s-common/common";
 import confirmOpenReportDialog, { getTrustPipelineReportConfig } from "../stat-info-s-common/RememberConfirm";
 import ConfigContext from "../../../../../contexts/config";
@@ -470,7 +470,8 @@ var StateInfoButton = function StateInfoButton(props) {
   var data = props.data,
     id = props.id,
     name = props.name,
-    hasMore = props.hasMore;
+    hasMore = props.hasMore,
+    reportLinkHost = props.reportLinkHost;
   var _JSON$parse = JSON.parse(data),
     statistic = _JSON$parse.statInfoMap;
   if (!statistic._REPORT && !statistic._COVERAGE_REPORT) {
@@ -478,7 +479,7 @@ var StateInfoButton = function StateInfoButton(props) {
   }
   var link = {
     component: 'a',
-    href: replaceHost(statistic._REPORT.url),
+    href: replaceHostWithBase(statistic._REPORT.url, reportLinkHost),
     target: '_blank',
     text: true
   };
@@ -488,7 +489,7 @@ var StateInfoButton = function StateInfoButton(props) {
   if (statistic.Total && statistic.PassedRate && statistic.LineCoverageRate) {
     var coverageLink = {
       component: 'a',
-      href: replaceHost(statistic._COVERAGE_REPORT.url),
+      href: replaceHostWithBase(statistic._COVERAGE_REPORT.url, reportLinkHost),
       target: '_blank'
     };
     var text = [intl.get({

package/es/components/common/teambition/pipeline-instance/index.js

@@ -359,7 +359,7 @@ var PipelineInstance = function PipelineInstance(props) {
     href: helpLink('concurrency_and_build_time')
   })))), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Duration, {
     startedAt: instance.flowInstVo.gmtCreate,
-    endedAt: utils.isFinished(instance.flowInstVo.status, instance.flowInstVo.runningStatus) ? instance.flowInstVo.gmtModified : null
+    endedAt: utils.isFinished(instance.flowInstVo.status) ? instance.flowInstVo.gmtModified : null
   }))), enablePackages && /*#__PURE__*/React.createElement(Packages, {
     packages: packages
   }), contextObj.FLOW_INST_RUNNING_COMMENT && /*#__PURE__*/React.createElement("li", null, /*#__PURE__*/React.createElement("label", null, intl.get({

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

@@ -121,9 +121,7 @@ export var StatusBar = /*#__PURE__*/React.memo(function (props) {
   }, /*#__PURE__*/React.createElement(Duration, {
     className: "duration",
     startedAt: instance.createTime,
-    endedAt: utils.isFinished(instance.status, instance.status
-    // instance.flowInstVo.runningStatus,
-    ) ? instance.updateTime : null
+    endedAt: utils.isFinished(instance.status) ? instance.updateTime : null
   }), /*#__PURE__*/React.createElement(Balloon.Tooltip, {
     trigger: /*#__PURE__*/React.createElement(YunxiaoIcon, {
       type: "question-line",
@@ -239,7 +237,7 @@ export var StatusBar = /*#__PURE__*/React.memo(function (props) {
   }, /*#__PURE__*/React.createElement(Duration, {
     className: "duration",
     startedAt: instance.createTime,
-    endedAt: instance.updateTime
+    endedAt: utils.isFinished(instance.status) ? instance.updateTime : null
   }), /*#__PURE__*/React.createElement(Balloon.Tooltip, {
     trigger: /*#__PURE__*/React.createElement(YunxiaoIcon, {
       type: "question-line",

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

@@ -137,7 +137,7 @@ var Histories = function Histories(_ref) {
       cell: function cell(_, __, record) {
         return /*#__PURE__*/React.createElement(Duration, {
           startedAt: record.flowInstVo.gmtCreate,
-          endedAt: utils.isFinished(record.flowInstVo.status, record.flowInstVo.runningStatus) ? record.flowInstVo.gmtModified : null
+          endedAt: utils.isFinished(record.flowInstVo.status) ? record.flowInstVo.gmtModified : null
         });
       }
     }),

package/es/utils/index.d.ts

@@ -22,7 +22,7 @@ declare const tools: {
         [x: string]: any;
         type?: string;
     }, key: any): void;
-    isFinished(status: any, runningStatus: any): boolean;
+    isFinished(status: any): boolean;
 };
 export declare const onceToast: any;
 export declare const tireToast: any;

package/es/utils/index.js

@@ -157,9 +157,8 @@ var tools = {
     }));
     this.onceToastCacheMap[key] = true;
   },
-  isFinished: function isFinished(status, runningStatus) {
-    if (['FINISH', 'CANCELED'].indexOf((status || '').toUpperCase()) > -1) return true;
-    return ['FAIL', 'CANCELED'].includes(runningStatus);
+  isFinished: function isFinished(status) {
+    return ['FINISH', 'CANCELED', 'FAIL', 'SUCCESS'].indexOf((status || '').toUpperCase()) > -1;
   }
 };
 export var onceToast = tools.onceToast.bind(tools);

package/package.json

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