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

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

@@ -36,7 +36,8 @@ export var buildButtonComponentWrapper = function buildButtonComponentWrapper(_r
   var globalConfig = useContext(ConfigContext);
   var _globalConfig$replace = globalConfig.replaceLinks,
     reportLinkHost = _globalConfig$replace.report,
-    scanLinkHost = _globalConfig$replace.scan;
+    scanLinkHost = _globalConfig$replace.scan,
+    appStackHost = _globalConfig$replace.appstack;
 
   // 独立组件的后端返回数据格式，和 Flow 不一致，需要要type类型判断，返回结果一样
   if (type === 'LINK') {
@@ -45,7 +46,8 @@ export var buildButtonComponentWrapper = function buildButtonComponentWrapper(_r
       return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
         text: true,
         id: restProps.key,
-        reportLinkHost: reportLinkHost
+        reportLinkHost: reportLinkHost,
+        appStackHost: appStackHost
       })) : null;
     };
   }

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

@@ -35,7 +35,7 @@ var ExecuteButton = function ExecuteButton(_ref) {
     disabled = _useState2[0],
     setDisabled = _useState2[1];
   var globalConfig = useContext(ConfigContext);
-  var apiHost = globalConfig.replaceLinks.api;
+  var apiHeaderFn = globalConfig.apiHeaderFn;
   var doCallApiAndRefresh = function doCallApiAndRefresh(apiFunc, params) {
     return callApiAndRefresh(apiFunc, params, onRefresh, setLoading, setDisabled, name);
   };
@@ -51,7 +51,7 @@ var ExecuteButton = function ExecuteButton(_ref) {
             pipelineId: pipelineId,
             pipelineRunId: pipelineRunId,
             jobId: job.id,
-            host: apiHost
+            apiHeaderFn: apiHeaderFn
           });
           break;
         }
@@ -61,7 +61,7 @@ var ExecuteButton = function ExecuteButton(_ref) {
             pipelineId: pipelineId,
             pipelineRunId: pipelineRunId,
             jobId: job.id,
-            host: apiHost
+            apiHeaderFn: apiHeaderFn
           });
           break;
         }
@@ -71,7 +71,7 @@ var ExecuteButton = function ExecuteButton(_ref) {
             pipelineId: pipelineId,
             pipelineRunId: pipelineRunId,
             jobId: job.id,
-            host: apiHost
+            apiHeaderFn: apiHeaderFn
           });
           break;
         }

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/log-btn/index.js

