The Unified and Autonomous Development Platform
fix: Unable to decide default issue field value based on value of another field (OD-2848)
Robin Shen6d1b0475c310
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex 0f69769bb1..5afb093b5c 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -1098,7 +1098,7 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupporttry {var fieldBean = FieldUtils.getFieldBeanClass().getConstructor().newInstance();var existingFieldNames = getFieldNames();- var fieldValues = FieldUtils.getFieldValues(null, fieldBean, fieldNames);+ var fieldValues = FieldUtils.getFieldValues(fieldBean, fieldNames);for (var entry: fieldValues.entrySet()) {if (!existingFieldNames.contains(entry.getKey()))setFieldValue(entry.getKey(), entry.getValue());diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.javaindex c6b5921b5d..c774c6fcd6 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java@@ -50,7 +50,7 @@ public class GroovyScript implements Serializable {this.name = name;}- @Editable(order=300)+ @Editable(order=300, description="Define content of the <a href='https://groovy-lang.org' target='_blank'>groovy script</a>")@Code(language = Code.GROOVY)@Size(min=1, message="May not be empty")public List<String> getContent() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.javaindex 38d0a32787..1c54d0d6a9 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java@@ -107,9 +107,8 @@ public class FieldUtils {return null;}- public static Map<String, Object> getFieldValues(@Nullable ComponentContext context, Serializable fieldBean, Collection<String> fieldNames) {- if (context != null)- ComponentContext.push(context);+ public static Map<String, Object> getFieldValues(Serializable fieldBean, Collection<String> fieldNames) {+ ComponentContext.push(newBeanComponentContext(new BeanDescriptor(fieldBean.getClass()), fieldBean));try {Map<String, Object> fieldValues = new HashMap<>();BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());@@ -122,8 +121,7 @@ public class FieldUtils {return fieldValues;} finally {- if (context != null)- ComponentContext.pop();+ ComponentContext.pop();}}diff --git a/server-core/src/main/java/io/onedev/server/service/UserService.java b/server-core/src/main/java/io/onedev/server/service/UserService.javaindex 8ca0e6d04c..10c29e264a 100644--- a/server-core/src/main/java/io/onedev/server/service/UserService.java+++ b/server-core/src/main/java/io/onedev/server/service/UserService.java@@ -87,6 +87,9 @@ public interface UserService extends EntityService<User> {@NullableUserFacade findFacadeById(Long userId);++ @Nullable+ UserFacade findFacadeByName(String userName);@NullableUser findByFullName(String fullName);diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.javaindex 7184f55cea..43018f43b3 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java@@ -540,6 +540,11 @@ public class DefaultUserService extends BaseEntityService<User> implements UserSreturn null;}+ @Override+ public UserFacade findFacadeByName(String userName) {+ return cache.findByName(userName);+ }+@Overridepublic UserFacade findFacadeById(Long userId) {return cache.get(userId);diff --git a/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.java b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.javaindex 8c56798b98..9a320911bd 100644--- a/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.java+++ b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.java@@ -28,7 +28,7 @@ public class EmailAddressCache extends MapProxy<Long, EmailAddressFacade> {value = value.toLowerCase();var serviceOrAiAccountName = User.getServiceOrAiAccountName(value);if (serviceOrAiAccountName != null) {- var serviceOrAiAccount = OneDev.getInstance(UserService.class).findByName(serviceOrAiAccountName);+ var serviceOrAiAccount = OneDev.getInstance(UserService.class).findFacadeByName(serviceOrAiAccountName);if (serviceOrAiAccount != null)return new EmailAddressFacade(null, serviceOrAiAccount.getId(), value, true, true, true, null);elsediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex a413c56a4c..f392cbdcab 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -9,8 +9,6 @@ import java.util.Date;import java.util.List;import java.util.UUID;-import org.jspecify.annotations.Nullable;-import org.apache.commons.lang3.StringUtils;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.CallbackParameter;@@ -34,6 +32,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.util.convert.ConversionException;import org.apache.wicket.validation.IValidationError;import org.apache.wicket.validation.IValidator;+import org.jspecify.annotations.Nullable;import org.unbescape.javascript.JavaScriptEscape;import com.google.common.base.Objects;@@ -43,8 +42,6 @@ import io.onedev.server.attachment.AttachmentSupport;import io.onedev.server.attachment.ProjectAttachmentSupport;import io.onedev.server.buildspecmodel.inputspec.InputContext;import io.onedev.server.buildspecmodel.inputspec.InputSpec;-import io.onedev.server.service.IssueService;-import io.onedev.server.service.SettingService;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.Iteration;@@ -56,7 +53,8 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.search.entitytext.IssueTextService;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.ComponentContext;+import io.onedev.server.service.IssueService;+import io.onedev.server.service.SettingService;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;@@ -109,7 +107,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementSerializable fieldBean = issue.getFieldBean(fieldBeanClass, true);var fieldNames = getIssueSetting().getPromptFieldsUponIssueOpen(getProject());- issue.setFieldValues(FieldUtils.getFieldValues(new ComponentContext(this), fieldBean,+ issue.setFieldValues(FieldUtils.getFieldValues(fieldBean,FieldUtils.getEditableFields(getProject(), fieldNames)));titleInput = new TextField<>("title", Model.of(""));@@ -411,8 +409,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementfieldEditor.convertInput();var fieldNames = getIssueSetting().getPromptFieldsUponIssueOpen(getProject());- issue.setFieldValues(FieldUtils.getFieldValues(fieldEditor.newComponentContext(),- fieldEditor.getConvertedInput(), fieldNames));+ issue.setFieldValues(FieldUtils.getFieldValues(fieldEditor.getConvertedInput(), fieldNames));iterationChoice.convertInput();issue.getSchedules().clear();diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex b46a7fe60f..eeeca91932 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -183,9 +183,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext, Pro@Overrideprotected String onSave(AjaxRequestTarget target, Serializable bean) {- fieldValues.putAll(FieldUtils.getFieldValues(- FieldUtils.newBeanComponentContext(beanDescriptor, bean),- bean, FieldUtils.getEditableFields(getProject(), dependentFields)));+ fieldValues.putAll(FieldUtils.getFieldValues(bean, FieldUtils.getEditableFields(getProject(), dependentFields)));var user = SecurityUtils.getUser();issueChangeService.changeFields(user, getIssue(), fieldValues);notifyObservablesChange(target);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex dbefe8a9d9..a6e3e11419 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -311,8 +311,7 @@ abstract class BatchEditPanel extends Panel implements InputContext {iterations = null;}- Map<String, Object> fieldValues = FieldUtils.getFieldValues(customFieldsEditor.newComponentContext(),- customFieldsBean, selectedFields);+ Map<String, Object> fieldValues = FieldUtils.getFieldValues(customFieldsBean, selectedFields);try {var user = SecurityUtils.getUser();OneDev.getInstance(IssueChangeService.class).batchUpdate(diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.javaindex c0ac8b4334..b3bea9bff2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java@@ -107,8 +107,7 @@ public abstract class TransitionOptionPanel extends Panel implements InputContexCollection<String> editableFields = FieldUtils.getEditableFields(getIssue().getProject(), getTransition().getPromptFields());- Map<String, Object> fieldValues = FieldUtils.getFieldValues(- editor.newComponentContext(), fieldBean, editableFields);+ Map<String, Object> fieldValues = FieldUtils.getFieldValues(fieldBean, editableFields);onTransit(target, fieldValues, comment);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex a7bce9f8b4..f2b304fd62 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -497,9 +497,7 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {@Overrideprotected String onSave(AjaxRequestTarget target, Serializable bean) {- fieldValues.putAll(FieldUtils.getFieldValues(- FieldUtils.newBeanComponentContext(beanDescriptor, bean),- bean, FieldUtils.getEditableFields(getProject(), dependentFields)));+ fieldValues.putAll(FieldUtils.getFieldValues(bean, FieldUtils.getEditableFields(getProject(), dependentFields)));close();Issue issue = getIssueService().load(issueId);getIssueChangeService().changeFields(SecurityUtils.getUser(), issue, fieldValues);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.javaindex 68a6c615eb..a650ea2597 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java@@ -59,8 +59,7 @@ abstract class StateTransitionPanel extends Panel implements InputContext {Collection<String> editableFields = FieldUtils.getEditableFields(getIssue().getProject(), transition.getPromptFields());- Map<String, Object> fieldValues = FieldUtils.getFieldValues(- editor.newComponentContext(), fieldBean, editableFields);+ Map<String, Object> fieldValues = FieldUtils.getFieldValues(fieldBean, editableFields);OneDev.getInstance(IssueChangeService.class).changeState(SecurityUtils.getUser(), getIssue(),getToState(), fieldValues, transition.getPromptFields(), transition.getRemoveFields(), null);onSaved(target);