Merge pull request #11387 from lockiechen/issue_11386

bug: 新增错误类型枚举导致前端解析异常 #11386
TencentBlueKing · Jan 9, 2025 · cbd6302 · cbd6302
2 parents 38177f9 + 9dd58da
commit cbd6302
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 290 deletions.
diff --git a/src/frontend/devops-pipeline/src/components/ExecPipeline.vue b/src/frontend/devops-pipeline/src/components/ExecPipeline.vue
@@ -358,8 +358,8 @@
             errorList () {
                 return this.execDetail?.errorInfoList?.map((error, index) => ({
                 ...error,
-                errorTypeAlias: this.$t(errorTypeMap[error.errorType].title),
-                errorTypeConf: errorTypeMap[error.errorType]
+                errorTypeAlias: this.$t(errorTypeMap[error.errorType]?.title ?? errorTypeMap[0]?.title),
+                errorTypeConf: errorTypeMap[error.errorType] ?? errorTypeMap[0]
             }))
             },
             showErrorPopup () {

diff --git a/src/frontend/devops-pipeline/src/utils/pipelineConst.js b/src/frontend/devops-pipeline/src/utils/pipelineConst.js
@@ -101,6 +101,10 @@ export const errorTypeMap = [
     {
         title: 'pluginError',
         icon: 'error-plugin'
+    },
+    {
+        title: 'containerError',
+        icon: 'error-node'
     }
 ]
 

diff --git a/src/frontend/locale/pipeline/en-US.json b/src/frontend/locale/pipeline/en-US.json
@@ -40,6 +40,7 @@
   "systemError": "SYSTEM",
   "thirdPartyError": "THIRD_PARTY",
   "pluginError": "PLUGIN",
+  "containerError": "AGENT",
   "createTime": "Create time",
   "retry": "Retry",
   "resume": "Continue",

diff --git a/src/frontend/locale/pipeline/zh-CN.json b/src/frontend/locale/pipeline/zh-CN.json
@@ -28,6 +28,7 @@
   "systemError": "系统运行错误",
   "thirdPartyError": "第三方系统错误",
   "pluginError": "插件执行错误",
+  "containerError": "构建机执行错误",
   "create": "创建",
   "createTime": "创建时间",
   "add": "新建",