@@ -71,7 +71,7 @@ var SubTree = function SubTree(props) {
     job = props.job,
     setBuildId = props.setBuildId;
   var globalConfig = useContext(ConfigContext);
-  var apiHost = globalConfig.replaceLinks.api;
+  var apiHeaderFn = globalConfig.apiHeaderFn;
   var _useState = useState([]),
     tree = _useState[0],
     setTree = _useState[1];
@@ -87,7 +87,7 @@ var SubTree = function SubTree(props) {
   var getPipelineJobSteps = function getPipelineJobSteps() {
     var pipelineRunId = instance.pipelineRunId,
       pipelineId = instance.pipelineId;
-    GetPipelineJobSteps(pipelineId, pipelineRunId, job.id, apiHost).then(function (jobSteps) {
+    GetPipelineJobSteps(pipelineId, pipelineRunId, job.id, apiHeaderFn).then(function (jobSteps) {
       setLoading(false);
       if (jobSteps && jobSteps[0]) {
         setTree(jobSteps);
@@ -208,7 +208,7 @@ var LogButton = function LogButton(_ref) {
     buildId = _useState14[0],
     setBuildId = _useState14[1];
   var globalConfig = useContext(ConfigContext);
-  var apiHost = globalConfig.replaceLinks.api;
+  var apiHeaderFn = globalConfig.apiHeaderFn;
   var isFinishStatus = function isFinishStatus(status) {
     return ['success', 'fail'].includes(status);
   };
@@ -256,7 +256,7 @@ var LogButton = function LogButton(_ref) {
         buildId: buildId,
         offset: offset,
         stepIndex: selectNode.nodeIndex,
-        host: apiHost
+        apiHeaderFn: apiHeaderFn
       }).then(function (res) {
         var logs = res.logs,
           last = res.last;
@@ -455,7 +455,7 @@ var LogButton = function LogButton(_ref) {
       jobId: job.id,
       stepIndex: context.selectNode.stepIndex,
       buildId: buildId
-    }, apiHost).then(function (res) {
+    }, apiHeaderFn).then(function (res) {
       setViewLogAction(res);
     })["catch"](function () {
       setViewLogAction('');

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

@@ -14,4 +14,11 @@ export var replaceHostWithBase = function replaceHostWithBase(url, newHost) {
     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-new/index.js

@@ -94,7 +94,7 @@ var FlowSwitch = function FlowSwitch(_ref) {
     requesting = _useState[0],
     setRequesting = _useState[1];
   var globalConfig = useContext(ConfigContext);
-  var apiHost = globalConfig.replaceLinks.api;
+  var apiHeaderFn = globalConfig.apiHeaderFn;
   var manualSwitch = function manualSwitch() {
     if (requesting || status === 'SUCCESS' && !isOld) return;
     setRequesting(true);
@@ -102,7 +102,7 @@ var FlowSwitch = function FlowSwitch(_ref) {
       pipelineId: pipelineId,
       pipelineRunId: pipelineRunId,
       jobId: pipelineJobId,
-      host: apiHost
+      apiHeaderFn: apiHeaderFn
     }).then(function (res) {
       setRequesting(false);
       if (res) {

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

@@ -45,7 +45,7 @@ var Current = function Current(_ref) {
     canEditPipeline = _useState4[0],
     setCanEditPipeline = _useState4[1];
   var globalConfig = useContext(ConfigContext);
-  var apiHost = globalConfig.replaceLinks.api;
+  var apiHeaderFn = globalConfig.apiHeaderFn;
   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]);
@@ -53,7 +53,7 @@ var Current = function Current(_ref) {
     });
   };
   var getLatestPipeline = function getLatestPipeline() {
-    GetLatestPipelineRun(pipelineId, apiHost).then(function (res) {
+    GetLatestPipelineRun(pipelineId, apiHeaderFn).then(function (res) {
       setLoading(false);
       if (res.successful) {
         var _res$object;

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

@@ -42,12 +42,12 @@ var Current = function Current(_ref) {
   }, []);
   var getLatestPipeline = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var apiHost, api;
+      var apiHeaderFn, api;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            apiHost = globalConfig.replaceLinks.api;
-            api = pipelineRunId ? GetPipelineRun(pipelineId, pipelineRunId, apiHost) : GetLatestPipelineRun(pipelineId, apiHost);
+            apiHeaderFn = globalConfig.apiHeaderFn;
+            api = pipelineRunId ? GetPipelineRun(pipelineId, pipelineRunId, apiHeaderFn) : GetLatestPipelineRun(pipelineId, apiHeaderFn);
             api.then(function (res) {
               setLoading(false);
               setInstance(res);

package/es/contexts/config.d.ts

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

package/es/contexts/config.js

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

package/es/index.js

@@ -24,6 +24,7 @@ import { locale } from "./utils";
 import enUS from '@teamix/ui/locale/en-us';
 import zhCN from '@teamix/ui/locale/zh-cn';
 import AsyncDetail from "./pages/detailSwitch";
+import { flowCurryApi, getFlowDataApi } from "./utils/api";
 moment.locale('zh-cn');
 dayjs.locale(['en', 'en_US'].includes(intl.getLang()) ? 'en' : 'zh-cn');
 
@@ -85,12 +86,19 @@ var App = function App(props) {
     pipelineRunId = props.pipelineRunId,
     displayConfig = props.displayConfig,
     _props$replaceLinks = props.replaceLinks,
-    replaceLinks = _props$replaceLinks === void 0 ? {} : _props$replaceLinks;
+    replaceLinks = _props$replaceLinks === void 0 ? {} : _props$replaceLinks,
+    headers = props.headers;
+  var apiHeaderFn = getFlowDataApi;
+  if (replaceLinks.api && headers) {
+    apiHeaderFn = flowCurryApi(replaceLinks.api, headers);
+  }
   return /*#__PURE__*/React.createElement(ConfigProvider, {
     locale: isEn ? enUS : zhCN
   }, /*#__PURE__*/React.createElement(ConfigContext.Provider, {
     value: {
-      replaceLinks: replaceLinks
+      replaceLinks: replaceLinks,
+      headers: headers,
+      apiHeaderFn: apiHeaderFn
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "container"

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

@@ -1,45 +1,46 @@
 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 flowCurryApi: (host?: string, headers?: Record<string, any>) => (data: any) => Promise<any>;
+export declare const GetLatestPipelineRun: (pipelineId: any, apiHeaderFn: any) => any;
+export declare const GetPipelineRun: (pipelineId: any, pipelineRunId: any, apiHeaderFn: any) => any;
 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, }: {
+}, apiHeaderFn: any) => any;
+export declare const GetPipelineJobSteps: (pipelineId: any, pipelineRunId: any, jobId: any, dataApi: any) => any;
+export declare const GetPipelineJobStepLog: ({ pipelineId, pipelineRunId, jobId, buildId, stepIndex, offset, apiHeaderFn, }: {
     pipelineId: any;
     pipelineRunId: any;
     jobId: any;
     buildId: any;
     stepIndex: any;
     offset: any;
-    host: any;
-}) => Promise<any>;
-export declare const RetryPipelineJobRun: ({ pipelineId, pipelineRunId, jobId, host }: {
+    apiHeaderFn: any;
+}) => any;
+export declare const RetryPipelineJobRun: ({ pipelineId, pipelineRunId, jobId, apiHeaderFn, }: {
     pipelineId: any;
     pipelineRunId: any;
     jobId: any;
-    host: any;
-}) => Promise<any>;
-export declare const SkipPipelineJobRun: ({ pipelineId, pipelineRunId, jobId, host }: {
+    apiHeaderFn: any;
+}) => any;
+export declare const SkipPipelineJobRun: ({ pipelineId, pipelineRunId, jobId, apiHeaderFn, }: {
     pipelineId: any;
     pipelineRunId: any;
     jobId: any;
-    host: any;
-}) => Promise<any>;
-export declare const StopPipelineJobRun: ({ pipelineId, pipelineRunId, jobId, host }: {
+    apiHeaderFn: any;
+}) => any;
+export declare const StopPipelineJobRun: ({ pipelineId, pipelineRunId, jobId, apiHeaderFn, }: {
     pipelineId: any;
     pipelineRunId: any;
     jobId: any;
-    host: any;
-}) => Promise<any>;
-export declare const StartPipelineJobRun: ({ pipelineId, pipelineRunId, jobId, host }: {
+    apiHeaderFn: any;
+}) => any;
+export declare const StartPipelineJobRun: ({ pipelineId, pipelineRunId, jobId, apiHeaderFn, }: {
     pipelineId: any;
     pipelineRunId: any;
     jobId: any;
-    host: any;
-}) => Promise<any>;
+    apiHeaderFn: any;
+}) => any;
 export declare const callApiAndRefresh: (apiFunc: any, params: any, onRefresh: any, setLoading: any, setDisabled: any, name: any) => void;

package/es/utils/api/index.js

@@ -32,9 +32,37 @@ export var getFlowDataApi = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
+export var flowCurryApi = function flowCurryApi(host, headers) {
+  return /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(data) {
+      var res;
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return request({
+              method: 'POST',
+              url: host ? "" + host + apiHost : apiHost,
+              data: data,
+              headers: headers
+            });
+          case 2:
+            res = _context2.sent;
+            return _context2.abrupt("return", res.data);
+          case 4:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function (_x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+};
 
 // 查询流水线最新运行
-export var GetLatestPipelineRun = function GetLatestPipelineRun(pipelineId, host) {
+export var GetLatestPipelineRun = function GetLatestPipelineRun(pipelineId, apiHeaderFn) {
   var data = {
     action: 'GetLatestPipelineRun',
     method: 'GET',
@@ -43,11 +71,11 @@ export var GetLatestPipelineRun = function GetLatestPipelineRun(pipelineId, host
       pipelineId: pipelineId
     }
   };
-  return getFlowDataApi(data, host);
+  return apiHeaderFn(data);
 };
 
 // 查询流水线运行历史
-export var GetPipelineRun = function GetPipelineRun(pipelineId, pipelineRunId, host) {
+export var GetPipelineRun = function GetPipelineRun(pipelineId, pipelineRunId, apiHeaderFn) {
   var data = {
     action: 'GetPipelineRun',
     method: 'GET',
@@ -57,16 +85,16 @@ export var GetPipelineRun = function GetPipelineRun(pipelineId, pipelineRunId, h
       pipelineRunId: pipelineRunId
     }
   };
-  return getFlowDataApi(data, host);
+  return apiHeaderFn(data);
 };
 
 // 查看原始日志
-export var GetPipelineLogOrigin = function GetPipelineLogOrigin(_ref2, host) {
-  var pipelineId = _ref2.pipelineId,
-    pipelineRunId = _ref2.pipelineRunId,
-    jobId = _ref2.jobId,
-    stepIndex = _ref2.stepIndex,
-    buildId = _ref2.buildId;
+export var GetPipelineLogOrigin = function GetPipelineLogOrigin(_ref3, apiHeaderFn) {
+  var pipelineId = _ref3.pipelineId,
+    pipelineRunId = _ref3.pipelineRunId,
+    jobId = _ref3.jobId,
+    stepIndex = _ref3.stepIndex,
+    buildId = _ref3.buildId;
   var data = {
     action: 'GetPipelineJobStepLogUrl',
     method: 'GET',
@@ -81,12 +109,12 @@ export var GetPipelineLogOrigin = function GetPipelineLogOrigin(_ref2, host) {
       buildId: buildId
     }
   };
-  return getFlowDataApi(data, host);
+  return apiHeaderFn(data);
 };
 
 // 查询任务步骤列表
 
-export var GetPipelineJobSteps = function GetPipelineJobSteps(pipelineId, pipelineRunId, jobId, host) {
+export var GetPipelineJobSteps = function GetPipelineJobSteps(pipelineId, pipelineRunId, jobId, dataApi) {
   var data = {
     action: 'GetPipelineJobSteps',
     method: 'GET',
@@ -97,19 +125,19 @@ export var GetPipelineJobSteps = function GetPipelineJobSteps(pipelineId, pipeli
       jobId: jobId
     }
   };
-  return getFlowDataApi(data, host);
+  return dataApi(data);
 };
 
 // 查询任务步骤日志
 
-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;
+export var GetPipelineJobStepLog = function GetPipelineJobStepLog(_ref4) {
+  var pipelineId = _ref4.pipelineId,
+    pipelineRunId = _ref4.pipelineRunId,
+    jobId = _ref4.jobId,
+    buildId = _ref4.buildId,
+    stepIndex = _ref4.stepIndex,
+    offset = _ref4.offset,
+    apiHeaderFn = _ref4.apiHeaderFn;
   var data = {
     action: 'GetPipelineJobStepLog',
     method: 'GET',
@@ -130,15 +158,15 @@ export var GetPipelineJobStepLog = function GetPipelineJobStepLog(_ref3) {
       buildId: buildId
     }
   };
-  return getFlowDataApi(data, host);
+  return apiHeaderFn(data);
 };
 
 // 重试任务
-export var RetryPipelineJobRun = function RetryPipelineJobRun(_ref4) {
-  var pipelineId = _ref4.pipelineId,
-    pipelineRunId = _ref4.pipelineRunId,
-    jobId = _ref4.jobId,
-    host = _ref4.host;
+export var RetryPipelineJobRun = function RetryPipelineJobRun(_ref5) {
+  var pipelineId = _ref5.pipelineId,
+    pipelineRunId = _ref5.pipelineRunId,
+    jobId = _ref5.jobId,
+    apiHeaderFn = _ref5.apiHeaderFn;
   var data = {
     action: 'RetryPipelineJobRun',
     method: 'PUT',
@@ -149,15 +177,15 @@ export var RetryPipelineJobRun = function RetryPipelineJobRun(_ref4) {
       jobId: jobId
     }
   };
-  return getFlowDataApi(data, host);
+  return apiHeaderFn(data);
 };
 
 // 跳过任务
-export var SkipPipelineJobRun = function SkipPipelineJobRun(_ref5) {
-  var pipelineId = _ref5.pipelineId,
-    pipelineRunId = _ref5.pipelineRunId,
-    jobId = _ref5.jobId,
-    host = _ref5.host;
+export var SkipPipelineJobRun = function SkipPipelineJobRun(_ref6) {
+  var pipelineId = _ref6.pipelineId,
+    pipelineRunId = _ref6.pipelineRunId,
+    jobId = _ref6.jobId,
+    apiHeaderFn = _ref6.apiHeaderFn;
   var data = {
     action: 'SkipPipelineJobRun',
     method: 'PUT',
@@ -168,15 +196,15 @@ export var SkipPipelineJobRun = function SkipPipelineJobRun(_ref5) {
       jobId: jobId
     }
   };
-  return getFlowDataApi(data, host);
+  return apiHeaderFn(data);
 };
 
 // 取消任务
-export var StopPipelineJobRun = function StopPipelineJobRun(_ref6) {
-  var pipelineId = _ref6.pipelineId,
-    pipelineRunId = _ref6.pipelineRunId,
-    jobId = _ref6.jobId,
-    host = _ref6.host;
+export var StopPipelineJobRun = function StopPipelineJobRun(_ref7) {
+  var pipelineId = _ref7.pipelineId,
+    pipelineRunId = _ref7.pipelineRunId,
+    jobId = _ref7.jobId,
+    apiHeaderFn = _ref7.apiHeaderFn;
   var data = {
     action: 'StopPipelineJobRun',
     method: 'PUT',
@@ -187,15 +215,15 @@ export var StopPipelineJobRun = function StopPipelineJobRun(_ref6) {
       jobId: jobId
     }
   };
-  return getFlowDataApi(data, host);
+  return apiHeaderFn(data);
 };
 
 // 运行任务
-export var StartPipelineJobRun = function StartPipelineJobRun(_ref7) {
-  var pipelineId = _ref7.pipelineId,
-    pipelineRunId = _ref7.pipelineRunId,
-    jobId = _ref7.jobId,
-    host = _ref7.host;
+export var StartPipelineJobRun = function StartPipelineJobRun(_ref8) {
+  var pipelineId = _ref8.pipelineId,
+    pipelineRunId = _ref8.pipelineRunId,
+    jobId = _ref8.jobId,
+    apiHeaderFn = _ref8.apiHeaderFn;
   var data = {
     action: 'ExecutePipelineJobRun',
     method: 'POST',
@@ -206,7 +234,7 @@ export var StartPipelineJobRun = function StartPipelineJobRun(_ref7) {
       jobId: jobId
     }
   };
-  return getFlowDataApi(data, host);
+  return apiHeaderFn(data);
 };
 export var callApiAndRefresh = function callApiAndRefresh(apiFunc, params, onRefresh, setLoading, setDisabled, name) {
   apiFunc(params).then(function (success) {

package/package.json

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