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

package/es/components/PipelineGraph/PipelineJobs.js

@@ -40,7 +40,7 @@ export var PipelineJobs = /*#__PURE__*/React.memo(function (props) {
         var stageIds = instance.stageGroup.flat();
         jobsInAllStages = stageIds.map(function (stageId) {
           var stageName = stages[stageId].name;
-          var jobsInThisStage = stages[stageId].components.map(function (job) {
+          var jobsInThisStage = stages[stageId].stageInfo.jobs.map(function (job) {
             var depsObj = JSON.parse(job.deps || '[]');
             return {
               id: job.jobSign,

package/es/components/PipelineGraph/transformOldPipelineRun.js

@@ -9,6 +9,7 @@ export function transformOldPipelineRun(flowInstVo) {
       var oldStageItem = flowInstVo.stages[oldStageId];
       // A: 老版一个 stage 中的若干 component (job)， 具有先后依赖的关系
       var oldStageJobsNode = oldStageItem.stageInfo.jobs.map(function (job, index, ary) {
+        var _job$actions$;
         var isFirst = index === 0;
         var dependsOn;
         if (isFirst) {
@@ -25,7 +26,7 @@ export function transformOldPipelineRun(flowInstVo) {
             stageId: oldGroup.id,
             stageName: stageName,
             job: job,
-            switchManual: index === 0 && job.actions && job.actions[0].type == "ExecutePipelineJobRun"
+            switchManual: index === 0 && (job === null || job === void 0 ? void 0 : (_job$actions$ = job.actions[0]) === null || _job$actions$ === void 0 ? void 0 : _job$actions$.type) === 'ExecutePipelineJobRun'
           }
         };
       });

package/es/components/common/teambition/message-page/index.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { Result } from '@teamix/ui';
 import { Perf } from '@alife/yunxiao-common';
 import "./index.scss";
+import none from "../../../../assets/img-src/none.png";
 var MessagePage = function MessagePage(_ref) {
   var title = _ref.title,
     message = _ref.message,
@@ -9,7 +10,7 @@ var MessagePage = function MessagePage(_ref) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Result, {
     title: title,
     desc: message,
-    img: 'none',
+    img: none,
     size: "medium",
     className: "message-page",
     extra: extra

package/es/components/common/teambition/message-page/index.scss

@@ -8,6 +8,36 @@
 
 .message-page {
   margin-top: 100px;
+
+  &>.container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    &>.image {
+      width: 200px;
+      height: 200px;
+      margin: 0;
+
+      &>img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    &>.info {
+      text-align: center;
+
+      &>.title {
+        font-size: 18px;
+        color: var(--color-text1-4,#292929);
+      }
+      &>.desc {
+        font-size: 14px;
+        color: var(--color-text-light, #999);
+      }
+    }
+  }
 }
 
 .error-page {

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

@@ -303,7 +303,7 @@ var PipelineInstance = function PipelineInstance(props) {
     onDoubleClick: function onDoubleClick() {
       return console.log(instance);
     }
-  }, "#", instance.instNumber), /*#__PURE__*/React.createElement(StatusAbleLabel, {
+  }, "#", instance.pipelineRunId), /*#__PURE__*/React.createElement(StatusAbleLabel, {
     withIcon: true,
     status: instance.status,
     resultStatus: instance.resultStatus

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

@@ -22,7 +22,8 @@ export var StatusBar = /*#__PURE__*/React.memo(function (props) {
     packages = props.packages,
     globalParams = props.globalParams,
     sources = props.sources,
-    haveHistoryPip = props.haveHistoryPip;
+    haveHistoryPip = props.haveHistoryPip,
+    displayConfig = props.displayConfig;
 
   // appstack中支持mini和detail两种模式，默认mini
   var _useState = useState(!window.__isEmbedInAppstack || getLocalStorageCache('FLOW_PIPELINE_RUN_DETAIL_VISIBLE') === true),
@@ -36,12 +37,12 @@ export var StatusBar = /*#__PURE__*/React.memo(function (props) {
     className: PREFIX + "__status_mini " + (haveHistoryPip ? PREFIX + "__status_haveHistory" : '')
   }, !detailVisible && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "label-wrap"
-  }, /*#__PURE__*/React.createElement("span", {
+  }, displayConfig.number && /*#__PURE__*/React.createElement("span", {
     className: "build-num",
     onDoubleClick: function onDoubleClick() {
       return console.log(instance);
     }
-  }, "#", instance.instNumber), /*#__PURE__*/React.createElement("span", {
+  }, "#", instance.pipelineRunId), /*#__PURE__*/React.createElement("span", {
     className: "status-label " + instance.status.toLowerCase()
   }, /*#__PURE__*/React.createElement(StatusIcon, {
     status: instance.status,
@@ -171,12 +172,12 @@ export var StatusBar = /*#__PURE__*/React.memo(function (props) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "label-wrap"
-  }, /*#__PURE__*/React.createElement("span", {
+  }, displayConfig.number && /*#__PURE__*/React.createElement("span", {
     className: "build-num",
     onDoubleClick: function onDoubleClick() {
       return console.log(instance);
     }
-  }, "#", instance.instNumber), /*#__PURE__*/React.createElement("span", {
+  }, "#", instance.pipelineRunId), /*#__PURE__*/React.createElement("span", {
     className: "status-label " + instance.status.toLowerCase()
   }, /*#__PURE__*/React.createElement(StatusIcon, {
     status: instance.status,
@@ -203,7 +204,7 @@ export var StatusBar = /*#__PURE__*/React.memo(function (props) {
     defaultMessage: '取消运行'
   })))), /*#__PURE__*/React.createElement("div", {
     className: "info-wrap"
-  }, /*#__PURE__*/React.createElement("span", {
+  }, displayConfig.triggerMsg && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
     className: "info-label"
   }, intl.get({
     id: 'rdc-tb-cd-assets.teambition.pipeline-instance-new.StatusBar.TriggerInformation',
@@ -215,7 +216,7 @@ export var StatusBar = /*#__PURE__*/React.memo(function (props) {
   }), /*#__PURE__*/React.createElement(Divider, {
     direction: "ver",
     className: "info-divider"
-  }), /*#__PURE__*/React.createElement("span", {
+  })), /*#__PURE__*/React.createElement("span", {
     className: "info-label"
   }, intl.get({
     id: 'rdc-tb-cd-assets.teambition.pipeline-instance-new.StatusBar.StartTime',

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

@@ -2,7 +2,6 @@
 import React, { useState, useCallback } from 'react';
 import dayjs from 'dayjs';
 import relativeTime from 'dayjs/plugin/relativeTime';
-// import CommitsHistory from './commits';
 import intl from "../../../../locale";
 import { Perf } from '@alife/yunxiao-common';
 import "./index.scss";
@@ -10,34 +9,7 @@ import { PREFIX } from "./constants";
 import { StatusBar } from "./StatusBar";
 import { SourceElement } from "./SourceElement";
 import InstanceFlow from "../flow-new";
-
-// const InstanceFlow = Loadable({
-//   loader: () => import('../flow-new'),
-// });
-
 dayjs.extend(relativeTime);
-// 定时器
-var interval;
-var timer;
-function fixDataFlow(branchRepoInfo, sourcesObj) {
-  var branchRepoInfoObj = JSON.parse(branchRepoInfo);
-  sourcesObj.forEach(function (ele) {
-    var matchedBranch = branchRepoInfoObj.find(function (it) {
-      return it.sign === ele.sign;
-    });
-    if (matchedBranch && !ele.data.aoneFlow) {
-      if (matchedBranch.featureBranchs) {
-        matchedBranch.featureBranchs.forEach(
-        // eslint-disable-next-line no-return-assign
-        function (it) {
-          return it.status = 'INTEGRATING';
-        });
-      }
-      ele.data.branch = '--';
-      ele.data.aoneFlow = JSON.stringify(matchedBranch);
-    }
-  });
-}
 var PipelineInstance = function PipelineInstance(props) {
   var pipelineId = props.pipelineId,
     disabled = props.disabled,
@@ -49,7 +21,8 @@ var PipelineInstance = function PipelineInstance(props) {
     noPadding = _props$noPadding === void 0 ? false : _props$noPadding,
     haveHistoryPip = props.haveHistoryPip,
     onRefresh = props.onRefresh,
-    instance = props.instance;
+    instance = props.instance,
+    displayConfig = props.displayConfig;
   var _useState = useState(false),
     releaseInfoVisible = _useState[0],
     setReleaseInfoVisible = _useState[1];
@@ -107,7 +80,8 @@ var PipelineInstance = function PipelineInstance(props) {
     packages: packages,
     globalParams: globalParams,
     sources: sources,
-    haveHistoryPip: haveHistoryPip
+    haveHistoryPip: haveHistoryPip,
+    displayConfig: displayConfig
   }), /*#__PURE__*/React.createElement("div", {
     className: PREFIX + " " + (noPadding ? 'no-padding' : '')
   }, /*#__PURE__*/React.createElement("div", {

package/es/components/common/teambition/pipeline-instance-new/index.scss

@@ -121,6 +121,7 @@ $status-height: 78px;
         color: var(--color-text1-4, #292929);
         line-height: 24px;
         font-weight: 500;
+        margin-right: 8px;
       }
       .cancel-btn {
         margin-left: 12px;
@@ -144,7 +145,6 @@ $status-height: 78px;
       line-height: 32px;
       border-radius: 4px;
       font-size: 14px;
-      margin-left: 12px;
       align-items: center;
       &-icon {
         flex: none;

package/es/components/detailMain/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare const TBDetailMain: ({ loading, type, pipelineId, pipelineRunId, onRunPipeline, onBuildNumberChange, changeConfig, onPipelineStatusChanged, haveHistoryPip, }: {
+declare const TBDetailMain: ({ loading, type, pipelineId, pipelineRunId, onRunPipeline, onBuildNumberChange, changeConfig, onPipelineStatusChanged, haveHistoryPip, displayConfig }: {
     loading: any;
     type: any;
     pipelineId: any;
@@ -9,5 +9,6 @@ declare const TBDetailMain: ({ loading, type, pipelineId, pipelineRunId, onRunPi
     changeConfig: any;
     onPipelineStatusChanged: any;
     haveHistoryPip: any;
+    displayConfig: any;
 }) => JSX.Element;
 export default TBDetailMain;

package/es/components/detailMain/index.js

@@ -15,7 +15,8 @@ var TBDetailMain = function TBDetailMain(_ref) {
     onBuildNumberChange = _ref.onBuildNumberChange,
     changeConfig = _ref.changeConfig,
     onPipelineStatusChanged = _ref.onPipelineStatusChanged,
-    haveHistoryPip = _ref.haveHistoryPip;
+    haveHistoryPip = _ref.haveHistoryPip,
+    displayConfig = _ref.displayConfig;
   return /*#__PURE__*/React.createElement(Suspense, {
     fallback: /*#__PURE__*/React.createElement(React.Fragment, null)
   }, /*#__PURE__*/React.createElement(Recent, {
@@ -24,6 +25,7 @@ var TBDetailMain = function TBDetailMain(_ref) {
     pipelineId: pipelineId,
     pipelineRunId: pipelineRunId,
     haveHistoryPip: haveHistoryPip,
+    displayConfig: displayConfig,
     onBuildNumberChange: onBuildNumberChange,
     onRunPipeline: onRunPipeline,
     changeConfig: changeConfig,

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

@@ -127,6 +127,7 @@ var Current = function Current(_ref) {
     onRefresh: function onRefresh() {
       return getLatestPiepline();
     },
+    displayConfig: props.displayConfig,
     onPipelineStatusChanged: onPipelineStatusChanged,
     haveHistoryPip: haveHistoryPip
   });

package/es/index.js

@@ -73,10 +73,18 @@ 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']; // 编号，触发信息
+  return keys.reduce(function (pre, cur) {
+    pre[cur] = config && typeof config[cur] === 'boolean' ? config[cur] : true;
+    return pre;
+  }, {});
+};
 var App = function App(props) {
   var pipelineId = props.pipelineId,
     pipelineRunId = props.pipelineRunId,
-    apiHost = props.apiHost;
+    apiHost = props.apiHost,
+    displayConfig = props.displayConfig;
   return /*#__PURE__*/React.createElement(ConfigProvider, {
     locale: isEn ? enUS : zhCN
   }, /*#__PURE__*/React.createElement(ConfigContext.Provider, {
@@ -88,6 +96,7 @@ var App = function App(props) {
   }, /*#__PURE__*/React.createElement(AsyncDetail, {
     pipelineId: pipelineId,
     pipelineRunId: pipelineRunId,
+    displayConfig: setConfigDefault(displayConfig),
     location: window.location
   }))));
 };

package/package.json

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