It is now possible to define whether the single control is readonly o…

…r not Modifiable property of control can be also controlled with conditions
RHarryH · Feb 4, 2024 · 57fb891 · 57fb891
1 parent 2b8db02
commit 57fb891
Show file tree

Hide file tree

Showing 21 changed files with 155 additions and 65 deletions.
diff --git a/...java/com/avispa/ecm/model/configuration/propertypage/content/control/PropertyControl.java b/...java/com/avispa/ecm/model/configuration/propertypage/content/control/PropertyControl.java
@@ -33,4 +33,5 @@ public abstract class PropertyControl extends Control {
     private Object value;
     private CustomValidation customValidation;
     private boolean required;
+    private boolean readonly;
 }
diff --git a/.../avispa/ecm/model/configuration/propertypage/content/control/constraints/Constraints.java b/.../avispa/ecm/model/configuration/propertypage/content/control/constraints/Constraints.java
@@ -29,4 +29,5 @@
 public class Constraints {
     private Constraint visibility;
     private Constraint requirement;
+    private Constraint modifiable;
 }
diff --git a/...in/java/com/avispa/ecm/model/configuration/propertypage/content/mapper/ControlMapper.java b/...in/java/com/avispa/ecm/model/configuration/propertypage/content/mapper/ControlMapper.java
@@ -20,11 +20,9 @@
 
 import com.avispa.ecm.model.configuration.propertypage.content.control.Control;
 
-import java.util.List;
-
 /**
  * @author Rafał Hiszpański
  */
 interface ControlMapper<C extends Control> {
-    void processControl(C control, List<String> fillBlacklist, Object context);
+    void processControl(C control, PropertyPageMapperConfigurer configurer, Object context);
 }
diff --git a/...va/com/avispa/ecm/model/configuration/propertypage/content/mapper/PropertyPageMapper.java b/...va/com/avispa/ecm/model/configuration/propertypage/content/mapper/PropertyPageMapper.java
@@ -56,7 +56,7 @@ public PropertyPageContent convertToContent(PropertyPageMapperConfigurer configu
         propertyPageContent.setContext(configurer.getContext());
         propertyPageContent.setId(propertyPage.getId());
 
-        processControls(propertyPageContent.getControls(), configurer.getFillBlacklist(), context);
+        processControls(propertyPageContent.getControls(), configurer, context);
 
         return propertyPageContent;
     }
@@ -81,20 +81,20 @@ private Optional<PropertyPageContent> getPropertyPageContent(Content content) {
         return Optional.empty();
     }
 
