The Unified and Autonomous Development Platform
feat: Hide "Create Workspaces"when Code privilege is set to Write (OD-2884)
Robin Shen91457af05e01
diff --git a/server-core/src/main/java/io/onedev/server/ai/BuildSpecSchema.java b/server-core/src/main/java/io/onedev/server/ai/BuildSpecSchema.javaindex 4b9b906b2f..c77e64302c 100644--- a/server-core/src/main/java/io/onedev/server/ai/BuildSpecSchema.java+++ b/server-core/src/main/java/io/onedev/server/ai/BuildSpecSchema.java@@ -213,15 +213,15 @@ public class BuildSpecSchema {bean = newBean(beanClass);}- var dependents = new ArrayList<Pair<PropertyDescriptor, DependsOn>>();+ var dependents = new ArrayList<Pair<PropertyDescriptor, DependsOn[]>>();for (var groupProperties: beanDescriptor.getProperties().values()) {for (var property: groupProperties) {if (!excludedProperties.contains(property.getPropertyName()) && processedProperties.add(property.getPropertyName())) {if (property.getPropertyName().equals("type"))throw new ExplicitException("Property 'type' is reserved (class: " + beanClass.getName() + ")");- var dependsOn = property.getPropertyGetter().getAnnotation(DependsOn.class);- if (dependsOn != null) {- dependents.add(new Pair<>(property, dependsOn));+ var dependsOns = property.getPropertyGetter().getAnnotationsByType(DependsOn.class);+ if (dependsOns.length != 0) {+ dependents.add(new Pair<>(property, dependsOns));} else {if (property.isPropertyRequired())requiredNode.add(property.getPropertyName());@@ -238,61 +238,21 @@ public class BuildSpecSchema {for (var dependent: dependents) {var allOfItemNode = new HashMap<String, Object>();allOfNode.add(allOfItemNode);- var dependsOn = dependent.getRight();- var dependencyProperty = propertyMap.get(dependsOn.property());- if (dependencyProperty == null)- throw new ExplicitException("Dependency property not found: " + dependsOn.property());+ var dependsOns = dependent.getRight();var ifNode = new HashMap<String, Object>();allOfItemNode.put("if", ifNode);- var ifPropsNode = new HashMap<String, Object>();- ifNode.put("properties", ifPropsNode);- var dependencyPropertyNode = new HashMap<String, Object>();- ifPropsNode.put(dependencyProperty.getPropertyName(), dependencyPropertyNode);-- var inverse = dependsOn.inverse();- var dependencyPropertyClass = dependencyProperty.getPropertyClass();- if (dependencyPropertyClass == boolean.class) {- if (dependsOn.value().length() != 0) {- dependencyPropertyNode.put("const", Boolean.parseBoolean(dependsOn.value()));- } else {- dependencyPropertyNode.put("const", true);- }- } else if (dependencyPropertyClass == int.class || dependencyPropertyClass == long.class- || dependencyPropertyClass == double.class || dependencyPropertyClass == float.class) {- if (dependsOn.value().length() != 0) {- dependencyPropertyNode.put("const", Integer.parseInt(dependsOn.value()));- } else {- dependencyPropertyNode.put("const", 0);- inverse = !inverse;- }- } else {- if (dependsOn.value().length() != 0) {- if (dependencyPropertyClass == Boolean.class)- dependencyPropertyNode.put("const", Boolean.parseBoolean(dependsOn.value()));- else if (dependencyPropertyClass == Integer.class || dependencyPropertyClass == Long.class || dependencyPropertyClass == Double.class || dependencyPropertyClass == Float.class)- dependencyPropertyNode.put("const", Integer.parseInt(dependsOn.value()));- else- dependencyPropertyNode.put("const", dependsOn.value());- } else {- var typeList = new ArrayList<String>();- typeList.add("object");- typeList.add("string");- typeList.add("integer");- typeList.add("number");- typeList.add("boolean");- dependencyPropertyNode.put("type", typeList);- }+ var ifAllOfNode = new ArrayList<Map<String, Object>>();+ ifNode.put("allOf", ifAllOfNode);+ for (var dependsOn: dependsOns) {+ var dependencyProperty = propertyMap.get(dependsOn.property());+ if (dependencyProperty == null)+ throw new ExplicitException("Dependency property not found: " + dependsOn.property());+ ifAllOfNode.add(buildDependsOnCondition(dependsOn, dependencyProperty));}- Map<String, Object> branchNode;- if (!inverse) {- branchNode = new HashMap<>();- allOfItemNode.put("then", branchNode);- } else {- branchNode = new HashMap<>();- allOfItemNode.put("else", branchNode);- }+ var branchNode = new HashMap<String, Object>();+ allOfItemNode.put("then", branchNode);var property = dependent.getLeft();var branchPropsNode = new HashMap<String, Object>();@@ -314,6 +274,56 @@ public class BuildSpecSchema {currentNode.put("required", requiredNode);}+ private static Map<String, Object> buildDependsOnCondition(DependsOn dependsOn, PropertyDescriptor dependencyProperty) {+ var dependencyPropertyNode = new HashMap<String, Object>();+ var inverse = dependsOn.inverse();+ var dependencyPropertyClass = dependencyProperty.getPropertyClass();+ if (dependencyPropertyClass == boolean.class) {+ if (dependsOn.value().length() != 0) {+ dependencyPropertyNode.put("const", Boolean.parseBoolean(dependsOn.value()));+ } else {+ dependencyPropertyNode.put("const", true);+ }+ } else if (dependencyPropertyClass == int.class || dependencyPropertyClass == long.class+ || dependencyPropertyClass == double.class || dependencyPropertyClass == float.class) {+ if (dependsOn.value().length() != 0) {+ dependencyPropertyNode.put("const", Integer.parseInt(dependsOn.value()));+ } else {+ dependencyPropertyNode.put("const", 0);+ inverse = !inverse;+ }+ } else {+ if (dependsOn.value().length() != 0) {+ if (dependencyPropertyClass == Boolean.class)+ dependencyPropertyNode.put("const", Boolean.parseBoolean(dependsOn.value()));+ else if (dependencyPropertyClass == Integer.class || dependencyPropertyClass == Long.class || dependencyPropertyClass == Double.class || dependencyPropertyClass == Float.class)+ dependencyPropertyNode.put("const", Integer.parseInt(dependsOn.value()));+ else+ dependencyPropertyNode.put("const", dependsOn.value());+ } else {+ var typeList = new ArrayList<String>();+ typeList.add("object");+ typeList.add("string");+ typeList.add("integer");+ typeList.add("number");+ typeList.add("boolean");+ dependencyPropertyNode.put("type", typeList);+ }+ }++ var matchNode = new HashMap<String, Object>();+ var ifPropsNode = new HashMap<String, Object>();+ matchNode.put("properties", ifPropsNode);+ ifPropsNode.put(dependencyProperty.getPropertyName(), dependencyPropertyNode);+ if (!inverse) {+ return matchNode;+ } else {+ var notNode = new HashMap<String, Object>();+ notNode.put("not", matchNode);+ return notNode;+ }+ }+@SuppressWarnings({ "rawtypes", "unchecked" })private static void processType(Map<String, Object> currentNode, Class<?> type) {if (type == String.class) {diff --git a/server-core/src/main/java/io/onedev/server/annotation/DependsOn.java b/server-core/src/main/java/io/onedev/server/annotation/DependsOn.javaindex 9377e127a7..4618c49025 100644--- a/server-core/src/main/java/io/onedev/server/annotation/DependsOn.java+++ b/server-core/src/main/java/io/onedev/server/annotation/DependsOn.java@@ -1,12 +1,14 @@package io.onedev.server.annotation;import java.lang.annotation.ElementType;+import java.lang.annotation.Repeatable;import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;@Retention(RetentionPolicy.RUNTIME)@Target({ElementType.TYPE, ElementType.METHOD})+@Repeatable(DependsOnList.class)public @interface DependsOn {String property();diff --git a/server-core/src/main/java/io/onedev/server/annotation/DependsOnList.java b/server-core/src/main/java/io/onedev/server/annotation/DependsOnList.javanew file mode 100644index 0000000000..ebaa722378--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/annotation/DependsOnList.java@@ -0,0 +1,14 @@+package io.onedev.server.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++@Retention(RetentionPolicy.RUNTIME)+@Target({ElementType.TYPE, ElementType.METHOD})+public @interface DependsOnList {++ DependsOn[] value();++}diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.javaindex 92101b65d8..d4e6d1fb6f 100644--- a/server-core/src/main/java/io/onedev/server/model/Role.java+++ b/server-core/src/main/java/io/onedev/server/model/Role.java@@ -98,10 +98,6 @@ public class Role extends AbstractEntity implements BasePermission {private boolean managePullRequests;private boolean manageCodeComments;-- private boolean manageWorkspaces;-- private boolean createWorkspaces;private CodePrivilege codePrivilege = CodePrivilege.NONE;@@ -132,6 +128,10 @@ public class Role extends AbstractEntity implements BasePermission {@Lob@Column(length=65535, nullable=false)private ArrayList<JobPrivilege> jobPrivileges = new ArrayList<>();++ private boolean manageWorkspaces;++ private boolean createWorkspaces;@OneToMany(mappedBy="role", cascade=CascadeType.REMOVE)@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@@ -198,7 +198,8 @@ public class Role extends AbstractEntity implements BasePermission {}@Editable(order=300, description="Specify the code privilege for the role. The Write permission implies CreateWorkspaces permission")- @ShowCondition("isCodePrivilegeVisible")+ @DependsOn(property="managePullRequests", value="false")+ @DependsOn(property="manageCodeComments", value="false")@NotNullpublic CodePrivilege getCodePrivilege() {return codePrivilege;@@ -225,32 +226,6 @@ public class Role extends AbstractEntity implements BasePermission {this.managePullRequests = managePullRequests;}- @Editable(order=255, name="Workspace Management", description="""- Workspace administrative permission inside a project, including batch operations- over multiple workspaces including batch operations over multiple workspaces.- This permission implies WriteCode permission.""")- @DependsOn(property="manageProject", value="false")- public boolean isManageWorkspaces() {- return manageWorkspaces;- }-- public void setManageWorkspaces(boolean manageWorkspaces) {- this.manageWorkspaces = manageWorkspaces;- }-- @Editable(order=257, name="Create Workspaces", description="""- Create workspaces on any commit or branch under a project.- This permission implies the permission to read code.- """)- @DependsOn(property="manageWorkspaces", value="false")- public boolean isCreateWorkspaces() {- return createWorkspaces;- }-- public void setCreateWorkspaces(boolean createWorkspaces) {- this.createWorkspaces = createWorkspaces;- }-@Editable(order=260, name="Code Comment Management", description="Code comment administrative permission inside a project, "+ "including batch operations over multiple code comments")@DependsOn(property="manageProject", value="false")@@ -400,6 +375,33 @@ public class Role extends AbstractEntity implements BasePermission {this.jobPrivileges = (ArrayList<JobPrivilege>) jobPrivileges;}+ @Editable(order=800, name="Workspace Management", description="""+ Workspace administrative permission inside a project, including batch operations+ over multiple workspaces including batch operations over multiple workspaces.+ This permission implies WriteCode permission.""")+ @DependsOn(property="manageProject", value="false")+ public boolean isManageWorkspaces() {+ return manageWorkspaces;+ }++ public void setManageWorkspaces(boolean manageWorkspaces) {+ this.manageWorkspaces = manageWorkspaces;+ }++ @Editable(order=900, name="Create Workspaces", description="""+ Create workspaces on any commit or branch under a project.+ This permission implies the permission to read code.+ """)+ @DependsOn(property="manageWorkspaces", value="false")+ @DependsOn(property="codePrivilege", value="WRITE", inverse=true)+ public boolean isCreateWorkspaces() {+ return createWorkspaces;+ }++ public void setCreateWorkspaces(boolean createWorkspaces) {+ this.createWorkspaces = createWorkspaces;+ }+public Collection<BaseAuthorization> getBaseAuthorizations() {return baseAuthorizations;}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.javaindex 6b2c68e9a0..d5809afd3d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java@@ -171,8 +171,7 @@ public class PropertyDescriptor implements Serializable {ShowCondition showCondition = getPropertyGetter().getAnnotation(ShowCondition.class);if (showCondition != null && !(boolean)ReflectionUtils.invokeStaticMethod(getBeanClass(), showCondition.value()))return false;- DependsOn dependsOn = getPropertyGetter().getAnnotation(DependsOn.class);- if (dependsOn != null) {+ for (DependsOn dependsOn : getPropertyGetter().getAnnotationsByType(DependsOn.class)) {var dependencyProperty = beanDescriptor.getProperty(dependsOn.property());if (dependencyProperty == null) {throw new ExplicitException("Dependency property not found: " + dependsOn.property());diff --git a/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java b/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.javaindex 1c154aa6e0..56af0ed8c5 100644--- a/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java+++ b/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java@@ -1349,8 +1349,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {if (getter == null) {throw new ExplicitException("Getter not found for property: " + propertyName);}- var dependsOn = getter.getAnnotation(DependsOn.class);- if (dependsOn != null) {+ for (var dependsOn : getter.getAnnotationsByType(DependsOn.class)) {var dependencyGetter = BeanUtils.findGetter(bean.getClass(), dependsOn.property());if (dependencyGetter == null) {throw new ExplicitException("Getter not found for property: " + dependsOn.property());@@ -1478,8 +1477,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {if (getter == null) {throw new ExplicitException("Getter not found for property: " + propertyName);}- DependsOn dependsOn = getter.getAnnotation(DependsOn.class);- if (dependsOn != null) {+ for (DependsOn dependsOn : getter.getAnnotationsByType(DependsOn.class)) {Method dependencyGetter = BeanUtils.findGetter(bean.getClass(), dependsOn.property());if (dependencyGetter == null) {throw new ExplicitException("Getter not found for property: " + dependsOn.property());@@ -1504,7 +1502,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {try {return getter.invoke(bean);} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {- throw new ExplicitException("Error invoking getter for property: " + dependsOn.property(), e);+ throw new ExplicitException("Error invoking getter for property: " + name, e);}}});