Skip to content

Commit

Permalink
Merge pull request TencentBlueKing#10979 from lockiechen/issue_10933
Browse files Browse the repository at this point in the history 
feat： 调试记录和流水线 Job 查看页面，支持「登录调试」 TencentBlueKing#10933
  • Loading branch information
@bkci-bot
bkci-bot authored Sep 23, 2024
2 parents b5fd08e + 06c5422 commit d469380
Show file tree
Hide file tree
Showing 23 changed files with 333 additions and 120 deletions.
2 changes: 1 addition & 1 deletion src/frontend/bk-permission/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "",
"main": "./dist/main.js",
"scripts": {
"dev": "bk-cli-service-webpack dev",
"dev": "nx exec -- bk-cli-service-webpack dev",
"build": "bk-cli-service-webpack build",
"lint:style": "stylelint **/*.{html,vue,css,sass,scss,less} --fix",
"public": "webpack --mode production",
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/bk-pipeline/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "dist/bk-pipeline.min.js",
"scripts": {
"public": "webpack --mode production",
"public:master": "webpack --mode production",
"public:master": "webpack --mode production",
"patch": "npm version patch && npm publish",
"test": "echo \"Error: no test specified\" && exit 1"
},
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/devops-atomstore/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"webpack": "~5.76.1"
},
"scripts": {
"dev": "cross-env NODE_ENV=dev webpack-dev-server --mode development",
"dev": "cross-env NODE_ENV=dev nx exec -- webpack-dev-server --mode development",
"public:dev": "cross-env NODE_ENV=dev webpack --mode production",
"public:test": "cross-env NODE_ENV=test webpack --mode production",
"public:master": "cross-env NODE_ENV=master webpack --mode production",
Expand All @@ -72,4 +72,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/frontend/devops-codelib/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"webpack": "~5.76.1"
},
"scripts": {
"dev": "cross-env NODE_ENV=dev webpack-dev-server --mode development",
"dev": "cross-env NODE_ENV=dev nx exec -- webpack-dev-server --mode development",
"public:dev": "cross-env NODE_ENV=dev webpack --mode production",
"public:test": "cross-env NODE_ENV=test webpack --mode production",
"public:master": "cross-env NODE_ENV=master webpack --mode production",
Expand All @@ -76,4 +76,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/frontend/devops-environment/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"webpack": "~5.76.1"
},
"scripts": {
"dev": "cross-env NODE_ENV=dev webpack-dev-server --mode development",
"dev": "cross-env NODE_ENV=dev nx exec -- webpack-dev-server --mode development",
"public:dev": "cross-env NODE_ENV=dev webpack --mode production",
"public:test": "cross-env NODE_ENV=test webpack --mode production",
"public:master": "cross-env NODE_ENV=master webpack --mode production",
Expand All @@ -84,4 +84,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/frontend/devops-manage/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "1.0.0",
"description": "",
"scripts": {
"dev": "bk-cli-service-webpack dev",
"dev": "nx exec -- bk-cli-service-webpack dev",
"build": "bk-cli-service-webpack build",
"server": "node ./paas-server/index.js",
"lint:style": "stylelint **/*.{html,vue,css,sass,scss,less} --fix",
Expand Down Expand Up @@ -71,4 +71,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/frontend/devops-metrics/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "",
"private": true,
"scripts": {
"dev": "vite",
"dev": "nx exec -- vite",
"public:dev": "cross-env NODE_ENV=master vite build",
"public:test": "cross-env NODE_ENV=master vite build",
"public:master": "cross-env NODE_ENV=master vite build",
Expand Down Expand Up @@ -59,4 +59,4 @@
}
}
}
}
}
5 changes: 3 additions & 2 deletions src/frontend/devops-nav/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private": true,
"main": "index.ts",
"scripts": {
"dev": "cross-env NODE_ENV=dev webpack-dev-server --mode development",
"dev": "cross-env NODE_ENV=dev nx exec -- webpack-dev-server --mode development",
"dll": "webpack --config webpack.dll.config.js --mode production",
"public": "npm run dll && webpack --mode production",
"public:dev": "cross-env NODE_ENV=dev npm run public --",
Expand Down Expand Up @@ -92,6 +92,7 @@
"targets": {
"inputs": [
"{workspaceRoot}/locale/console/*.json",
"{workspaceRoot}/locale/index.js",
"{projectRoot}"
],
"public:master": {
Expand All @@ -101,4 +102,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/frontend/devops-permission/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "1.0.0",
"description": "",
"scripts": {
"dev": "bk-cli-service-webpack dev",
"dev": "nx exec -- bk-cli-service-webpack dev",
"build": "bk-cli-service-webpack build",
"server": "node ./paas-server/index.js",
"lint:style": "stylelint **/*.{html,vue,css,sass,scss,less} --fix",
Expand Down Expand Up @@ -70,4 +70,4 @@
}
}
}
}
}
5 changes: 3 additions & 2 deletions src/frontend/devops-pipeline/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private": true,
"author": "",
"scripts": {
"dev": "webpack-cli serve --mode development --progress",
"dev": "nx exec -- webpack-cli serve --mode development --progress",
"dll": "webpack --mode production --config webpack.dll.config.js",
"public": "npm run dll && webpack --mode production",
"public:dev": "cross-env NODE_ENV=dev npm run public --",
Expand Down Expand Up @@ -99,6 +99,7 @@
"public:master": {
"inputs": [
"{workspaceRoot}/locale/pipeline/*.json",
"{workspaceRoot}/locale/index.js",
"{projectRoot}"
],
"outputs": [
Expand All @@ -107,4 +108,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/frontend/devops-pipeline/src/components/BuildHistoryTable/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1409,7 +1409,7 @@
}
.build-artifact-list-ul {
border-top: 1px solid #EAEBF0;
max-height: 100vh / 3;
max-height: calc(100vh / 3);
overflow: auto;
> li {
height: 38px;
Expand Down
3 changes: 3 additions & 0 deletions src/frontend/devops-pipeline/src/components/ContainerPropertyPanel/ContainerContent.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,6 +1126,9 @@
}
}
}
.image-tag {
width: 50%;
}
}
.container-resource-name {
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
>
<li
class="parallel-conf-detail-row"
v-for="item in prarallelSettingRows"
v-for="item in parallelSettingRows"
:key="item.key"
>
<label>
Expand Down Expand Up @@ -134,7 +134,7 @@
)
]
},
prarallelSettingRows () {
parallelSettingRows () {
return [
{
key: 'concurrencyGroup',
Expand Down
1 change: 0 additions & 1 deletion src/frontend/devops-pipeline/src/components/PipelineHeader/EditHeader.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<div class="pipeline-edit-header">
<pipeline-bread-crumb
:is-loading="!isPipelineNameReady"
:pipeline-name="pipelineSetting?.pipelineName"
>
<span class="pipeline-edit-header-tag">
<bk-tag>
Expand Down
5 changes: 3 additions & 2 deletions src/frontend/devops-pipeline/src/store/modules/atom/getters.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,9 @@ export default {
const isPublicDevCloud = getters.isPublicDevCloudContainer(container)
const isBcsContainer = getters.isBcsContainer(container)
const isThirdDocker = getters.isThirdDockerContainer(container)
const isLatestExecDetail = execDetail && execDetail.buildNum === execDetail.latestBuildNum && execDetail.curVersion === execDetail.latestVersion
return routeName !== 'templateEdit' && container.baseOS === 'LINUX' && (isDocker || isPublicDevCloud || isBcsContainer || isThirdDocker) && (routeName === 'pipelinesEdit' || container.status === 'RUNNING' || (routeName === 'pipelinesDetail' && isLatestExecDetail))
const isLatestExecDetail = execDetail && execDetail.buildNum === execDetail.latestBuildNum

return routeName !== 'templateEdit' && container.baseOS === 'LINUX' && (isDocker || isPublicDevCloud || isBcsContainer || isThirdDocker) && (['pipelinesEdit', 'pipelinesHistory'].includes(routeName) || container.status === 'RUNNING' || (routeName === 'pipelinesDetail' && isLatestExecDetail))
},
getElements: state => container => {
return container && Array.isArray(container.elements)
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/devops-quality/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"webpack": "~5.76.1"
},
"scripts": {
"dev": "cross-env NODE_ENV=dev webpack-dev-server --mode development",
"dev": "cross-env NODE_ENV=dev nx exec -- webpack-dev-server --mode development",
"public:dev": "cross-env NODE_ENV=dev webpack --mode production",
"public:test": "cross-env NODE_ENV=test webpack --mode production",
"public:master": "cross-env NODE_ENV=master webpack --mode production",
Expand All @@ -78,4 +78,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/frontend/devops-stream/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "devops-stream",
"author": "Blueking",
"scripts": {
"dev": "better-npm-run dev",
"dev": "nx exec -- better-npm-run dev",
"clean": "rimraf dist",
"build": "better-npm-run build",
"build:analyzer": "better-npm-run build:analyzer",
Expand Down Expand Up @@ -143,4 +143,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/frontend/devops-ticket/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"webpack": "~5.76.1"
},
"scripts": {
"dev": "cross-env NODE_ENV=dev webpack-dev-server --mode development",
"dev": "cross-env NODE_ENV=dev nx exec -- webpack-dev-server --mode development",
"public:dev": "cross-env NODE_ENV=dev webpack --mode production",
"public:test": "cross-env NODE_ENV=test webpack --mode production",
"public:master": "cross-env NODE_ENV=master webpack --mode production",
Expand All @@ -61,4 +61,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/frontend/devops-turbo/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"webpack": "~5.76.1"
},
"scripts": {
"dev": "cross-env NODE_ENV=dev webpack-dev-server --mode development",
"dev": "cross-env NODE_ENV=dev nx exec -- webpack-dev-server --mode development",
"public:dev": "cross-env NODE_ENV=dev webpack --mode production",
"public:test": "cross-env NODE_ENV=test webpack --mode production",
"public:master": "cross-env NODE_ENV=master webpack --mode production",
Expand All @@ -69,4 +69,4 @@
}
}
}
}
}
8 changes: 6 additions & 2 deletions src/frontend/nx.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
"dependsOn": [
"^public:master"
],
"outputs": [
"{projectRoot}/dist"
],
"cache": true
},
"dev": {
Expand All @@ -13,5 +16,6 @@
],
"cache": true
}
}
}
},
"defaultBase": "master"
}
2 changes: 1 addition & 1 deletion src/frontend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@
"node": ">=20.17.0",
"pnpm": ">=9"
}
}
}
Loading

0 comments on commit d469380

Please sign in to comment.