-    private void processControls(List<Control> controls, List<String> fillBlacklist, Object context) {
+    private void processControls(List<Control> controls, PropertyPageMapperConfigurer configurer, Object context) {
         for(Control control : controls) {
             if (control instanceof Columns columns) {
-                processControls(columns.getControls(), fillBlacklist, context);
+                processControls(columns.getControls(), configurer, context);
             } else if (control instanceof Group group) {
-                processControls(group.getControls(), fillBlacklist, context);
+                processControls(group.getControls(), configurer, context);
             } else if (control instanceof Tabs tabs) {
                 for(Tab tab : tabs.getTabs()) {
-                    processControls(tab.getControls(), fillBlacklist, context);
+                    processControls(tab.getControls(), configurer, context);
                 }
             } else if (control instanceof Table table) {
-                tableMapper.processControl(table, fillBlacklist, context);
+                tableMapper.processControl(table, configurer, context);
             } else {
-                simpleControlMapper.processControl(control, fillBlacklist, context);
+                simpleControlMapper.processControl(control, configurer, context);
             }
         }
     }

diff --git a/...spa/ecm/model/configuration/propertypage/content/mapper/PropertyPageMapperConfigurer.java b/...spa/ecm/model/configuration/propertypage/content/mapper/PropertyPageMapperConfigurer.java
@@ -51,4 +51,8 @@ public static PropertyPageMapperConfigurer edit() {
     private static PropertyPageMapperConfigurer writable(PropertyPageContext context, List<String> ignoredFields) {
         return new PropertyPageMapperConfigurer(context, ignoredFields);
     }
+
+    public boolean isReadonly() {
+        return context == PropertyPageContext.READONLY;
+    }
 }
diff --git a/...a/com/avispa/ecm/model/configuration/propertypage/content/mapper/SimpleControlMapper.java b/...a/com/avispa/ecm/model/configuration/propertypage/content/mapper/SimpleControlMapper.java
@@ -48,7 +48,7 @@ class SimpleControlMapper extends BaseControlsMapper<Control> {
         this.displayService = displayService;
     }
 
-    public void processControl(Control control, List<String> fillBlacklist, Object context) {
+    public void processControl(Control control, PropertyPageMapperConfigurer configurer, Object context) {
         if (control instanceof Label label) {
             try {
                 label.setExpression(expressionResolver.resolve(context, label.getExpression()));
@@ -60,6 +60,11 @@ public void processControl(Control control, List<String> fillBlacklist, Object c
                 propertyControl.setLabel(displayService.getDisplayValueFromAnnotation(context.getClass(), propertyControl.getProperty()));
             }
 
+            // mark all controls as readonly if property page is in readonly mode
+            if (configurer.isReadonly()) {
+                propertyControl.setReadonly(true);
+            }
+
             if (control instanceof ComboRadio comboRadio) {
                 if (comboRadio.getLoadSettings() instanceof DynamicLoad dynamicLoad) {
                     try {
@@ -71,7 +76,7 @@ public void processControl(Control control, List<String> fillBlacklist, Object c
                 comboRadio.setOptions(dictionaryControlLoader.loadDictionary(comboRadio, context));
             }
 
-            fillPropertyValue(propertyControl, fillBlacklist, context);
+            fillPropertyValue(propertyControl, configurer.getFillBlacklist(), context);
         }
     }
 

diff --git a/...main/java/com/avispa/ecm/model/configuration/propertypage/content/mapper/TableMapper.java b/...main/java/com/avispa/ecm/model/configuration/propertypage/content/mapper/TableMapper.java
@@ -45,7 +45,7 @@ class TableMapper extends BaseControlsMapper<Table> {
         super(dictionaryControlLoader);
     }
 
-    public void processControl(Table table, List<String> fillBlacklist, Object context) {
+    public void processControl(Table table, PropertyPageMapperConfigurer configurer, Object context) {
         Class<?> tableRowClass = getTableRowClass(table, context.getClass());
 
         table.getControls().stream()
@@ -61,16 +61,28 @@ public void processControl(Table table, List<String> fillBlacklist, Object conte
                     comboRadio.setOptions(dictionaryControlLoader.loadDictionary(comboRadio, tableRowClass));
                 });
 
-        // table controls except for checkboxes are always required
+        // mark table as readonly if property page is in readonly mode
+        if (configurer.isReadonly()) {
+            table.setReadonly(true);
+        }
+
         table.getControls()
-                .forEach(control -> control.setRequired(!(control instanceof Checkbox)));
+                .forEach(control -> {
+                    // table controls except for checkboxes are always required
+                    control.setRequired(!(control instanceof Checkbox));
 
-        // always add row id
-        Hidden hidden = new Hidden();
-        hidden.setProperty("id");
-        table.getControls().add(hidden);
+                    // rewrite readonly value to the whole table
+                    control.setReadonly(table.isReadonly());
+                });
+
+        // add row id when table is not readonly
+        if (!table.isReadonly()) {
+            Hidden hidden = new Hidden();
+            hidden.setProperty("id");
+            table.getControls().add(hidden);
+        }
 
-        fillPropertyValue(table, fillBlacklist, context);
+        fillPropertyValue(table, configurer.getFillBlacklist(), context);
     }
 
     /**

diff --git a/src/main/resources/json-schemas/control/checkbox.json b/src/main/resources/json-schemas/control/checkbox.json
@@ -11,6 +11,9 @@
     "required": {
       "type": "boolean"
     },
+    "readonly": {
+      "type": "boolean"
+    },
     "constraints": {
       "$ref": "../property/constraints.json#"
     }

diff --git a/src/main/resources/json-schemas/control/combo.json b/src/main/resources/json-schemas/control/combo.json
@@ -11,6 +11,9 @@
     "required": {
       "type": "boolean"
     },
+    "readonly": {
+      "type": "boolean"
+    },
     "constraints": {
       "$ref": "../property/constraints.json#"
     }

diff --git a/src/main/resources/json-schemas/control/date.json b/src/main/resources/json-schemas/control/date.json
@@ -11,6 +11,9 @@
     "required": {
       "type": "boolean"
     },
+    "readonly": {
+      "type": "boolean"
+    },
     "constraints": {
       "$ref": "../property/constraints.json#"
     }

diff --git a/src/main/resources/json-schemas/control/datetime.json b/src/main/resources/json-schemas/control/datetime.json
@@ -11,6 +11,9 @@
     "required": {
       "type": "boolean"
     },
+    "readonly": {
+      "type": "boolean"
+    },
     "constraints": {
       "$ref": "../property/constraints.json#"
     }

diff --git a/src/main/resources/json-schemas/control/money.json b/src/main/resources/json-schemas/control/money.json
@@ -11,6 +11,9 @@
     "required": {
       "type": "boolean"
     },
+    "readonly": {
+      "type": "boolean"
+    },
     "constraints": {
       "$ref": "../property/constraints.json#"
     }

diff --git a/src/main/resources/json-schemas/control/number.json b/src/main/resources/json-schemas/control/number.json
@@ -11,6 +11,9 @@
     "required": {
       "type": "boolean"
     },
+    "readonly": {
+      "type": "boolean"
+    },
     "constraints": {
       "$ref": "../property/constraints.json#"
     }

diff --git a/src/main/resources/json-schemas/control/radio.json b/src/main/resources/json-schemas/control/radio.json
@@ -19,6 +19,9 @@
     "required": {
       "type": "boolean"
     },
+    "readonly": {
+      "type": "boolean"
+    },
     "loadSettings": {
       "type": "object",
       "oneOf": [

diff --git a/src/main/resources/json-schemas/control/table.json b/src/main/resources/json-schemas/control/table.json
@@ -12,6 +12,9 @@
     "label": {
       "type": "string"
     },
+    "readonly": {
+      "type": "boolean"
+    },
     "property": {
       "type": "string",
       "pattern": "^[a-zA-Z](?:[a-zA-Z\\d.]*[a-zA-Z\\d])?+$"

diff --git a/src/main/resources/json-schemas/control/text.json b/src/main/resources/json-schemas/control/text.json
@@ -11,6 +11,9 @@
     "required": {
       "type": "boolean"
     },
+    "readonly": {
+      "type": "boolean"
+    },
     "constraints": {
       "$ref": "../property/constraints.json#"
     }

diff --git a/src/main/resources/json-schemas/control/textarea.json b/src/main/resources/json-schemas/control/textarea.json
@@ -19,6 +19,9 @@
     "required": {
       "type": "boolean"
     },
+    "readonly": {
+      "type": "boolean"
+    },
     "rows": {
       "type": "integer",
       "minimum": 0

diff --git a/src/main/resources/json-schemas/property/constraints.json b/src/main/resources/json-schemas/property/constraints.json
@@ -8,6 +8,9 @@
     },
     "requirement": {
       "$ref": "#/$defs/constraint"
+    },
+    "modifiable": {
+      "$ref": "#/$defs/constraint"
     }
   },
   "$defs": {