@devops-flow/devops-flow-pipeline-detail 0.0.50 → 0.0.52

package/es/components/common/teambition/flow-job-runtime-menu/index.scss

@@ -17,6 +17,7 @@
     .next-dialog-body {
       max-height: calc(100vh - 145px) !important;
       min-height: calc(100vh - 145px) !important;
+      padding: 0 !important;
     }
   }
 

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

@@ -23,7 +23,7 @@ export var SourceElement = /*#__PURE__*/React.memo(function SourceElement(props)
     var _item$data = item.data,
       _item$data$repo = _item$data.repo,
       repo = _item$data$repo === void 0 ? '' : _item$data$repo,
-      commitMsg = _item$data.commitMsg;
+      commitMsg = _item$data.commit;
     var _JsonParseWithCatch = JsonParseWithCatch(commitMsg, [{}]),
       commit = _JsonParseWithCatch[0];
     var trigger = /*#__PURE__*/React.createElement(Source, {

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/common/teambition/pipeline-instance-new/source.js

@@ -53,7 +53,7 @@ var CommonGitSource = function CommonGitSource(_ref) {
   var _data$repo = data.repo,
     repo = _data$repo === void 0 ? '' : _data$repo,
     branch = data.branch,
-    commitMsg = data.commitMsg,
+    commitMsg = data.commit,
     isBranchMode = data.isBranchMode,
     af = data.aoneFlow;
   var _JsonParseWithCatch = JsonParseWithCatch(commitMsg, [{}]),
@@ -267,7 +267,9 @@ var Packages = function Packages(_ref4) {
   var _artifactSourceInstan = artifactSourceInstanceResultProcess(item),
     artifactUrl = _artifactSourceInstan.artifactUrl,
     versionDisplayText = _artifactSourceInstan.versionDisplayText;
-  var repoName = decodeURI(data.repoName);
+
+  // const repoName = decodeURI(data.repoName);
+
   return /*#__PURE__*/React.createElement("ul", {
     key: item.name,
     className: "source",

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

@@ -46,7 +46,7 @@ var Current = function Current(_ref) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            apiHost = globalConfig.apiHost;
+            apiHost = globalConfig.replaceLinks.api;
             api = pipelineRunId ? GetPipelineRun(pipelineId, pipelineRunId, apiHost) : GetLatestPipelineRun(pipelineId, apiHost);
             api.then(function (res) {
               setLoading(false);
@@ -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

@@ -1,5 +1,9 @@
 /// <reference types="react" />
 declare const ConfigContext: import("react").Context<{
-    apiHost: any;
+    replaceLinks: {
+        api: string;
+        report: string;
+        scan: string;
+    };
 }>;
 export default ConfigContext;

package/es/contexts/config.js

@@ -1,5 +1,11 @@
 import { createContext } from 'react';
 var ConfigContext = /*#__PURE__*/createContext({
-  apiHost: null
+  replaceLinks: {
+    api: '',
+    // api接口
+    report: '',
+    // 报告链接
+    scan: '' // 扫描报告
+  }
 });
 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;
@@ -83,13 +83,14 @@ var setConfigDefault = function setConfigDefault(config) {
 var App = function App(props) {
   var pipelineId = props.pipelineId,
     pipelineRunId = props.pipelineRunId,
-    apiHost = props.apiHost,
-    displayConfig = props.displayConfig;
+    displayConfig = props.displayConfig,
+    _props$replaceLinks = props.replaceLinks,
+    replaceLinks = _props$replaceLinks === void 0 ? {} : _props$replaceLinks;
   return /*#__PURE__*/React.createElement(ConfigProvider, {
     locale: isEn ? enUS : zhCN
   }, /*#__PURE__*/React.createElement(ConfigContext.Provider, {
     value: {
-      apiHost: apiHost
+      replaceLinks: replaceLinks
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "container"

package/es/style.js

@@ -5,7 +5,6 @@ import '@alife/yunxiao-error-message/es/style';
 import '@alife/devops-ui/es/style';
 import '@alife/teamix-text-avatar/es/style';
 import '@alife/yunxiao-icon/es/style';
-import '@alife/yunxiao-ai-panel/es/style';
 
 import '@alife/yunxiao-avatar/es/style';
 import '@alife/teamix-step-dialog/es/style';

package/es/utils/api/index.d.ts

@@ -1,33 +1,45 @@
 export declare const getFlowDataApi: (data: any, host?: string) => Promise<any>;
 export declare const GetLatestPipelineRun: (pipelineId: any, host: any) => Promise<any>;
 export declare const GetPipelineRun: (pipelineId: any, pipelineRunId: any, host: any) => Promise<any>;
-export declare const GetPipelineJobSteps: (pipelineId: any, pipelineRunId: any, jobId: any) => Promise<any>;
-export declare const GetPipelineJobStepLog: ({ pipelineId, pipelineRunId, jobId, buildId, stepIndex, offset }: {
+export declare const GetPipelineLogOrigin: ({ pipelineId, pipelineRunId, jobId, stepIndex, buildId }: {
+    pipelineId: any;
+    pipelineRunId: any;
+    jobId: any;
+    stepIndex: any;
+    buildId: any;
+}, host: any) => Promise<any>;
+export declare const GetPipelineJobSteps: (pipelineId: any, pipelineRunId: any, jobId: any, host: any) => Promise<any>;
+export declare const GetPipelineJobStepLog: ({ pipelineId, pipelineRunId, jobId, buildId, stepIndex, offset, host, }: {
     pipelineId: any;
     pipelineRunId: any;
     jobId: any;
     buildId: any;
     stepIndex: any;
     offset: any;
+    host: any;
 }) => Promise<any>;
-export declare const RetryPipelineJobRun: ({ pipelineId, pipelineRunId, jobId }: {
+export declare const RetryPipelineJobRun: ({ pipelineId, pipelineRunId, jobId, host }: {
     pipelineId: any;
     pipelineRunId: any;
     jobId: any;
+    host: any;
 }) => Promise<any>;
-export declare const SkipPipelineJobRun: ({ pipelineId, pipelineRunId, jobId }: {
+export declare const SkipPipelineJobRun: ({ pipelineId, pipelineRunId, jobId, host }: {
     pipelineId: any;
     pipelineRunId: any;
     jobId: any;
+    host: any;
 }) => Promise<any>;
-export declare const StopPipelineJobRun: ({ pipelineId, pipelineRunId, jobId }: {
+export declare const StopPipelineJobRun: ({ pipelineId, pipelineRunId, jobId, host }: {
     pipelineId: any;
     pipelineRunId: any;
     jobId: any;
+    host: any;
 }) => Promise<any>;
-export declare const StartPipelineJobRun: ({ pipelineId, pipelineRunId, jobId }: {
+export declare const StartPipelineJobRun: ({ pipelineId, pipelineRunId, jobId, host }: {
     pipelineId: any;
     pipelineRunId: any;
     jobId: any;
+    host: any;
 }) => Promise<any>;
 export declare const callApiAndRefresh: (apiFunc: any, params: any, onRefresh: any, setLoading: any, setDisabled: any, name: any) => void;

package/es/utils/api/index.js

@@ -60,9 +60,33 @@ export var GetPipelineRun = function GetPipelineRun(pipelineId, pipelineRunId, h
   return getFlowDataApi(data, host);
 };
 
+// 查看原始日志
+export var GetPipelineLogOrigin = function GetPipelineLogOrigin(_ref2, host) {
+  var pipelineId = _ref2.pipelineId,
+    pipelineRunId = _ref2.pipelineRunId,
+    jobId = _ref2.jobId,
+    stepIndex = _ref2.stepIndex,
+    buildId = _ref2.buildId;
+  var data = {
+    action: 'GetPipelineJobStepLogUrl',
+    method: 'GET',
+    actionPath: 'https://{domain}/oapi/v1/flow/organizations/{organizationId}/pipelines/{pipelineId}/pipelineRuns/{pipelineRunId}/jobs/{jobId}/step/log/url',
+    pathParams: {
+      pipelineId: pipelineId,
+      pipelineRunId: pipelineRunId,
+      jobId: jobId
+    },
+    queryParams: {
+      stepIndex: stepIndex,
+      buildId: buildId
+    }
+  };
+  return getFlowDataApi(data, host);
+};
+
 // 查询任务步骤列表
 
-export var GetPipelineJobSteps = function GetPipelineJobSteps(pipelineId, pipelineRunId, jobId) {
+export var GetPipelineJobSteps = function GetPipelineJobSteps(pipelineId, pipelineRunId, jobId, host) {
   var data = {
     action: 'GetPipelineJobSteps',
     method: 'GET',
@@ -73,18 +97,19 @@ export var GetPipelineJobSteps = function GetPipelineJobSteps(pipelineId, pipeli
       jobId: jobId
     }
   };
-  return getFlowDataApi(data);
+  return getFlowDataApi(data, host);
 };
 
 // 查询任务步骤日志
 
-export var GetPipelineJobStepLog = function GetPipelineJobStepLog(_ref2) {
-  var pipelineId = _ref2.pipelineId,
-    pipelineRunId = _ref2.pipelineRunId,
-    jobId = _ref2.jobId,
-    buildId = _ref2.buildId,
-    stepIndex = _ref2.stepIndex,
-    offset = _ref2.offset;
+export var GetPipelineJobStepLog = function GetPipelineJobStepLog(_ref3) {
+  var pipelineId = _ref3.pipelineId,
+    pipelineRunId = _ref3.pipelineRunId,
+    jobId = _ref3.jobId,
+    buildId = _ref3.buildId,
+    stepIndex = _ref3.stepIndex,
+    offset = _ref3.offset,
+    host = _ref3.host;
   var data = {
     action: 'GetPipelineJobStepLog',
     method: 'GET',
@@ -105,14 +130,15 @@ export var GetPipelineJobStepLog = function GetPipelineJobStepLog(_ref2) {
       buildId: buildId
     }
   };
-  return getFlowDataApi(data);
+  return getFlowDataApi(data, host);
 };
 
 // 重试任务
-export var RetryPipelineJobRun = function RetryPipelineJobRun(_ref3) {
-  var pipelineId = _ref3.pipelineId,
-    pipelineRunId = _ref3.pipelineRunId,
-    jobId = _ref3.jobId;
+export var RetryPipelineJobRun = function RetryPipelineJobRun(_ref4) {
+  var pipelineId = _ref4.pipelineId,
+    pipelineRunId = _ref4.pipelineRunId,
+    jobId = _ref4.jobId,
+    host = _ref4.host;
   var data = {
     action: 'RetryPipelineJobRun',
     method: 'PUT',
@@ -123,14 +149,15 @@ export var RetryPipelineJobRun = function RetryPipelineJobRun(_ref3) {
       jobId: jobId
     }
   };
-  return getFlowDataApi(data);
+  return getFlowDataApi(data, host);
 };
 
 // 跳过任务
-export var SkipPipelineJobRun = function SkipPipelineJobRun(_ref4) {
-  var pipelineId = _ref4.pipelineId,
-    pipelineRunId = _ref4.pipelineRunId,
-    jobId = _ref4.jobId;
+export var SkipPipelineJobRun = function SkipPipelineJobRun(_ref5) {
+  var pipelineId = _ref5.pipelineId,
+    pipelineRunId = _ref5.pipelineRunId,
+    jobId = _ref5.jobId,
+    host = _ref5.host;
   var data = {
     action: 'SkipPipelineJobRun',
     method: 'PUT',
@@ -141,14 +168,15 @@ export var SkipPipelineJobRun = function SkipPipelineJobRun(_ref4) {
       jobId: jobId
     }
   };
-  return getFlowDataApi(data);
+  return getFlowDataApi(data, host);
 };
 
 // 取消任务
-export var StopPipelineJobRun = function StopPipelineJobRun(_ref5) {
-  var pipelineId = _ref5.pipelineId,
-    pipelineRunId = _ref5.pipelineRunId,
-    jobId = _ref5.jobId;
+export var StopPipelineJobRun = function StopPipelineJobRun(_ref6) {
+  var pipelineId = _ref6.pipelineId,
+    pipelineRunId = _ref6.pipelineRunId,
+    jobId = _ref6.jobId,
+    host = _ref6.host;
   var data = {
     action: 'StopPipelineJobRun',
     method: 'PUT',
@@ -159,14 +187,15 @@ export var StopPipelineJobRun = function StopPipelineJobRun(_ref5) {
       jobId: jobId
     }
   };
-  return getFlowDataApi(data);
+  return getFlowDataApi(data, host);
 };
 
 // 运行任务
-export var StartPipelineJobRun = function StartPipelineJobRun(_ref6) {
-  var pipelineId = _ref6.pipelineId,
-    pipelineRunId = _ref6.pipelineRunId,
-    jobId = _ref6.jobId;
+export var StartPipelineJobRun = function StartPipelineJobRun(_ref7) {
+  var pipelineId = _ref7.pipelineId,
+    pipelineRunId = _ref7.pipelineRunId,
+    jobId = _ref7.jobId,
+    host = _ref7.host;
   var data = {
     action: 'ExecutePipelineJobRun',
     method: 'POST',
@@ -177,7 +206,7 @@ export var StartPipelineJobRun = function StartPipelineJobRun(_ref6) {
       jobId: jobId
     }
   };
-  return getFlowDataApi(data);
+  return getFlowDataApi(data, host);
 };
 export var callApiAndRefresh = function callApiAndRefresh(apiFunc, params, onRefresh, setLoading, setDisabled, name) {
   apiFunc(params).then(function (success) {

package/es/utils/index.js

@@ -512,16 +512,18 @@ export function appStackGetLocale() {
   return locales[(intl.getLang() || 'zh_CN').toLocaleLowerCase().replace('_', '-')];
 }
 export function JsonParseWithCatch(string, defaultValue) {
-  try {
-    return JSON.parse(string);
-  } catch (e) {
-    // eslint-disable-next-line eqeqeq
-    if (string != undefined) {
-      console.error('json parse failed: ', string);
-      console.error(e);
+  if (string) {
+    try {
+      return JSON.parse(string);
+    } catch (e) {
+      // eslint-disable-next-line eqeqeq
+      if (string != undefined) {
+        console.error('json parse failed: ', string);
+        console.error(e);
+      }
     }
-    return defaultValue;
   }
+  return defaultValue;
 }
 
 /** 特定的 appstack 步骤 APP_NAME 有特殊处理，需要自动填充且disable */

package/package.json

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

package/dist/1.css

@@ -1 +0,0 @@
-.panel-content{width:100%;padding:0 20px;word-break:break-word;line-height:20px;max-height:376px;overflow:auto;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.panel-content::-webkit-scrollbar{width:6px;height:6px}.panel-content::-webkit-scrollbar-thumb{border-radius:3px;background:#cecece;background:var(--color-line1-3,#cecece)}.panel-content .content-cursor{display:inline-block;width:1.5px;height:16px;-webkit-animation:van-cursor-flicker .6s infinite;animation:van-cursor-flicker .6s infinite;background-color:#292929;background-color:var(--color-text1-4,#292929)}@-webkit-keyframes van-cursor-flicker{0%{opacity:0}50%{opacity:1}to{opacity:0}}@keyframes van-cursor-flicker{0%{opacity:0}50%{opacity:1}to{opacity:0}}@-webkit-keyframes typing{0%{width:0}}@keyframes typing{0%{width:0}}.panel-footer{height:48px;width:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;padding:0 20px}.panel-footer .panel-footer-state-btn.next-btn-secondary{background:rgba(221,241,255,.5);margin-right:8px}.panel-footer .panel-content-copy-btn.next-btn-text.next-btn-normal{color:#6e6e6e;color:var(--color-text1-2,#6e6e6e)}.panel-footer .panel-content-copy-btn.next-btn-text.next-btn-normal:hover{color:#006ad4;color:var(--btn-text-normal-color-hover,#006ad4)}.panel-footer .panel-content-copy-btn .next-btn-helper{font-size:12px;line-height:18px}.panel-footer .content-like{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;grid-gap:8px;gap:8px}.panel-footer .content-like .isOnlyIcon.next-btn-text.next-btn-normal{color:#adadad;color:var(--color-line1-5,#adadad)}.panel-footer .content-like .isOnlyIcon.next-btn-text.next-btn-normal:hover{color:#006ad4;color:var(--btn-text-normal-color-hover,#006ad4)}.personal-info-card-left-avatar .next-upload-list-item-wrapper{border:0!important;width:64px!important;height:64px!important}.yunxiao-ai-panel{width:400px;min-height:240px;border:1px solid #e9edf0;border:1px solid var(--color-brand3-2,#e9edf0);border-radius:4px;position:relative;background-color:#fff;background-color:var(--color-white,#fff);-webkit-backdrop-filter:blur(16px);backdrop-filter:blur(16px);-webkit-box-shadow:0 5px 15px 0 rgba(0,0,0,.15);box-shadow:0 5px 15px 0 rgba(0,0,0,.15);overflow:auto;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;z-index:1002}.yunxiao-ai-panel-bg{z-index:-1}.yunxiao-ai-panel-bg-s{width:140px;height:140px;background:#aed5ff}.yunxiao-ai-panel-bg-l,.yunxiao-ai-panel-bg-s{position:absolute;top:-70px;left:-70px;-webkit-filter:blur(136px);filter:blur(136px)}.yunxiao-ai-panel-bg-l{width:170px;height:170px;background:#d6e9ff}.yunxiao-ai-panel .panel-title{width:100%;height:56px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;padding:0 20px;color:#292929;color:var(--color-text1-4,#292929);font-weight:500;font-size:14px}.yunxiao-ai-panel .panel-title i{color:#6e6e6e;color:var(--color-text1-2,#6e6e6e)}.yunxiao-ai-panel .panel-footer{margin-top:auto}