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

fix(缺陷管理): 修复同步缺陷相关缺陷 

--bug=1036798 --user=宋昌昌 【缺陷管理】集成jira-jira上缺陷删除附件-同步到ms-ms依旧显示了附件 https://www.tapd.cn/55049933/s/1476721
--bug=1036955 --user=宋昌昌 【缺陷管理】集成zentao-zentao缺陷删除附件-同步带ms附件未删除 https://www.tapd.cn/55049933/s/1476722
--bug=1036339 --user=宋昌昌 【项目管理】项目与权限-应用管理-缺陷管理-同步缺陷-修改同步频率不生效 https://www.tapd.cn/55049933/s/1476723
--bug=1036808 --user=宋昌昌 【项目管理】消息通知-同步缺陷执行完成通知-执行完成同步后未发送通知(所有类型消息都没发送) https://www.tapd.cn/55049933/s/1476724
--bug=1036963 --user=宋昌昌 【缺陷管理】三方全量同步成功后没有找到相应缺陷 https://www.tapd.cn/55049933/s/1476609
This commit is contained in:
song-cc-rock 2024-03-15 21:18:14 +08:00 committed by Craftsman
parent adcab0961c
commit ab88a007d3
10 changed files with 54 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugSyncExtraService.java
View File

@ -15,8 +15,8 @@ public class BugSyncExtraService {
@Resource
private StringRedisTemplate stringRedisTemplate;
private static final String SYNC_THIRD_PARTY_ISSUES_KEY = "ISSUE:SYNC";
private static final String SYNC_THIRD_PARTY_ISSUES_ERROR_KEY = "ISSUE:SYNC:ERROR";
private static final String SYNC_THIRD_PARTY_ISSUES_KEY = "MS:BUG:SYNC";
private static final String SYNC_THIRD_PARTY_ISSUES_ERROR_KEY = "MS:BUG:SYNC:ERROR";
/**
* 设置手动同步缺陷唯一Key

2
backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugSyncNoticeService.java
View File

@ -35,7 +35,7 @@ public class BugSyncNoticeService {
paramMap.put("total", total);
paramMap.put("projectId", projectId);
NoticeModel noticeModel = NoticeModel.builder().operator(currentUser)
.context(template).subject(subject).paramMap(paramMap).event(NoticeConstants.Event.SYNC_COMPLETED).build();
.context(template).subject(subject).paramMap(paramMap).event(NoticeConstants.Event.EXECUTE_COMPLETED).build();
noticeSendService.send(NoticeConstants.TaskType.BUG_SYNC_TASK, noticeModel);
}
}

3
backend/services/system-setting/src/main/java/io/metersphere/system/notice/constants/NoticeConstants.java
View File

@ -207,9 +207,6 @@ public interface NoticeConstants {
@Schema(description = "message.close")
String CLOSE = "CLOSE";
@Schema(description = "message.close")
String SYNC_COMPLETED = "SYNC_COMPLETED";
}
interface RelatedUser {

2
backend/services/system-setting/src/main/java/io/metersphere/system/notice/sender/AbstractNoticeSender.java
View File

@ -251,6 +251,8 @@ public abstract class AbstractNoticeSender implements NoticeSender {
realReceivers.add(receiver);
}
}
} else {
realReceivers = receivers;
}
return realReceivers;
}

16
frontend/src/views/bug-management/components/bug-detail-drawer.vue
View File

@ -332,6 +332,12 @@
}
}
};
const getOptionFromTemplate = (field: CustomFieldItem | undefined) => {
if (field) {
return field.options ? field.options : JSON.parse(field.platformOptionJson);
}
return [];
};
async function loadedBug(detail: BugEditFormObject) {
detailInfo.value = { ...detail };
const { templateId } = detailInfo.value;
@ -354,8 +360,9 @@
const SINGRADIO_TYPE = ['RADIO', 'SELECT', 'MEMBER'];
detail.customFields.forEach((item) => {
if (MULTIPLE_TYPE.includes(item.type)) {
const multipleOptions =
currentCustomFields.value.find((filed: any) => item.id === filed.fieldId)?.options || [];
const multipleOptions = getOptionFromTemplate(
currentCustomFields.value.find((filed: any) => item.id === filed.fieldId)
);
// 如果该值在选项中已经被删除掉
const optionsIds = (multipleOptions || []).map((e: any) => e.value);
if (item.type !== 'MULTIPLE_INPUT') {
@ -372,8 +379,9 @@
tmpObj[item.id] = arr[arr.length - 1];
}
} else if (SINGRADIO_TYPE.includes(item.type)) {
const multipleOptions =
currentCustomFields.value.find((filed: any) => item.id === filed.fieldId)?.options || [];
const multipleOptions = getOptionFromTemplate(
currentCustomFields.value.find((filed: any) => item.id === filed.fieldId)
);
// 如果该值在选项中已经被删除掉
const optionsIds = (multipleOptions || []).map((e: any) => e.value);
const currentDefaultValue = optionsIds.find((e: any) => item.value === e) || '';

20
frontend/src/views/bug-management/edit.vue
View File

@ -371,7 +371,7 @@
if (Array.isArray(arr) && arr.length) {
formRules.value = arr.map((item: any) => {
let initValue = item.defaultValue;
const initOptions = item.options;
const initOptions = item.options ? item.options : JSON.parse(item.platformOptionJson);
if (memberType.includes(item.type)) {
if (item.defaultValue === 'CREATE_USER' || item.defaultValue.includes('CREATE_USER')) {
initValue = item.type === 'MEMBER' ? userStore.id : [userStore.id];
@ -645,6 +645,14 @@
});
scrollIntoView(document.querySelector('.arco-form-item-message'), { block: 'center' });
};
const getOptionFromTemplate = (field: CustomFieldItem | undefined) => {
if (field) {
return field.options ? field.options : JSON.parse(field.platformOptionJson);
}
return [];
};
// 获取详情
const getDetailInfo = async () => {
loading.value = true;
@ -694,8 +702,9 @@
tmpObj[item.id] = '';
// 多选类型需要过滤选项
} else if (MULTIPLE_TYPE.includes(item.type)) {
const multipleOptions =
currentCustomFields.value.find((filed: any) => item.id === filed.fieldId)?.options || [];
const multipleOptions = getOptionFromTemplate(
currentCustomFields.value.find((filed: any) => item.id === filed.fieldId)
);
// 如果该值在选项中已经被删除掉
const optionsIds = (multipleOptions || []).map((e: any) => e.value);
if (item.type !== 'MULTIPLE_INPUT') {
@ -717,8 +726,9 @@
}
// 单选多选项
} else if (SINGRADIO_TYPE.includes(item.type)) {
const multipleOptions =
currentCustomFields.value.find((filed: any) => item.id === filed.fieldId)?.options || [];
const multipleOptions = getOptionFromTemplate(
currentCustomFields.value.find((filed: any) => item.id === filed.fieldId)
);
// 如果该值在选项中已经被删除掉
const optionsIds = (multipleOptions || []).map((e: any) => e.value);
const currentDefaultValue = optionsIds.find((e: any) => item.value === e) || '';

17
frontend/src/views/bug-management/index.vue
View File

@ -164,7 +164,7 @@
class="flex flex-row items-center gap-[8px] rounded-[4px] border-[1px] border-[rgb(var(--primary-5))] bg-[rgb(var(--primary-1))] px-[16px] py-[12px]"
>
<icon-exclamation-circle-fill class="text-[rgb(var(--primary-5))]" />
<div>{{ t('bugManagement.bugAutoSync', { name: '每天00:00:00' }) }}</div>
<div>{{ t('bugManagement.bugAutoSync') }}</div>
</div>
<div class="mb-[8px] mt-[16px]">{{ t('bugManagement.createTime') }}</div>
<div class="flex flex-row gap-[8px]">
@ -306,6 +306,7 @@
// 是否同步完成
const isComplete = ref(false);
const isShowCompleteMsg = ref(false);
// 自定义字段
const customFields = ref<BugEditCustomField[]>([]);
// 当前选择的条数
@ -603,12 +604,17 @@
};
/** 同步缺陷 */
const { pause, resume } = useIntervalFn(() => {
isShowCompleteMsg.value = true;
checkSyncStatus();
}, 1000);
// 初始化组件时关闭
pause();
watchEffect(() => {
if (isComplete.value) {
if (isShowCompleteMsg.value) {
Message.success(t('bugManagement.syncSuccess'));
fetchData();
}
// 同步完成时关闭轮询
pause();
}
@ -622,7 +628,9 @@
try {
// 开源版
await syncBugOpenSource(appStore.currentProjectId);
Message.warning(t('bugManagement.synchronizing'));
isComplete.value = false;
isShowCompleteMsg.value = true;
// 开始轮询
resume();
} catch (error) {
@ -635,11 +643,12 @@
try {
await syncBugEnterprise({
projectId: appStore.currentProjectId,
pre: syncObject.operator === 'lt',
pre: syncObject.operator === 'le',
createTime: syncObject.time,
});
Message.success(t('bugManagement.syncSuccess'));
Message.warning(t('bugManagement.synchronizing'));
isComplete.value = false;
isShowCompleteMsg.value = true;
// 开始轮询
resume();
} catch (error) {
@ -866,4 +875,4 @@
:deep(.arco-divider-vertical) {
margin: 0 8px;
}
</style>
</style>

3
frontend/src/views/bug-management/locale/en-US.ts
View File

@ -19,10 +19,11 @@ export default {
addBug: 'Create Bug',
editBug: 'Edit Bug',
sync: 'Sync',
synchronizing: 'Synchronizing',
syncSuccess: 'Synchronous success',
syncBugTipRowOne: 'Sync third plant bug，',
syncBugTipRowTwo: 'Create bug and sync bug？',
bugAutoSync: 'System {name} auto sync',
bugAutoSync: 'System will auto sync by the project application setting frequency',
syncTime: 'Sync time',
deleteLabel: 'Bug witch created by MeterSphere will in recycle bin and third plant bug will be deleted',
nameIsIncorrect: 'Bug name error',

3
frontend/src/views/bug-management/locale/zh-CN.ts
View File

@ -19,10 +19,11 @@ export default {
createTime: '创建时间',
updateTime: '更新时间',
sync: '同步',
synchronizing: '正在同步中',
syncSuccess: '同步成功',
syncBugTipRowOne: '将第三方的缺陷同步到缺陷管理中，',
syncBugTipRowTwo: '新增缺陷和更新已有的缺陷？',
bugAutoSync: '系统 {name} 自动同步',
bugAutoSync: '系统将按照项目应用设置频率自动同步',
syncTime: '同步时间',
deleteLabel: '删除后，MeterSphere 创建的缺陷进入回收站；第三方平台同步的缺陷将不做回收',
nameIsIncorrect: '缺陷名称不正确',

8
frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue
View File

@ -15,7 +15,7 @@
@confirm="handleConfirm"
>
<a-form ref="formRef" class="rounded-[4px]" :model="form" layout="vertical">
<a-form-item field="platformKey" :label="t('project.menu.platformLabel')">
<a-form-item field="PLATFORM_KEY" :label="t('project.menu.platformLabel')">
<a-select
v-model="form.PLATFORM_KEY"
allow-clear
@ -250,11 +250,13 @@
await initPlatformOption();
const res = await getBugSyncInfo(currentProjectId.value);
if (res && res.platform_key) {
form.SYNC_ENABLE = res.sync_enable;
form.PLATFORM_KEY = res.platform_key;
formCreateValue.value = JSON.parse(res.bug_platform_config);
// 如果平台key存在调用平台change拉取插件字段
await handlePlatformChange(res.platform_key);
form.SYNC_ENABLE = res.sync_enable;
form.PLATFORM_KEY = res.platform_key;
form.MECHANISM = res.mechanism;
form.CRON_EXPRESSION = res.cron_expression;
}
} catch (e) {
// eslint-disable-next-line no-console