Skip to content

Commit e46b0e6

Browse files
authored
fix: issues custom fields interface params optimization (#4034)
1 parent 7136acc commit e46b0e6

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

shell/app/modules/org/pages/projects/issue-field-manage.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ const IssueFieldManage = () => {
9696
...filterData,
9797
propertyIssueType: 'COMMON',
9898
orgID,
99-
...(projectId ? { onlyProject: true } : { scopeType: 'org' }),
99+
...(projectId ? { onlyCurrentScopeType: 'true' } : { scopeType: 'org' }),
100100
});
101101
},
102102
[deleteFieldItem, filterData, getFieldsByIssue, orgID],
@@ -198,7 +198,7 @@ const IssueFieldManage = () => {
198198
...query,
199199
propertyIssueType: 'COMMON',
200200
orgID,
201-
...(projectId ? { onlyProject: true } : { scopeType: 'org' }),
201+
...(projectId ? { onlyCurrentScopeType: 'true' } : { scopeType: 'org' }),
202202
});
203203
};
204204

@@ -217,7 +217,7 @@ const IssueFieldManage = () => {
217217
...filterData,
218218
propertyIssueType: 'COMMON',
219219
orgID,
220-
...(projectId ? { onlyProject: true } : { scopeType: 'org' }),
220+
...(projectId ? { onlyCurrentScopeType: 'true' } : { scopeType: 'org' }),
221221
});
222222
}, [filterData, formData, getFieldsByIssue, getSpecialField, onClose, orgID]);
223223

@@ -246,7 +246,7 @@ const IssueFieldManage = () => {
246246
...filterData,
247247
propertyIssueType: 'COMMON',
248248
orgID,
249-
...(projectId ? { onlyProject: true } : { scopeType: 'org' }),
249+
...(projectId ? { onlyCurrentScopeType: 'true' } : { scopeType: 'org' }),
250250
});
251251
}}
252252
columns={columns}

shell/app/modules/org/pages/projects/issue-field-setting-modal.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ export const IssueFieldSettingModal = ({ visible, issueType = 'EPIC', closeModal
5050
getFieldOptions({
5151
propertyIssueType: 'COMMON',
5252
orgID,
53-
...(projectId ? { scopeType: 'project', scopeID: projectId, onlyProject: true } : { scopeType: 'org' }),
53+
...(projectId
54+
? { scopeType: 'project', scopeID: projectId, onlyCurrentScopeType: 'true' }
55+
: { scopeType: 'org' }),
5456
}).then(({ data }) => {
5557
updater.filedOptions(data || []);
5658
});
@@ -68,7 +70,7 @@ export const IssueFieldSettingModal = ({ visible, issueType = 'EPIC', closeModal
6870
getFieldsByIssue({
6971
propertyIssueType: issueType,
7072
orgID,
71-
...(projectId ? { onlyProject: true } : { scopeType: 'org' }),
73+
...(projectId ? { onlyCurrentScopeType: 'true' } : { scopeType: 'org' }),
7274
});
7375
}, [addFieldItem, getFieldsByIssue, issueType, orgID, selectedField, update]);
7476

@@ -95,7 +97,7 @@ export const IssueFieldSettingModal = ({ visible, issueType = 'EPIC', closeModal
9597
getFieldsByIssue({
9698
propertyIssueType: issueType,
9799
orgID,
98-
...(projectId ? { onlyProject: true } : { scopeType: 'org' }),
100+
...(projectId ? { onlyCurrentScopeType: 'true' } : { scopeType: 'org' }),
99101
});
100102
}
101103
},
@@ -108,7 +110,7 @@ export const IssueFieldSettingModal = ({ visible, issueType = 'EPIC', closeModal
108110
getFieldsByIssue({
109111
propertyIssueType: issueType,
110112
orgID,
111-
...(projectId ? { onlyProject: true } : { scopeType: 'org' }),
113+
...(projectId ? { onlyCurrentScopeType: 'true' } : { scopeType: 'org' }),
112114
});
113115
},
114116
[deleteFieldItem, getFieldsByIssue, issueType, orgID],

shell/app/modules/org/pages/projects/issue-type-manage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const IssueTypeManage = () => {
6969
getFieldsByIssue({
7070
propertyIssueType: item.type,
7171
orgID,
72-
...(projectId ? { onlyProject: true } : { scopeType: 'org' }),
72+
...(projectId ? { onlyCurrentScopeType: 'true' } : { scopeType: 'org' }),
7373
});
7474
update({
7575
modalVisible: true,

shell/app/modules/org/stores/issue-field.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const issueFieldStore = createStore({
7979
const { issueType } = payload;
8080
let list = await call(
8181
getSpecialFieldOptions,
82-
addProjectId(projectId)({ ...payload, ...(projectId ? { onlyProject: true } : {}) }),
82+
addProjectId(projectId)({ ...payload, ...(projectId ? { onlyCurrentScopeType: 'true' } : {}) }),
8383
);
8484
list = list || [];
8585
if (issueType === ISSUE_TYPE.BUG) {

0 commit comments

Comments
 (0)