test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(系统设置): 切换新的工作空间服务集成配置信息展示有误 

--bug=1030732 --user=宋昌昌 【测试跟踪】github#26790，创建新的工作空间切换后，禅道服务集成成功，但是去创建项目集成第三方平台没有禅道选项 https://www.tapd.cn/55049933/s/1417590
This commit is contained in:
song-cc-rock 2023-09-19 11:14:25 +08:00 committed by fit2-zhao
parent 6034f27ed1
commit af39f92e74
3 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
system-setting/frontend/src/business/workspace/integration/AzureDevopsSetting.vue
View File

@ -70,8 +70,8 @@
<script>
import BugManageBtn from "./BugManageBtn";
import {getCurrentUser, getCurrentWorkspaceId} from "metersphere-frontend/src/utils/token";
import {AZURE_DEVOPS,AZURE_DEVOP_URL} from "metersphere-frontend/src/utils/constants";
import {getCurrentWorkspaceId} from "metersphere-frontend/src/utils/token";
import {AZURE_DEVOPS} from "metersphere-frontend/src/utils/constants";
import MsInstructionsIcon from "metersphere-frontend/src/components/MsInstructionsIcon";
import MsPersonRouter from "metersphere-frontend/src/components/personal/PersonRouter";
import {
@ -124,10 +124,10 @@ export default {
},
methods: {
init() {
const {lastWorkspaceId} = getCurrentUser();
const workspaceId = getCurrentWorkspaceId();
let param = {};
param.platform = AZURE_DEVOPS;
param.workspaceId = lastWorkspaceId;
param.workspaceId = workspaceId;
this.$parent.loading = getServiceIntegration(param).then(res => {
let data = res.data;
if (data.configuration) {
@ -157,8 +157,7 @@ export default {
issuetype: this.form.issuetype,
storytype: this.form.storytype
};
const {lastWorkspaceId} = getCurrentUser();
param.workspaceId = lastWorkspaceId;
param.workspaceId = getCurrentWorkspaceId();
param.platform = AZURE_DEVOPS;
param.configuration = JSON.stringify(auth);
this.$parent.loading = saveServiceIntegration(param).then(() => {
@ -203,9 +202,9 @@ export default {
confirmButtonText: this.$t('commons.confirm'),
callback: (action) => {
if (action === 'confirm') {
const {lastWorkspaceId} = getCurrentUser();
const workspaceId = getCurrentWorkspaceId();
let param = {};
param.workspaceId = lastWorkspaceId;
param.workspaceId = workspaceId;
param.platform = AZURE_DEVOPS;
this.$parent.loading = delServiceIntegration(param).then(() => {
this.$success(this.$t('organization.integration.successful_operation'));

20
system-setting/frontend/src/business/workspace/integration/PlatformConfig.vue
View File

@ -64,15 +64,11 @@
<script>
import BugManageBtn from "./BugManageBtn";
import {getCurrentUser} from "metersphere-frontend/src/utils/token";
import {getCurrentWorkspaceId} from "metersphere-frontend/src/utils/token";
import MsInstructionsIcon from "metersphere-frontend/src/components/MsInstructionsIcon";
import MsPersonRouter from "metersphere-frontend/src/components/personal/PersonRouter";
import CustomFiledComponent from "metersphere-frontend/src/components/template/CustomFiledComponent";
import {
delServiceIntegration,
getServiceIntegration,
saveServiceIntegration
} from "../../../api/workspace";
import {delServiceIntegration, getServiceIntegration, saveServiceIntegration} from "../../../api/workspace";
import {generatePlatformResourceUrl, validateServiceIntegration} from "@/api/platform-plugin";
import {getPlatformFormRules} from "metersphere-frontend/src/utils/platform";
@ -103,10 +99,10 @@ export default {
init() {
this.rules = getPlatformFormRules(this.config);
const {lastWorkspaceId} = getCurrentUser();
const workspaceId = getCurrentWorkspaceId();
let param = {};
param.platform = this.config.key;
param.workspaceId = lastWorkspaceId;
param.workspaceId = workspaceId;
this.$parent.loading = getServiceIntegration(param).then(res => {
let data = res.data;
if (data.configuration) {
@ -130,9 +126,9 @@ export default {
if (valid) {
let config = {};
Object.assign(config, this.form);
const {lastWorkspaceId} = getCurrentUser();
const workspaceId = getCurrentWorkspaceId();
let param = {};
param.workspaceId = lastWorkspaceId;
param.workspaceId = workspaceId;
param.platform = this.config.key;
param.configuration = JSON.stringify(config);
this.$parent.loading = saveServiceIntegration(param).then(() => {
@ -171,9 +167,9 @@ export default {
confirmButtonText: this.$t('commons.confirm'),
callback: (action) => {
if (action === 'confirm') {
const {lastWorkspaceId} = getCurrentUser();
const workspaceId = getCurrentWorkspaceId();
let param = {};
param.workspaceId = lastWorkspaceId;
param.workspaceId = workspaceId;
param.platform = this.config.key;
this.$parent.loading = delServiceIntegration(param).then(() => {
this.$success(this.$t('organization.integration.successful_operation'));

13
system-setting/frontend/src/business/workspace/integration/TapdSetting.vue
View File

@ -50,7 +50,7 @@
<script>
import BugManageBtn from "./BugManageBtn";
import {getCurrentUser, getCurrentWorkspaceId} from "metersphere-frontend/src/utils/token";
import {getCurrentWorkspaceId} from "metersphere-frontend/src/utils/token";
import {TAPD} from "metersphere-frontend/src/utils/constants";
import MsPersonRouter from "metersphere-frontend/src/components/personal/PersonRouter";
import {
@ -91,10 +91,10 @@ export default {
},
methods: {
init() {
const {lastWorkspaceId} = getCurrentUser();
const workspaceId = getCurrentWorkspaceId();
let param = {};
param.platform = TAPD;
param.workspaceId = lastWorkspaceId;
param.workspaceId = workspaceId;
this.$parent.loading = getServiceIntegration(param).then(res => {
let data = res.data;
if (data.configuration) {
@ -115,8 +115,7 @@ export default {
account: this.form.account,
password: this.form.password,
};
const {lastWorkspaceId} = getCurrentUser();
param.workspaceId = lastWorkspaceId;
param.workspaceId = getCurrentWorkspaceId();
param.platform = TAPD;
param.configuration = JSON.stringify(auth);
this.$parent.loading = saveServiceIntegration(param).then(() => {
@ -158,9 +157,9 @@ export default {
confirmButtonText: this.$t('commons.confirm'),
callback: (action) => {
if (action === 'confirm') {
const {lastWorkspaceId} = getCurrentUser();
const workspaceId = getCurrentWorkspaceId();
let param = {};
param.workspaceId = lastWorkspaceId;
param.workspaceId = workspaceId;
param.platform = TAPD;
this.$parent.loading = delServiceIntegration(param).then(() => {
this.$success(this.$t('organization.integration.successful_operation'));